[I18N] export saas-18 source terms

saas-18 will be the future version 11

182 files changed, 16796 insertions, 13785 deletions

diff --git a/.tx/config b/.tx/config
index 0928487102f..8977a56c114 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,922 +2,927 @@
 host = https://www.transifex.com
 type = PO
 
-[odoo-master.base]
+[odoo-11.base]
 file_filter = odoo/addons/base/i18n/<lang>.po
 source_file = odoo/addons/base/i18n/base.pot
 source_lang = en
 
-[odoo-master.account]
+[odoo-11.account]
 file_filter = addons/account/i18n/<lang>.po
 source_file = addons/account/i18n/account.pot
 source_lang = en
 
-[odoo-master.account_accountant]
-file_filter = addons/account_accountant/i18n/<lang>.po
-source_file = addons/account_accountant/i18n/account_accountant.pot
-source_lang = en
-
-[odoo-master.account_analytic_default]
+[odoo-11.account_analytic_default]
 file_filter = addons/account_analytic_default/i18n/<lang>.po
 source_file = addons/account_analytic_default/i18n/account_analytic_default.pot
 source_lang = en
 
-[odoo-master.account_asset]
+[odoo-11.account_asset]
 file_filter = addons/account_asset/i18n/<lang>.po
 source_file = addons/account_asset/i18n/account_asset.pot
 source_lang = en
 
-[odoo-master.account_bank_statement_import]
+[odoo-11.account_bank_statement_import]
 file_filter = addons/account_bank_statement_import/i18n/<lang>.po
 source_file = addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
 source_lang = en
 
-[odoo-master.account_budget]
+[odoo-11.account_budget]
 file_filter = addons/account_budget/i18n/<lang>.po
 source_file = addons/account_budget/i18n/account_budget.pot
 source_lang = en
 
-[odoo-master.account_cancel]
+[odoo-11.account_cancel]
 file_filter = addons/account_cancel/i18n/<lang>.po
 source_file = addons/account_cancel/i18n/account_cancel.pot
 source_lang = en
 
-[odoo-master.account_check_printing]
+[odoo-11.account_check_printing]
 file_filter = addons/account_check_printing/i18n/<lang>.po
 source_file = addons/account_check_printing/i18n/account_check_printing.pot
 source_lang = en
 
-[odoo-master.account_tax_python]
+[odoo-11.account_invoicing]
+file_filter = addons/account_invoicing/i18n/<lang>.po
+source_file = addons/account_invoicing/i18n/account_invoicing.pot
+source_lang = en
+
+[odoo-11.account_payment]
+file_filter = addons/account_payment/i18n/<lang>.po
+source_file = addons/account_payment/i18n/account_payment.pot
+source_lang = en
+
+[odoo-11.account_tax_python]
 file_filter = addons/account_tax_python/i18n/<lang>.po
 source_file = addons/account_tax_python/i18n/account_tax_python.pot
 source_lang = en
 
-[odoo-master.account_test]
+[odoo-11.account_test]
 file_filter = addons/account_test/i18n/<lang>.po
 source_file = addons/account_test/i18n/account_test.pot
 source_lang = en
 
-[odoo-master.account_voucher]
+[odoo-11.account_voucher]
 file_filter = addons/account_voucher/i18n/<lang>.po
 source_file = addons/account_voucher/i18n/account_voucher.pot
 source_lang = en
 
-[odoo-master.analytic]
+[odoo-11.analytic]
 file_filter = addons/analytic/i18n/<lang>.po
 source_file = addons/analytic/i18n/analytic.pot
 source_lang = en
 
-[odoo-master.anonymization]
+[odoo-11.anonymization]
 file_filter = addons/anonymization/i18n/<lang>.po
 source_file = addons/anonymization/i18n/anonymization.pot
 source_lang = en
 
-[odoo-master.association]
+[odoo-11.association]
 file_filter = addons/association/i18n/<lang>.po
 source_file = addons/association/i18n/association.pot
 source_lang = en
 
-[odoo-master.auth_crypt]
+[odoo-11.auth_crypt]
 file_filter = addons/auth_crypt/i18n/<lang>.po
 source_file = addons/auth_crypt/i18n/auth_crypt.pot
 source_lang = en
 
-[odoo-master.auth_ldap]
+[odoo-11.auth_ldap]
 file_filter = addons/auth_ldap/i18n/<lang>.po
 source_file = addons/auth_ldap/i18n/auth_ldap.pot
 source_lang = en
 
-[odoo-master.auth_oauth]
+[odoo-11.auth_oauth]
 file_filter = addons/auth_oauth/i18n/<lang>.po
 source_file = addons/auth_oauth/i18n/auth_oauth.pot
 source_lang = en
 
-[odoo-master.auth_signup]
+[odoo-11.auth_signup]
 file_filter = addons/auth_signup/i18n/<lang>.po
 source_file = addons/auth_signup/i18n/auth_signup.pot
 source_lang = en
 
-[odoo-master.barcodes]
+[odoo-11.barcodes]
 file_filter = addons/barcodes/i18n/<lang>.po
 source_file = addons/barcodes/i18n/barcodes.pot
 source_lang = en
 
-[odoo-master.base_address_city]
+[odoo-11.base_address_city]
 file_filter = addons/base_address_city/i18n/<lang>.po
 source_file = addons/base_address_city/i18n/base_address_city.pot
 source_lang = en
 
-[odoo-master.base_address_extended]
+[odoo-11.base_address_extended]
 file_filter = addons/base_address_extended/i18n/<lang>.po
 source_file = addons/base_address_extended/i18n/base_address_extended.pot
 source_lang = en
 
-[odoo-master.base_automation]
+[odoo-11.base_automation]
 file_filter = addons/base_automation/i18n/<lang>.po
 source_file = addons/base_automation/i18n/base_automation.pot
 source_lang = en
 
-[odoo-master.base_gengo]
+[odoo-11.base_gengo]
 file_filter = addons/base_gengo/i18n/<lang>.po
 source_file = addons/base_gengo/i18n/base_gengo.pot
 source_lang = en
 
-[odoo-master.base_geolocalize]
+[odoo-11.base_geolocalize]
 file_filter = addons/base_geolocalize/i18n/<lang>.po
 source_file = addons/base_geolocalize/i18n/base_geolocalize.pot
 source_lang = en
 
-[odoo-master.base_iban]
+[odoo-11.base_iban]
 file_filter = addons/base_iban/i18n/<lang>.po
 source_file = addons/base_iban/i18n/base_iban.pot
 source_lang = en
 
-[odoo-master.base_import]
+[odoo-11.base_import]
 file_filter = addons/base_import/i18n/<lang>.po
 source_file = addons/base_import/i18n/base_import.pot
 source_lang = en
 
-[odoo-master.base_import_module]
+[odoo-11.base_import_module]
 file_filter = addons/base_import_module/i18n/<lang>.po
 source_file = addons/base_import_module/i18n/base_import_module.pot
 source_lang = en
 
-[odoo-master.base_sparse_field]
-file_filter = addons/base_sparse_field/i18n/<lang>.po
-source_file = addons/base_sparse_field/i18n/base_sparse_field.pot
-source_lang = en
-
-[odoo-master.base_setup]
+[odoo-11.base_setup]
 file_filter = addons/base_setup/i18n/<lang>.po
 source_file = addons/base_setup/i18n/base_setup.pot
 source_lang = en
 
-[odoo-master.base_vat]
+[odoo-11.base_sparse_field]
+file_filter = addons/base_sparse_field/i18n/<lang>.po
+source_file = addons/base_sparse_field/i18n/base_sparse_field.pot
+source_lang = en
+
+[odoo-11.base_vat]
 file_filter = addons/base_vat/i18n/<lang>.po
 source_file = addons/base_vat/i18n/base_vat.pot
 source_lang = en
 
-[odoo-master.board]
+[odoo-11.base_vat_autocomplete]
+file_filter = addons/base_vat_autocomplete/i18n/<lang>.po
+source_file = addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
+source_lang = en
+
+[odoo-11.board]
 file_filter = addons/board/i18n/<lang>.po
 source_file = addons/board/i18n/board.pot
 source_lang = en
 
-[odoo-master.bus]
+[odoo-11.bus]
 file_filter = addons/bus/i18n/<lang>.po
 source_file = addons/bus/i18n/bus.pot
 source_lang = en
 
-[odoo-master.calendar]
+[odoo-11.calendar]
 file_filter = addons/calendar/i18n/<lang>.po
 source_file = addons/calendar/i18n/calendar.pot
 source_lang = en
 
-[odoo-master.contacts]
+[odoo-11.contacts]
 file_filter = addons/contacts/i18n/<lang>.po
 source_file = addons/contacts/i18n/contacts.pot
 source_lang = en
 
-[odoo-master.crm]
+[odoo-11.crm]
 file_filter = addons/crm/i18n/<lang>.po
 source_file = addons/crm/i18n/crm.pot
 source_lang = en
 
-[odoo-master.crm_livechat]
+[odoo-11.crm_livechat]
 file_filter = addons/crm_livechat/i18n/<lang>.po
 source_file = addons/crm_livechat/i18n/crm_livechat.pot
 source_lang = en
 
-[odoo-master.crm_phone_validation]
+[odoo-11.crm_phone_validation]
 file_filter = addons/crm_phone_validation/i18n/<lang>.po
 source_file = addons/crm_phone_validation/i18n/crm_phone_validation.pot
 source_lang = en
 
-[odoo-master.crm_project]
+[odoo-11.crm_project]
 file_filter = addons/crm_project/i18n/<lang>.po
 source_file = addons/crm_project/i18n/crm_project.pot
 source_lang = en
 
-[odoo-master.decimal_precision]
+[odoo-11.decimal_precision]
 file_filter = addons/decimal_precision/i18n/<lang>.po
 source_file = addons/decimal_precision/i18n/decimal_precision.pot
 source_lang = en
 
-[odoo-master.delivery]
+[odoo-11.delivery]
 file_filter = addons/delivery/i18n/<lang>.po
 source_file = addons/delivery/i18n/delivery.pot
 source_lang = en
 
-[odoo-master.document]
+[odoo-11.document]
 file_filter = addons/document/i18n/<lang>.po
 source_file = addons/document/i18n/document.pot
 source_lang = en
 
-[odoo-master.event]
+[odoo-11.event]
 file_filter = addons/event/i18n/<lang>.po
 source_file = addons/event/i18n/event.pot
 source_lang = en
 
-[odoo-master.event_sale]
+[odoo-11.event_sale]
 file_filter = addons/event_sale/i18n/<lang>.po
 source_file = addons/event_sale/i18n/event_sale.pot
 source_lang = en
 
-[odoo-master.fetchmail]
+[odoo-11.fetchmail]
 file_filter = addons/fetchmail/i18n/<lang>.po
 source_file = addons/fetchmail/i18n/fetchmail.pot
 source_lang = en
 
-[odoo-master.fleet]
+[odoo-11.fleet]
 file_filter = addons/fleet/i18n/<lang>.po
 source_file = addons/fleet/i18n/fleet.pot
 source_lang = en
 
-[odoo-master.gamification]
+[odoo-11.gamification]
 file_filter = addons/gamification/i18n/<lang>.po
 source_file = addons/gamification/i18n/gamification.pot
 source_lang = en
 
-[odoo-master.gamification_sale_crm]
+[odoo-11.gamification_sale_crm]
 file_filter = addons/gamification_sale_crm/i18n/<lang>.po
 source_file = addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
 source_lang = en
 
-[odoo-master.google_account]
+[odoo-11.google_account]
 file_filter = addons/google_account/i18n/<lang>.po
 source_file = addons/google_account/i18n/google_account.pot
 source_lang = en
 
-[odoo-master.google_calendar]
+[odoo-11.google_calendar]
 file_filter = addons/google_calendar/i18n/<lang>.po
 source_file = addons/google_calendar/i18n/google_calendar.pot
 source_lang = en
 
-[odoo-master.google_drive]
+[odoo-11.google_drive]
 file_filter = addons/google_drive/i18n/<lang>.po
 source_file = addons/google_drive/i18n/google_drive.pot
 source_lang = en
 
-[odoo-master.google_spreadsheet]
+[odoo-11.google_spreadsheet]
 file_filter = addons/google_spreadsheet/i18n/<lang>.po
 source_file = addons/google_spreadsheet/i18n/google_spreadsheet.pot
 source_lang = en
 
-[odoo-master.hr]
+[odoo-11.hr]
 file_filter = addons/hr/i18n/<lang>.po
 source_file = addons/hr/i18n/hr.pot
 source_lang = en
 
-[odoo-master.hr_attendance]
+[odoo-11.hr_attendance]
 file_filter = addons/hr_attendance/i18n/<lang>.po
 source_file = addons/hr_attendance/i18n/hr_attendance.pot
 source_lang = en
 
-[odoo-master.hr_contract]
+[odoo-11.hr_contract]
 file_filter = addons/hr_contract/i18n/<lang>.po
 source_file = addons/hr_contract/i18n/hr_contract.pot
 source_lang = en
 
-[odoo-master.hr_expense]
+[odoo-11.hr_expense]
 file_filter = addons/hr_expense/i18n/<lang>.po
 source_file = addons/hr_expense/i18n/hr_expense.pot
 source_lang = en
 
-[odoo-master.hr_expense_check]
+[odoo-11.hr_expense_check]
 file_filter = addons/hr_expense_check/i18n/<lang>.po
 source_file = addons/hr_expense_check/i18n/hr_expense_check.pot
 source_lang = en
 
-[odoo-master.hr_gamification]
+[odoo-11.hr_gamification]
 file_filter = addons/hr_gamification/i18n/<lang>.po
 source_file = addons/hr_gamification/i18n/hr_gamification.pot
 source_lang = en
 
-[odoo-master.hr_holidays]
+[odoo-11.hr_holidays]
 file_filter = addons/hr_holidays/i18n/<lang>.po
 source_file = addons/hr_holidays/i18n/hr_holidays.pot
 source_lang = en
 
-[odoo-master.hr_maintenance]
+[odoo-11.hr_maintenance]
 file_filter = addons/hr_maintenance/i18n/<lang>.po
 source_file = addons/hr_maintenance/i18n/hr_maintenance.pot
 source_lang = en
 
-[odoo-master.hr_org_chart]
+[odoo-11.hr_org_chart]
 file_filter = addons/hr_org_chart/i18n/<lang>.po
 source_file = addons/hr_org_chart/i18n/hr_org_chart.pot
 source_lang = en
 
-[odoo-master.hr_payroll]
+[odoo-11.hr_payroll]
 file_filter = addons/hr_payroll/i18n/<lang>.po
 source_file = addons/hr_payroll/i18n/hr_payroll.pot
 source_lang = en
 
-[odoo-master.hr_payroll_account]
+[odoo-11.hr_payroll_account]
 file_filter = addons/hr_payroll_account/i18n/<lang>.po
 source_file = addons/hr_payroll_account/i18n/hr_payroll_account.pot
 source_lang = en
 
-[odoo-master.hr_recruitment]
+[odoo-11.hr_recruitment]
 file_filter = addons/hr_recruitment/i18n/<lang>.po
 source_file = addons/hr_recruitment/i18n/hr_recruitment.pot
 source_lang = en
 
-[odoo-master.hr_recruitment_survey]
+[odoo-11.hr_recruitment_survey]
 file_filter = addons/hr_recruitment_survey/i18n/<lang>.po
 source_file = addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
 source_lang = en
 
-[odoo-master.hr_timesheet]
+[odoo-11.hr_timesheet]
 file_filter = addons/hr_timesheet/i18n/<lang>.po
 source_file = addons/hr_timesheet/i18n/hr_timesheet.pot
 source_lang = en
 
-[odoo-master.hr_timesheet_attendance]
+[odoo-11.hr_timesheet_attendance]
 file_filter = addons/hr_timesheet_attendance/i18n/<lang>.po
 source_file = addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
 source_lang = en
 
-[odoo-master.im_livechat]
+[odoo-11.im_livechat]
 file_filter = addons/im_livechat/i18n/<lang>.po
 source_file = addons/im_livechat/i18n/im_livechat.pot
 source_lang = en
 
-[odoo-master.l10n_multilang]
-file_filter = addons/l10n_multilang/i18n/<lang>.po
-source_file = addons/l10n_multilang/i18n/l10n_multilang.pot
-source_lang = en
-
-[odoo-master.link_tracker]
+[odoo-11.link_tracker]
 file_filter = addons/link_tracker/i18n/<lang>.po
 source_file = addons/link_tracker/i18n/link_tracker.pot
 source_lang = en
 
-[odoo-master.lunch]
+[odoo-11.lunch]
 file_filter = addons/lunch/i18n/<lang>.po
 source_file = addons/lunch/i18n/lunch.pot
 source_lang = en
 
-[odoo-master.mail]
+[odoo-11.mail]
 file_filter = addons/mail/i18n/<lang>.po
 source_file = addons/mail/i18n/mail.pot
 source_lang = en
 
-[odoo-master.maintenance]
+[odoo-11.maintenance]
 file_filter = addons/maintenance/i18n/<lang>.po
 source_file = addons/maintenance/i18n/maintenance.pot
 source_lang = en
 
-[odoo-master.mass_mailing]
+[odoo-11.mass_mailing]
 file_filter = addons/mass_mailing/i18n/<lang>.po
 source_file = addons/mass_mailing/i18n/mass_mailing.pot
 source_lang = en
 
-[odoo-master.mass_mailing_event]
+[odoo-11.mass_mailing_event]
 file_filter = addons/mass_mailing_event/i18n/<lang>.po
 source_file = addons/mass_mailing_event/i18n/mass_mailing_event.pot
 source_lang = en
 
-[odoo-master.mass_mailing_event_track]
+[odoo-11.mass_mailing_event_track]
 file_filter = addons/mass_mailing_event_track/i18n/<lang>.po
 source_file = addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
 source_lang = en
 
-[odoo-master.membership]
+[odoo-11.membership]
 file_filter = addons/membership/i18n/<lang>.po
 source_file = addons/membership/i18n/membership.pot
 source_lang = en
 
-[odoo-master.mrp]
+[odoo-11.mrp]
 file_filter = addons/mrp/i18n/<lang>.po
 source_file = addons/mrp/i18n/mrp.pot
 source_lang = en
 
-[odoo-master.mrp_byproduct]
+[odoo-11.mrp_byproduct]
 file_filter = addons/mrp_byproduct/i18n/<lang>.po
 source_file = addons/mrp_byproduct/i18n/mrp_byproduct.pot
 source_lang = en
 
-[odoo-master.mrp_repair]
+[odoo-11.mrp_repair]
 file_filter = addons/mrp_repair/i18n/<lang>.po
 source_file = addons/mrp_repair/i18n/mrp_repair.pot
 source_lang = en
 
-[odoo-master.note]
+[odoo-11.note]
 file_filter = addons/note/i18n/<lang>.po
 source_file = addons/note/i18n/note.pot
 source_lang = en
 
-[odoo-master.note_pad]
+[odoo-11.note_pad]
 file_filter = addons/note_pad/i18n/<lang>.po
 source_file = addons/note_pad/i18n/note_pad.pot
 source_lang = en
 
-[odoo-master.pad]
+[odoo-11.pad]
 file_filter = addons/pad/i18n/<lang>.po
 source_file = addons/pad/i18n/pad.pot
 source_lang = en
 
-[odoo-master.pad_project]
+[odoo-11.pad_project]
 file_filter = addons/pad_project/i18n/<lang>.po
 source_file = addons/pad_project/i18n/pad_project.pot
 source_lang = en
 
-[odoo-master.payment]
+[odoo-11.payment]
 file_filter = addons/payment/i18n/<lang>.po
 source_file = addons/payment/i18n/payment.pot
 source_lang = en
 
-[odoo-master.payment_adyen]
+[odoo-11.payment_adyen]
 file_filter = addons/payment_adyen/i18n/<lang>.po
 source_file = addons/payment_adyen/i18n/payment_adyen.pot
 source_lang = en
 
-[odoo-master.payment_authorize]
+[odoo-11.payment_authorize]
 file_filter = addons/payment_authorize/i18n/<lang>.po
 source_file = addons/payment_authorize/i18n/payment_authorize.pot
 source_lang = en
 
-[odoo-master.payment_buckaroo]
+[odoo-11.payment_buckaroo]
 file_filter = addons/payment_buckaroo/i18n/<lang>.po
 source_file = addons/payment_buckaroo/i18n/payment_buckaroo.pot
 source_lang = en
 
-[odoo-master.payment_ogone]
+[odoo-11.payment_ogone]
 file_filter = addons/payment_ogone/i18n/<lang>.po
 source_file = addons/payment_ogone/i18n/payment_ogone.pot
 source_lang = en
 
-[odoo-master.payment_paypal]
+[odoo-11.payment_paypal]
 file_filter = addons/payment_paypal/i18n/<lang>.po
 source_file = addons/payment_paypal/i18n/payment_paypal.pot
 source_lang = en
 
-[odoo-master.payment_payumoney]
+[odoo-11.payment_payumoney]
 file_filter = addons/payment_payumoney/i18n/<lang>.po
 source_file = addons/payment_payumoney/i18n/payment_payumoney.pot
 source_lang = en
 
-[odoo-master.payment_sips]
+[odoo-11.payment_sips]
 file_filter = addons/payment_sips/i18n/<lang>.po
 source_file = addons/payment_sips/i18n/payment_sips.pot
 source_lang = en
 
-[odoo-master.payment_stripe]
+[odoo-11.payment_stripe]
 file_filter = addons/payment_stripe/i18n/<lang>.po
 source_file = addons/payment_stripe/i18n/payment_stripe.pot
 source_lang = en
 
-[odoo-master.payment_transfer]
+[odoo-11.payment_transfer]
 file_filter = addons/payment_transfer/i18n/<lang>.po
 source_file = addons/payment_transfer/i18n/payment_transfer.pot
 source_lang = en
 
-[odoo-master.phone_validation]
+[odoo-11.phone_validation]
 file_filter = addons/phone_validation/i18n/<lang>.po
 source_file = addons/phone_validation/i18n/phone_validation.pot
 source_lang = en
 
-[odoo-master.point_of_sale]
+[odoo-11.point_of_sale]
 file_filter = addons/point_of_sale/i18n/<lang>.po
 source_file = addons/point_of_sale/i18n/point_of_sale.pot
 source_lang = en
 
-[odoo-master.pos_cache]
+[odoo-11.portal]
+file_filter = addons/portal/i18n/<lang>.po
+source_file = addons/portal/i18n/portal.pot
+source_lang = en
+
+[odoo-11.pos_cache]
 file_filter = addons/pos_cache/i18n/<lang>.po
 source_file = addons/pos_cache/i18n/pos_cache.pot
 source_lang = en
 
-[odoo-master.pos_data_drinks]
+[odoo-11.pos_data_drinks]
 file_filter = addons/pos_data_drinks/i18n/<lang>.po
 source_file = addons/pos_data_drinks/i18n/pos_data_drinks.pot
 source_lang = en
 
-[odoo-master.pos_discount]
+[odoo-11.pos_discount]
 file_filter = addons/pos_discount/i18n/<lang>.po
 source_file = addons/pos_discount/i18n/pos_discount.pot
 source_lang = en
 
-[odoo-master.pos_mercury]
+[odoo-11.pos_mercury]
 file_filter = addons/pos_mercury/i18n/<lang>.po
 source_file = addons/pos_mercury/i18n/pos_mercury.pot
 source_lang = en
 
-[odoo-master.pos_reprint]
+[odoo-11.pos_reprint]
 file_filter = addons/pos_reprint/i18n/<lang>.po
 source_file = addons/pos_reprint/i18n/pos_reprint.pot
 source_lang = en
 
-[odoo-master.pos_restaurant]
+[odoo-11.pos_restaurant]
 file_filter = addons/pos_restaurant/i18n/<lang>.po
 source_file = addons/pos_restaurant/i18n/pos_restaurant.pot
 source_lang = en
 
-[odoo-master.pos_sale]
+[odoo-11.pos_sale]
 file_filter = addons/pos_sale/i18n/<lang>.po
 source_file = addons/pos_sale/i18n/pos_sale.pot
 source_lang = en
 
-[odoo-master.procurement]
-file_filter = addons/procurement/i18n/<lang>.po
-source_file = addons/procurement/i18n/procurement.pot
-source_lang = en
-
-[odoo-master.procurement_jit]
+[odoo-11.procurement_jit]
 file_filter = addons/procurement_jit/i18n/<lang>.po
 source_file = addons/procurement_jit/i18n/procurement_jit.pot
 source_lang = en
 
-[odoo-master.product]
+[odoo-11.product]
 file_filter = addons/product/i18n/<lang>.po
 source_file = addons/product/i18n/product.pot
 source_lang = en
 
-[odoo-master.product_email_template]
+[odoo-11.product_email_template]
 file_filter = addons/product_email_template/i18n/<lang>.po
 source_file = addons/product_email_template/i18n/product_email_template.pot
 source_lang = en
 
-[odoo-master.product_expiry]
+[odoo-11.product_expiry]
 file_filter = addons/product_expiry/i18n/<lang>.po
 source_file = addons/product_expiry/i18n/product_expiry.pot
 source_lang = en
 
-[odoo-master.product_extended]
+[odoo-11.product_extended]
 file_filter = addons/product_extended/i18n/<lang>.po
 source_file = addons/product_extended/i18n/product_extended.pot
 source_lang = en
 
-[odoo-master.product_margin]
+[odoo-11.product_margin]
 file_filter = addons/product_margin/i18n/<lang>.po
 source_file = addons/product_margin/i18n/product_margin.pot
 source_lang = en
 
-[odoo-master.project]
+[odoo-11.project]
 file_filter = addons/project/i18n/<lang>.po
 source_file = addons/project/i18n/project.pot
 source_lang = en
 
-[odoo-master.project_timesheet_holidays]
+[odoo-11.project_timesheet_holidays]
 file_filter = addons/project_timesheet_holidays/i18n/<lang>.po
 source_file = addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
 source_lang = en
 
-[odoo-master.purchase]
+[odoo-11.purchase]
 file_filter = addons/purchase/i18n/<lang>.po
 source_file = addons/purchase/i18n/purchase.pot
 source_lang = en
 
-[odoo-master.purchase_mrp]
+[odoo-11.purchase_mrp]
 file_filter = addons/purchase_mrp/i18n/<lang>.po
 source_file = addons/purchase_mrp/i18n/purchase_mrp.pot
 source_lang = en
 
-[odoo-master.purchase_requisition]
+[odoo-11.purchase_requisition]
 file_filter = addons/purchase_requisition/i18n/<lang>.po
 source_file = addons/purchase_requisition/i18n/purchase_requisition.pot
 source_lang = en
 
-[odoo-master.rating]
+[odoo-11.rating]
 file_filter = addons/rating/i18n/<lang>.po
 source_file = addons/rating/i18n/rating.pot
 source_lang = en
 
-[odoo-master.rating_project]
+[odoo-11.rating_project]
 file_filter = addons/rating_project/i18n/<lang>.po
 source_file = addons/rating_project/i18n/rating_project.pot
 source_lang = en
 
-[odoo-master.report]
-file_filter = addons/report/i18n/<lang>.po
-source_file = addons/report/i18n/report.pot
-source_lang = en
-
-[odoo-master.report_intrastat]
+[odoo-11.report_intrastat]
 file_filter = addons/report_intrastat/i18n/<lang>.po
 source_file = addons/report_intrastat/i18n/report_intrastat.pot
 source_lang = en
 
-[odoo-master.resource]
+[odoo-11.resource]
 file_filter = addons/resource/i18n/<lang>.po
 source_file = addons/resource/i18n/resource.pot
 source_lang = en
 
-[odoo-master.sale]
+[odoo-11.sale]
 file_filter = addons/sale/i18n/<lang>.po
 source_file = addons/sale/i18n/sale.pot
 source_lang = en
 
-[odoo-master.sale_crm]
+[odoo-11.sale_crm]
 file_filter = addons/sale_crm/i18n/<lang>.po
 source_file = addons/sale_crm/i18n/sale_crm.pot
 source_lang = en
 
-[odoo-master.sale_margin]
+[odoo-11.sale_expense]
+file_filter = addons/sale_expense/i18n/<lang>.po
+source_file = addons/sale_expense/i18n/sale_expense.pot
+source_lang = en
+
+[odoo-11.sale_management]
+file_filter = addons/sale_management/i18n/<lang>.po
+source_file = addons/sale_management/i18n/sale_management.pot
+source_lang = en
+
+[odoo-11.sale_margin]
 file_filter = addons/sale_margin/i18n/<lang>.po
 source_file = addons/sale_margin/i18n/sale_margin.pot
 source_lang = en
 
-[odoo-master.sale_mrp]
+[odoo-11.sale_mrp]
 file_filter = addons/sale_mrp/i18n/<lang>.po
 source_file = addons/sale_mrp/i18n/sale_mrp.pot
 source_lang = en
 
-[odoo-master.sale_order_dates]
+[odoo-11.sale_order_dates]
 file_filter = addons/sale_order_dates/i18n/<lang>.po
 source_file = addons/sale_order_dates/i18n/sale_order_dates.pot
 source_lang = en
 
-[odoo-master.sale_service_rating]
+[odoo-11.sale_payment]
+file_filter = addons/sale_payment/i18n/<lang>.po
+source_file = addons/sale_payment/i18n/sale_payment.pot
+source_lang = en
+
+[odoo-11.sale_service_rating]
 file_filter = addons/sale_service_rating/i18n/<lang>.po
 source_file = addons/sale_service_rating/i18n/sale_service_rating.pot
 source_lang = en
 
-[odoo-master.sale_stock]
+[odoo-11.sale_stock]
 file_filter = addons/sale_stock/i18n/<lang>.po
 source_file = addons/sale_stock/i18n/sale_stock.pot
 source_lang = en
 
-[odoo-master.sale_timesheet]
+[odoo-11.sale_timesheet]
 file_filter = addons/sale_timesheet/i18n/<lang>.po
 source_file = addons/sale_timesheet/i18n/sale_timesheet.pot
 source_lang = en
 
-[odoo-master.sales_team]
+[odoo-11.sales_team]
 file_filter = addons/sales_team/i18n/<lang>.po
 source_file = addons/sales_team/i18n/sales_team.pot
 source_lang = en
 
-[odoo-master.stock]
+[odoo-11.stock]
 file_filter = addons/stock/i18n/<lang>.po
 source_file = addons/stock/i18n/stock.pot
 source_lang = en
 
-[odoo-master.stock_account]
+[odoo-11.stock_account]
 file_filter = addons/stock_account/i18n/<lang>.po
 source_file = addons/stock_account/i18n/stock_account.pot
 source_lang = en
 
-[odoo-master.stock_dropshipping]
+[odoo-11.stock_dropshipping]
 file_filter = addons/stock_dropshipping/i18n/<lang>.po
 source_file = addons/stock_dropshipping/i18n/stock_dropshipping.pot
 source_lang = en
 
-[odoo-master.stock_landed_costs]
+[odoo-11.stock_landed_costs]
 file_filter = addons/stock_landed_costs/i18n/<lang>.po
 source_file = addons/stock_landed_costs/i18n/stock_landed_costs.pot
 source_lang = en
 
-[odoo-master.stock_picking_batch]
+[odoo-11.stock_picking_batch]
 file_filter = addons/stock_picking_batch/i18n/<lang>.po
 source_file = addons/stock_picking_batch/i18n/stock_picking_batch.pot
 source_lang = en
 
-[odoo-master.survey]
+[odoo-11.survey]
 file_filter = addons/survey/i18n/<lang>.po
 source_file = addons/survey/i18n/survey.pot
 source_lang = en
 
-[odoo-master.survey_crm]
+[odoo-11.survey_crm]
 file_filter = addons/survey_crm/i18n/<lang>.po
 source_file = addons/survey_crm/i18n/survey_crm.pot
 source_lang = en
 
-[odoo-master.theme_bootswatch]
+[odoo-11.theme_bootswatch]
 file_filter = addons/theme_bootswatch/i18n/<lang>.po
 source_file = addons/theme_bootswatch/i18n/theme_bootswatch.pot
 source_lang = en
 
-[odoo-master.theme_default]
+[odoo-11.theme_default]
 file_filter = addons/theme_default/i18n/<lang>.po
 source_file = addons/theme_default/i18n/theme_default.pot
 source_lang = en
 
-[odoo-master.utm]
+[odoo-11.utm]
 file_filter = addons/utm/i18n/<lang>.po
 source_file = addons/utm/i18n/utm.pot
 source_lang = en
 
-[odoo-master.web]
+[odoo-11.web]
 file_filter = addons/web/i18n/<lang>.po
 source_file = addons/web/i18n/web.pot
 source_lang = en
 
-[odoo-master.web_diagram]
+[odoo-11.web_diagram]
 file_filter = addons/web_diagram/i18n/<lang>.po
 source_file = addons/web_diagram/i18n/web_diagram.pot
 source_lang = en
 
-[odoo-master.web_editor]
+[odoo-11.web_editor]
 file_filter = addons/web_editor/i18n/<lang>.po
 source_file = addons/web_editor/i18n/web_editor.pot
 source_lang = en
 
-[odoo-master.web_kanban]
-file_filter = addons/web_kanban/i18n/<lang>.po
-source_file = addons/web_kanban/i18n/web_kanban.pot
-source_lang = en
-
-[odoo-master.web_kanban_gauge]
+[odoo-11.web_kanban_gauge]
 file_filter = addons/web_kanban_gauge/i18n/<lang>.po
 source_file = addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
 source_lang = en
 
-[odoo-master.web_planner]
+[odoo-11.web_planner]
 file_filter = addons/web_planner/i18n/<lang>.po
 source_file = addons/web_planner/i18n/web_planner.pot
 source_lang = en
 
-[odoo-master.web_settings_dashboard]
+[odoo-11.web_settings_dashboard]
 file_filter = addons/web_settings_dashboard/i18n/<lang>.po
 source_file = addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
 source_lang = en
 
-[odoo-master.web_tour]
+[odoo-11.web_tour]
 file_filter = addons/web_tour/i18n/<lang>.po
 source_file = addons/web_tour/i18n/web_tour.pot
 source_lang = en
 
-[odoo-master.website]
+[odoo-11.website]
 file_filter = addons/website/i18n/<lang>.po
 source_file = addons/website/i18n/website.pot
 source_lang = en
 
-[odoo-master.website_blog]
+[odoo-11.website_blog]
 file_filter = addons/website_blog/i18n/<lang>.po
 source_file = addons/website_blog/i18n/website_blog.pot
 source_lang = en
 
-[odoo-master.website_crm]
+[odoo-11.website_crm]
 file_filter = addons/website_crm/i18n/<lang>.po
 source_file = addons/website_crm/i18n/website_crm.pot
 source_lang = en
 
-[odoo-master.website_crm_partner_assign]
+[odoo-11.website_crm_partner_assign]
 file_filter = addons/website_crm_partner_assign/i18n/<lang>.po
 source_file = addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
 source_lang = en
 
-[odoo-master.website_customer]
+[odoo-11.website_customer]
 file_filter = addons/website_customer/i18n/<lang>.po
 source_file = addons/website_customer/i18n/website_customer.pot
 source_lang = en
 
-[odoo-master.website_event]
+[odoo-11.website_event]
 file_filter = addons/website_event/i18n/<lang>.po
 source_file = addons/website_event/i18n/website_event.pot
 source_lang = en
 
-[odoo-master.website_event_questions]
+[odoo-11.website_event_questions]
 file_filter = addons/website_event_questions/i18n/<lang>.po
 source_file = addons/website_event_questions/i18n/website_event_questions.pot
 source_lang = en
 
-[odoo-master.website_event_sale]
+[odoo-11.website_event_sale]
 file_filter = addons/website_event_sale/i18n/<lang>.po
 source_file = addons/website_event_sale/i18n/website_event_sale.pot
 source_lang = en
 
-[odoo-master.website_event_track]
+[odoo-11.website_event_track]
 file_filter = addons/website_event_track/i18n/<lang>.po
 source_file = addons/website_event_track/i18n/website_event_track.pot
 source_lang = en
 
-[odoo-master.website_form]
+[odoo-11.website_form]
 file_filter = addons/website_form/i18n/<lang>.po
 source_file = addons/website_form/i18n/website_form.pot
 source_lang = en
 
-[odoo-master.website_forum]
+[odoo-11.website_forum]
 file_filter = addons/website_forum/i18n/<lang>.po
 source_file = addons/website_forum/i18n/website_forum.pot
 source_lang = en
 
-[odoo-master.website_forum_doc]
+[odoo-11.website_forum_doc]
 file_filter = addons/website_forum_doc/i18n/<lang>.po
 source_file = addons/website_forum_doc/i18n/website_forum_doc.pot
 source_lang = en
 
-[odoo-master.website_gengo]
+[odoo-11.website_gengo]
 file_filter = addons/website_gengo/i18n/<lang>.po
 source_file = addons/website_gengo/i18n/website_gengo.pot
 source_lang = en
 
-[odoo-master.website_hr]
+[odoo-11.website_hr]
 file_filter = addons/website_hr/i18n/<lang>.po
 source_file = addons/website_hr/i18n/website_hr.pot
 source_lang = en
 
-[odoo-master.website_hr_recruitment]
+[odoo-11.website_hr_recruitment]
 file_filter = addons/website_hr_recruitment/i18n/<lang>.po
 source_file = addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
 source_lang = en
 
-[odoo-master.website_links]
+[odoo-11.website_links]
 file_filter = addons/website_links/i18n/<lang>.po
 source_file = addons/website_links/i18n/website_links.pot
 source_lang = en
 
-[odoo-master.website_livechat]
+[odoo-11.website_livechat]
 file_filter = addons/website_livechat/i18n/<lang>.po
 source_file = addons/website_livechat/i18n/website_livechat.pot
 source_lang = en
 
-[odoo-master.website_mail]
+[odoo-11.website_mail]
 file_filter = addons/website_mail/i18n/<lang>.po
 source_file = addons/website_mail/i18n/website_mail.pot
 source_lang = en
 
-[odoo-master.website_mail_channel]
+[odoo-11.website_mail_channel]
 file_filter = addons/website_mail_channel/i18n/<lang>.po
 source_file = addons/website_mail_channel/i18n/website_mail_channel.pot
 source_lang = en
 
-[odoo-master.website_mass_mailing]
+[odoo-11.website_mass_mailing]
 file_filter = addons/website_mass_mailing/i18n/<lang>.po
 source_file = addons/website_mass_mailing/i18n/website_mass_mailing.pot
 source_lang = en
 
-[odoo-master.website_membership]
+[odoo-11.website_membership]
 file_filter = addons/website_membership/i18n/<lang>.po
 source_file = addons/website_membership/i18n/website_membership.pot
 source_lang = en
 
-[odoo-master.website_partner]
+[odoo-11.website_partner]
 file_filter = addons/website_partner/i18n/<lang>.po
 source_file = addons/website_partner/i18n/website_partner.pot
 source_lang = en
 
-[odoo-master.website_payment]
+[odoo-11.website_payment]
 file_filter = addons/website_payment/i18n/<lang>.po
 source_file = addons/website_payment/i18n/website_payment.pot
 source_lang = en
 
-[odoo-master.website_project]
-file_filter = addons/website_project/i18n/<lang>.po
-source_file = addons/website_project/i18n/website_project.pot
-source_lang = en
-
-[odoo-master.website_project_timesheet]
-file_filter = addons/website_project_timesheet/i18n/<lang>.po
-source_file = addons/website_project_timesheet/i18n/website_project_timesheet.pot
-source_lang = en
-
-[odoo-master.website_quote]
+[odoo-11.website_quote]
 file_filter = addons/website_quote/i18n/<lang>.po
 source_file = addons/website_quote/i18n/website_quote.pot
 source_lang = en
 
-[odoo-master.website_rating_project]
+[odoo-11.website_rating]
+file_filter = addons/website_rating/i18n/<lang>.po
+source_file = addons/website_rating/i18n/website_rating.pot
+source_lang = en
+
+[odoo-11.website_rating_project]
 file_filter = addons/website_rating_project/i18n/<lang>.po
 source_file = addons/website_rating_project/i18n/website_rating_project.pot
 source_lang = en
 
-[odoo-master.website_sale]
+[odoo-11.website_sale]
 file_filter = addons/website_sale/i18n/<lang>.po
 source_file = addons/website_sale/i18n/website_sale.pot
 source_lang = en
 
-[odoo-master.website_sale_comparison]
+[odoo-11.website_sale_comparison]
 file_filter = addons/website_sale_comparison/i18n/<lang>.po
 source_file = addons/website_sale_comparison/i18n/website_sale_comparison.pot
 source_lang = en
 
-[odoo-master.website_sale_delivery]
+[odoo-11.website_sale_delivery]
 file_filter = addons/website_sale_delivery/i18n/<lang>.po
 source_file = addons/website_sale_delivery/i18n/website_sale_delivery.pot
 source_lang = en
 
-[odoo-master.website_sale_digital]
+[odoo-11.website_sale_digital]
 file_filter = addons/website_sale_digital/i18n/<lang>.po
 source_file = addons/website_sale_digital/i18n/website_sale_digital.pot
 source_lang = en
 
-[odoo-master.website_sale_options]
+[odoo-11.website_sale_options]
 file_filter = addons/website_sale_options/i18n/<lang>.po
 source_file = addons/website_sale_options/i18n/website_sale_options.pot
 source_lang = en
 
-[odoo-master.website_sale_stock]
+[odoo-11.website_sale_stock]
 file_filter = addons/website_sale_stock/i18n/<lang>.po
 source_file = addons/website_sale_stock/i18n/website_sale_stock.pot
 source_lang = en
 
-[odoo-master.website_sale_wishlist]
+[odoo-11.website_sale_wishlist]
 file_filter = addons/website_sale_wishlist/i18n/<lang>.po
 source_file = addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
 source_lang = en
 
-[odoo-master.website_slides]
+[odoo-11.website_slides]
 file_filter = addons/website_slides/i18n/<lang>.po
 source_file = addons/website_slides/i18n/website_slides.pot
 source_lang = en
 
-[odoo-master.website_theme_install]
+[odoo-11.website_theme_install]
 file_filter = addons/website_theme_install/i18n/<lang>.po
 source_file = addons/website_theme_install/i18n/website_theme_install.pot
 source_lang = en
 
-[odoo-master.website_twitter]
+[odoo-11.website_twitter]
 file_filter = addons/website_twitter/i18n/<lang>.po
 source_file = addons/website_twitter/i18n/website_twitter.pot
 source_lang = en
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 6a2d2722232..02ec0502256 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,54 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account
-#: model:mail.template,body_html:account.email_template_edi_invoice
-msgid "\n"
-"<p>Dear ${object.partner_id.name}\n"
-"% set access_action = object.with_context(force_website=True).get_access_action()\n"
-"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
-"% set access_url = is_online and '/mail/view?model=account.invoice&res_id=%d' % (object.id) or '/report/pdf/account.report_invoice/' + str(object.id)\n"
-"\n"
-"% if object.partner_id.parent_id:\n"
-"    (<i>${object.partner_id.parent_id.name}</i>)\n"
-"% endif\n"
-",</p>\n"
-"<p>Here is, in attachment, your \n"
-"% if object.number:\n"
-"invoice <strong>${object.number}</strong>\n"
-"% else:\n"
-"invoice\n"
-"% endif\n"
-"% if object.origin:\n"
-"(with reference: ${object.origin})\n"
-"% endif\n"
-"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
-"from ${object.company_id.name}.\n"
-"</p>\n"
-"\n"
-"% if is_online:\n"
-"    <br/><br/>\n"
-"    <center>\n"
-"      <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">View Invoice</a>\n"
-"    </center>\n"
-"% endif\n"
-"    <br/><br/>\n"
-"\n"
-"% if object.state=='paid':\n"
-"    <p>This invoice is already paid.</p>\n"
-"% else:\n"
-"    <p>Please remit payment at your earliest convenience.</p>\n"
-"% endif\n"
-"\n"
-"<p>Thank you,</p>\n"
-"<p style=\"color:#888888\">\n"
-"% if object.user_id and object.user_id.signature:\n"
-"    ${object.user_id.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-""
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_state
 msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed Invoice.\n"
 " * The 'Pro-forma' status is used when the invoice does not have an invoice number.\n"
@@ -79,7 +31,7 @@ msgid "# of Digits"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_code_digits
+#: model:ir.model.fields,field_description:account.field_res_config_settings_code_digits
 msgid "# of Digits *"
 msgstr ""
 
@@ -94,11 +46,6 @@ msgid "# of Transaction"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "# of digits"
-msgstr ""
-
-#. module: account
 #: model:mail.template,report_name:account.mail_template_data_payment_receipt
 msgid "${(object.name or '').replace('/','-')}"
 msgstr ""
@@ -119,36 +66,47 @@ msgid "${object.subject}"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:466
+#: code:addons/account/models/account_bank_statement.py:462
 #, python-format
 msgid "%d transactions were automatically reconciled."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:595
+#: code:addons/account/models/account.py:785
 #, python-format
 msgid "%s (Copy)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:128
-#: code:addons/account/models/account.py:300
-#: code:addons/account/models/account.py:301
+#: code:addons/account/models/account.py:211
+#: code:addons/account/models/account.py:484
+#: code:addons/account/models/account.py:485
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "&amp;nbsp;"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "&amp;nbsp;<span>on</span>"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid ", if accounting or purchase is installed"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "- First Number:"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "-> Reconcile"
 msgstr ""
@@ -159,7 +117,7 @@ msgid "-> View partially reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:467
+#: code:addons/account/models/account_bank_statement.py:463
 #, python-format
 msgid "1 transaction was automatically reconciled."
 msgstr ""
@@ -185,7 +143,7 @@ msgid ": General ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:355
+#: code:addons/account/models/account.py:539
 #, python-format
 msgid ": Refund"
 msgstr ""
@@ -196,103 +154,28 @@ msgid ": Trial Balance"
 msgstr ""
 
 #. module: account
-#: model:mail.template,body_html:account.mail_template_data_payment_receipt
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
-"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
-"<p>Best regards,\n"
-"% if user and user.signature:\n"
-"${user.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:account.account_planner
+msgid "<span class=\"fa fa-arrow-circle-o-down\"/> Install Now"
 msgstr ""
 
 #. module: account
-#: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
-msgid "<html>\n"
-"                <head></head>\n"
-"                % set record = ctx.get('record')\n"
-"                % set company = record and record.company_id or user.company_id\n"
-"                <body style=\"margin: 0; padding: 0;\">\n"
-"                <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n"
-"                    <tbody>\n"
-"\n"
-"                      <!-- HEADER -->\n"
-"                      <tr>\n"
-"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
-"                          <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-"                            <tr>\n"
-"                              <td valign=\"middle\">\n"
-"                                  <span style=\"font-size:20px; color:white; font-weight: bold;\">\n"
-"                                      Invoice ${object.record_name}\n"
-"                                  </span>\n"
-"                              </td>\n"
-"                              <td valign=\"middle\" align=\"right\">\n"
-"                                  <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${company.name}\">\n"
-"                              </td>\n"
-"                            </tr>\n"
-"                          </table>\n"
-"                        </td>\n"
-"                      </tr>\n"
-"\n"
-"                      <!-- CONTENT -->\n"
-"                      <tr>\n"
-"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
-"                          <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
-"                            <tbody>\n"
-"                              <td valign=\"top\" style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
-"                                ${object.body | safe}\n"
-"                              </td>\n"
-"                            </tbody>\n"
-"                          </table>\n"
-"                        </td>\n"
-"                      </tr>\n"
-"\n"
-"                      <!-- FOOTER -->\n"
-"                      <tr>\n"
-"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
-"                          <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-"                            <tr>\n"
-"                              <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
-"                                ${company.name}<br/>\n"
-"                                ${company.phone or ''}\n"
-"                              </td>\n"
-"                              <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
-"                                % if company.email:\n"
-"                                <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: white;\">${company.email}</a><br/>\n"
-"                                % endif\n"
-"                                % if company.website:\n"
-"                                    <a href=\"${company.website}\" style=\"text-decoration:none; color: white;\">\n"
-"                                        ${company.website}\n"
-"                                    </a>\n"
-"                                % endif\n"
-"                              </td>\n"
-"                            </tr>\n"
-"                          </table>\n"
-"                        </td>\n"
-"                      </tr>\n"
-"                      <tr>\n"
-"                        <td align=\"center\">\n"
-"                            Powered by <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n"
-"                        </td>\n"
-"                      </tr>\n"
-"                    </tbody>\n"
-"                </table>\n"
-"                </body>\n"
-"                </html>\n"
-"            "
+#: model:ir.ui.view,arch_db:account.account_planner
+msgid "<span class=\"fa\"/> Invite Your Users"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_planner
-msgid "<span class=\"fa fa-arrow-circle-o-down\"/> Install Now"
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Paid</span></span>"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_planner
-msgid "<span class=\"fa\"/> Invite Your Users"
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/><span class=\"hidden-xs\"> Cancelled</span></span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Waiting for Payment</span></span>"
 msgstr ""
 
 #. module: account
@@ -420,11 +303,6 @@ msgid "<span> To </span>"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
-msgid "<span>Duplicate</span>"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span>Journal Entries</span>"
 msgstr ""
@@ -485,6 +363,11 @@ msgid "<strong>2. Register Unmatched Payments</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document_with_payments
+msgid "<strong>Amount Due</strong>"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Assets Management</strong>"
 msgstr ""
@@ -553,6 +436,12 @@ msgid "<strong>Create the bill in Odoo</strong><br/> with a proper due date, and
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
+msgid "<strong>Customer Address</strong>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Customer Code:</strong>"
 msgstr ""
@@ -584,6 +473,7 @@ msgid "<strong>Deposit Tickets</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Description:</strong>"
 msgstr ""
@@ -599,6 +489,7 @@ msgid "<strong>Display Account</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Due Date:</strong>"
 msgstr ""
@@ -614,6 +505,17 @@ msgid "<strong>Expenses</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
+msgid "<strong>Fiscal Year End</strong>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_tax
+msgid "<strong>From</strong>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Invoice Date:</strong>"
 msgstr ""
@@ -687,6 +589,11 @@ msgid "<strong>Print checks</strong><br/>\n"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.report_tax
+msgid "<strong>Purchase</strong>"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Purchases</strong>"
 msgstr ""
@@ -730,6 +637,7 @@ msgid "<strong>Reduced data entry:</strong> no need to manually create invoices,
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Reference:</strong>"
 msgstr ""
@@ -750,6 +658,7 @@ msgid "<strong>Sorted By:</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Source:</strong>"
 msgstr ""
@@ -765,6 +674,7 @@ msgid "<strong>Subtotal :</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Subtotal</strong>"
 msgstr ""
@@ -795,12 +705,18 @@ msgid "<strong>There is nothing due with this customer.</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "<strong>Total</strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_account_kanban
+msgid "<strong>Type: </strong>"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Validate the bill</strong><br/> after encoding the products and taxes."
 msgstr ""
@@ -811,6 +727,11 @@ msgid "<strong>Vendor: </strong>"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.report_tax
+msgid "<strong>to </strong>"
+msgstr ""
+
+#. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
 msgid "A Cash Register allows you to manage cash entries in your cash\n"
 "                journals. This feature provides an easy way to follow up cash\n"
@@ -820,19 +741,25 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1464
+#: code:addons/account/models/account_bank_statement.py:383
+#, python-format
+msgid "A Cash transaction can't have a 0 amount."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:1721
 #, python-format
 msgid "A Payment Terms should have its last line of type Balance."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1467
+#: code:addons/account/models/account_invoice.py:1724
 #, python-format
 msgid "A Payment Terms should have only one line of type Balance."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:511
+#: code:addons/account/models/account.py:698
 #, python-format
 msgid "A bank account can only belong to one journal."
 msgstr ""
@@ -879,47 +806,35 @@ msgid "A product in Odoo is something you sell or buy \n"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:791
+#: code:addons/account/models/account_move.py:861
 #, python-format
 msgid "A reconciliation must involve at least 2 move lines."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:880
-#: code:addons/account/models/account_bank_statement.py:883
+#: code:addons/account/models/account_bank_statement.py:876
+#: code:addons/account/models/account_bank_statement.py:879
 #, python-format
 msgid "A selected move line was already reconciled."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:891
+#: code:addons/account/models/account_bank_statement.py:887
 #, python-format
 msgid "A selected statement line was already reconciled with an account move."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:225
-#, python-format
-msgid "A statement cannot be canceled when its lines are reconciled."
-msgstr ""
-
-#. module: account
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only once time on same taxes."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:387
-#, python-format
-msgid "A transaction can't have a 0 amount."
-msgstr ""
-
-#. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
 msgid "A typical company may use one journal per payment method (cash,\n"
 "                bank accounts, checks), one purchase journal, one sales journal\n"
@@ -933,12 +848,13 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:467
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:469
-#: code:addons/account/static/src/xml/account_reconciliation.xml:168
-#: code:addons/account/static/src/xml/account_reconciliation.xml:217
-#: code:addons/account/static/src/xml/account_reconciliation.xml:242
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:493
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:495
+#: code:addons/account/static/src/xml/account_reconciliation.xml:170
+#: code:addons/account/static/src/xml/account_reconciliation.xml:228
+#: code:addons/account/static/src/xml/account_reconciliation.xml:253
 #: model:ir.model,name:account.model_account_account
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_account_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_account_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_account_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_account_id
@@ -958,6 +874,11 @@ msgid "Account"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
+msgid "Account Accountant"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
 msgstr ""
@@ -1016,6 +937,17 @@ msgid "Account Entry"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_group_form
+#: model:ir.ui.view,arch_db:account.view_account_group_tree
+msgid "Account Group"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_group_tree
+msgid "Account Groups"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner_bank_journal_id
 #: model:ir.ui.view,arch_db:account.view_account_bank_journal_tree
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
@@ -1099,6 +1031,11 @@ msgid "Account Reports Hierarchy"
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_account_cash_rounding
+msgid "Account Rounding"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_account_src_id
 msgid "Account Source"
 msgstr ""
@@ -1117,6 +1054,11 @@ msgid "Account Tag"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.account_tag_action
+msgid "Account Tags"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_tax_form
 #: model:ir.ui.view,arch_db:account.view_tax_tree
 msgid "Account Tax"
@@ -1129,6 +1071,11 @@ msgid "Account Tax Template"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_taxcloud
+msgid "Account TaxCloud"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
 #: model:ir.ui.view,arch_db:account.view_account_template_form
 #: model:ir.ui.view,arch_db:account.view_account_template_search
@@ -1188,6 +1135,16 @@ msgid "Account Unreconcile"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_group_search
+msgid "Account group"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_group_search
+msgid "Account groups"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
 msgstr ""
@@ -1237,19 +1194,11 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_cash_basis_account
 #: model:ir.model.fields,help:account.field_account_tax_template_cash_basis_account
-msgid "Account use when creating entry for tax cash basis"
-msgstr ""
-
-#. module: account
-#: model:res.groups,name:account.group_account_user
-msgid "Accountant"
+msgid "Account used as counterpart for the journal entry, for taxes exigible based on payments."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_accountant
 #: model:ir.ui.menu,name:account.account_account_menu
-#: model:ir.ui.menu,name:account.menu_finance
-#: model:ir.ui.view,arch_db:account.view_partner_property_form
 msgid "Accounting"
 msgstr ""
 
@@ -1280,6 +1229,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_finance_entries_accounting_entries
 #: model:ir.ui.view,arch_db:account.view_partner_property_form
 msgid "Accounting Entries"
 msgstr ""
@@ -1290,11 +1240,6 @@ msgid "Accounting Report"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Accounting Reports"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Accounting Settings"
 msgstr ""
@@ -1329,14 +1274,13 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.account_tag_action
-#: model:ir.ui.menu,name:account.account_tag_menu
-msgid "Accounts Tags"
+#: model:ir.ui.menu,name:account.menu_finance_entries_actions
+msgid "Actions"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Activate Currencies"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Activate Other Currencies"
 msgstr ""
 
 #. module: account
@@ -1345,10 +1289,13 @@ msgid "Activate the option in the"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_account_tag_active
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_active
+#: model:ir.model.fields,field_description:account.field_account_journal_active
 #: model:ir.model.fields,field_description:account.field_account_payment_term_active
 #: model:ir.model.fields,field_description:account.field_account_tax_active
 #: model:ir.model.fields,field_description:account.field_account_tax_template_active
+#: model:ir.ui.view,arch_db:account.view_account_tax_search
 msgid "Active"
 msgstr ""
 
@@ -1366,6 +1313,11 @@ msgid "Add Credit Note"
 msgstr ""
 
 #. module: account
+#: selection:account.cash.rounding,strategy:0
+msgid "Add a rounding line"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_has_second_line
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_has_second_line
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -1373,11 +1325,6 @@ msgid "Add a second line"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Add all accounting features: journal entries, legal statements, etc."
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
 #: model:ir.ui.view,arch_db:account.view_move_line_form
 msgid "Add an internal note..."
@@ -1416,7 +1363,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
-#: model:res.groups,name:account.group_account_manager
 msgid "Adviser"
 msgstr ""
 
@@ -1432,7 +1378,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
-#: model:ir.actions.report.xml,name:account.action_report_aged_partner_balance
+#: model:ir.actions.report,name:account.action_report_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 #: model:ir.ui.view,arch_db:account.account_aged_balance_view
 #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
@@ -1461,6 +1407,7 @@ msgstr ""
 #: selection:account.print.journal,target_move:0
 #: selection:account.report.general.ledger,target_move:0
 #: selection:account.report.partner.ledger,target_move:0
+#: selection:account.tax.report,target_move:0
 #: selection:accounting.report,target_move:0
 #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
 #: model:ir.ui.view,arch_db:account.report_financial
@@ -1491,6 +1438,7 @@ msgstr ""
 #: selection:account.print.journal,target_move:0
 #: selection:account.report.general.ledger,target_move:0
 #: selection:account.report.partner.ledger,target_move:0
+#: selection:account.tax.report,target_move:0
 #: selection:accounting.report,target_move:0
 #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
 #: model:ir.ui.view,arch_db:account.report_financial
@@ -1513,7 +1461,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:44
+#: code:addons/account/static/src/xml/account_reconciliation.xml:47
 #, python-format
 msgid "All invoices and payments have been matched, your accounts' balances are clean."
 msgstr ""
@@ -1529,7 +1477,7 @@ msgid "All selected journal entries will be validated and posted. You won't be a
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:247
+#: code:addons/account/models/account_bank_statement.py:240
 #, python-format
 msgid "All the account entries lines must be processed in order to close the statement."
 msgstr ""
@@ -1540,7 +1488,7 @@ msgid "Allow Cancelling Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_currency_rate_live
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
 msgid "Allow Currency Rate Live"
 msgstr ""
 
@@ -1550,7 +1498,7 @@ msgid "Allow Invoices & payments Matching"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_product_margin
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_product_margin
 msgid "Allow Product Margin"
 msgstr ""
 
@@ -1560,25 +1508,30 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_l10n_us_check_printing
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_l10n_us_check_printing
 msgid "Allow check printing and deposits"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_group_multi_currency
-msgid "Allow multi currencies"
+#: model:res.groups,name:account.group_cash_rounding
+msgid "Allow the cash rounding managment"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Allow to configure taxes using cash basis"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Allows you to use the analytic accounting."
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:191
-#: code:addons/account/static/src/xml/account_reconciliation.xml:224
-#: code:addons/account/static/src/xml/account_reconciliation.xml:241
+#: code:addons/account/static/src/xml/account_reconciliation.xml:193
+#: code:addons/account/static/src/xml/account_reconciliation.xml:235
+#: code:addons/account/static/src/xml/account_reconciliation.xml:252
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
 #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
@@ -1591,6 +1544,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_cash_box_in_amount
 #: model:ir.model.fields,field_description:account.field_cash_box_out_amount
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_amount
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #: model:ir.ui.view,arch_db:account.view_account_payment_tree
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -1611,6 +1565,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_residual
 #: model:ir.ui.view,arch_db:account.invoice_tree
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
 msgid "Amount Due"
 msgstr ""
 
@@ -1630,11 +1585,21 @@ msgid "Amount Paid"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_rounding
+msgid "Amount Rounding"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal_signed
 msgid "Amount Signed"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
+msgid "Amount Total"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_amount_type
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_amount_type
 msgid "Amount Type"
@@ -1693,22 +1658,24 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:176
+#: code:addons/account/static/src/xml/account_reconciliation.xml:178
 #, python-format
 msgid "Analytic Acc."
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_account_analytic_id
+#: model:ir.model.fields,field_description:account.field_account_invoice_report_account_analytic_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_analytic_account_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_analytic_id
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_analytic_account_id
+#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_group_analytic_accounting
+#: model:ir.model.fields,field_description:account.field_res_config_settings_group_analytic_accounting
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
 msgstr ""
@@ -1716,18 +1683,12 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_partner_analytic_accounts
 #: model:ir.ui.menu,name:account.account_analytic_def_account
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.partner_view_button_contracts_count
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Analytic Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.account_analytic_tag_menu
-msgid "Analytic Accounts Tags"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_template_analytic
 msgid "Analytic Cost"
 msgstr ""
@@ -1746,12 +1707,12 @@ msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
 msgid "Analytic Lines"
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_analytic_tag_ids
+#: model:ir.ui.menu,name:account.account_analytic_tag_menu
 msgid "Analytic Tags"
 msgstr ""
 
@@ -1771,7 +1732,7 @@ msgid "Analytic tags"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Analytics"
 msgstr ""
 
@@ -1810,7 +1771,7 @@ msgid "Apply only if partner has a VAT number."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Apply right VAT rates for digital products sold in EU"
 msgstr ""
 
@@ -1820,6 +1781,11 @@ msgid "April"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_journal_search
+msgid "Archived"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Ask for a Credit Note"
 msgstr ""
@@ -1830,7 +1796,7 @@ msgid "Assets"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_asset
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_asset
 msgid "Assets Management"
 msgstr ""
 
@@ -1860,13 +1826,30 @@ msgid "Auto-detect"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Automatic Import"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Automate deferred revenues entries for multi-year contracts"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Automatic Rates"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Automated Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:339
+#: code:addons/account/wizard/setup_wizards.py:66
+#, python-format
+msgid "Automatic Balancing Line"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Automatic Currency Rates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Automatic Import"
 msgstr ""
 
 #. module: account
@@ -1882,7 +1865,7 @@ msgid "Automatic reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:472
+#: code:addons/account/models/account_bank_statement.py:468
 #, python-format
 msgid "Automatically reconciled items"
 msgstr ""
@@ -1899,7 +1882,7 @@ msgid "Awaiting payments"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:186
+#: code:addons/account/models/chart_template.py:189
 #, python-format
 msgid "BILL"
 msgstr ""
@@ -1941,7 +1924,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:736
+#: code:addons/account/models/chart_template.py:747
 #: model:ir.model.fields,field_description:account.field_account_journal_bank_id
 #: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count
 #: model:ir.model.fields,field_description:account.field_res_users_bank_account_count
@@ -1950,11 +1933,12 @@ msgid "Bank"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Bank &amp; Cash"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/company.py:153
 #: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard_bank_account_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_bank_account_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_partner_bank_id
@@ -1962,6 +1946,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_journal_bank_account_id
 #: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
+#, python-format
 msgid "Bank Account"
 msgstr ""
 
@@ -1976,9 +1961,12 @@ msgid "Bank Account Number to which the invoice will be paid. A Company bank acc
 msgstr ""
 
 #. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:21
 #: model:ir.actions.act_window,name:account.action_account_bank_journal_form
 #: model:ir.model,name:account.model_res_partner_bank
 #: model:ir.ui.menu,name:account.menu_action_account_bank_journal_form
+#, python-format
 msgid "Bank Accounts"
 msgstr ""
 
@@ -1993,7 +1981,7 @@ msgid "Bank Feeds"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_yodlee
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_yodlee
 msgid "Bank Interface - Sync your bank feeds automatically"
 msgstr ""
 
@@ -2018,6 +2006,11 @@ msgid "Bank Reconciliation Move preset"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_company_account_setup_bank_data_done
+msgid "Bank Setup Marked As Done"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:ir.ui.view,arch_db:account.view_bank_statement_form
 #: model:ir.ui.view,arch_db:account.view_bank_statement_search
@@ -2037,6 +2030,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
 msgid "Bank Statements"
 msgstr ""
 
@@ -2058,6 +2052,11 @@ msgid "Bank reconciliation"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal_account_setup_bank_data_done
+msgid "Bank setup marked as done"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_statement_line_id
 msgid "Bank statement line reconciled with this entry"
 msgstr ""
@@ -2069,30 +2068,50 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:31
+#: code:addons/account/static/src/xml/account_reconciliation.xml:34
 #, python-format
 msgid "Bank statements are fully reconciled."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:42
+#: code:addons/account/models/account_journal_dashboard.py:39
 #, python-format
 msgid "Bank: Balance"
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_tax_base
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 msgid "Base"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_tax_base_amount
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "Base Amount"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: selection:account.tax,tax_exigibility:0
+#: selection:account.tax.template,tax_exigibility:0
+msgid "Based on Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_tax_tax_exigibility
+#: model:ir.model.fields,help:account.field_account_tax_template_tax_exigibility
+msgid "Based on Invoice: the tax is due as soon as the invoice is validated.\n"
+"Based on Payment: the tax is due as soon as the payment of the invoice is received."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,tax_exigibility:0
+#: selection:account.tax.template,tax_exigibility:0
+msgid "Based on Payment"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Batch Deposits"
 msgstr ""
 
@@ -2129,22 +2148,22 @@ msgid "Billing"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Bills"
+#: model:res.groups,name:account.group_account_manager
+msgid "Billing Manager"
 msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Bills Analysis"
+msgid "Bills"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Bills Payment"
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Bills Analysis"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:179
+#: code:addons/account/models/account_journal_dashboard.py:186
 #, python-format
 msgid "Bills to pay"
 msgstr ""
@@ -2165,7 +2184,7 @@ msgid "Browse available countries."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_budget
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_budget
 msgid "Budget Management"
 msgstr ""
 
@@ -2211,19 +2230,19 @@ msgid "By unchecking the active field, you may hide a fiscal position without de
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:165
-#: code:addons/account/models/chart_template.py:189
+#: code:addons/account/models/chart_template.py:168
+#: code:addons/account/models/chart_template.py:192
 #, python-format
 msgid "CABA"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "CAMT Import"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "CSV Import"
 msgstr ""
 
@@ -2235,8 +2254,6 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_aged_balance_view
 #: model:ir.ui.view,arch_db:account.account_common_report_view
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-#: model:ir.ui.view,arch_db:account.account_invoice_cancel_view
 #: model:ir.ui.view,arch_db:account.account_invoice_confirm_view
 #: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
 #: model:ir.ui.view,arch_db:account.account_unreconcile_view
@@ -2255,42 +2272,6 @@ msgid "Cancel"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "Cancel Bill"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_move_form
-msgid "Cancel Entry"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_form
-msgid "Cancel Invoice"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_invoice_cancel_view
-msgid "Cancel Invoices"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
-#: model:ir.ui.view,arch_db:account.account_invoice_cancel_view
-msgid "Cancel Selected Invoices"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_bank_statement_form
-msgid "Cancel Statement"
-msgstr ""
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr ""
-
-#. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create credit note and reconcile"
 msgstr ""
@@ -2303,6 +2284,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Cancelled Invoice"
 msgstr ""
@@ -2320,32 +2302,32 @@ msgid "Cannot create credit note for the draft/cancelled invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:189
+#: code:addons/account/models/account_move.py:195
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:221
+#: code:addons/account/models/account_move.py:227
 #, python-format
 msgid "Cannot create unbalanced journal entry."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:499
+#: code:addons/account/models/account_invoice.py:635
 #, python-format
 msgid "Cannot find a chart of accounts for this company, You should configure it. \n"
 "Please go to Account Configuration."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:392
+#: code:addons/account/models/account.py:579
 #, python-format
 msgid "Cannot generate an unused account code."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:422
+#: code:addons/account/models/account.py:609
 #, python-format
 msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
 msgstr ""
@@ -2353,7 +2335,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:736
+#: code:addons/account/models/chart_template.py:747
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -2364,12 +2346,17 @@ msgid "Cash Accounts Prefix"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_tax_exigibility
+msgid "Cash Basis"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
 msgid "Cash Basis Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:189
+#: code:addons/account/models/chart_template.py:192
 #, python-format
 msgid "Cash Basis Tax Journal"
 msgstr ""
@@ -2392,6 +2379,23 @@ msgid "Cash Registers"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_group_cash_rounding
+msgid "Cash Rounding"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_cash_rounding_id
+msgid "Cash Rounding Method"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.rounding_list_action
+#: model:ir.ui.menu,name:account.menu_action_rounding_form_view
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Cash Roundings"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Cash Statements"
 msgstr ""
@@ -2408,7 +2412,7 @@ msgid "Cash difference observed during the counting (%s)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:40
+#: code:addons/account/models/account_journal_dashboard.py:37
 #, python-format
 msgid "Cash: Balance"
 msgstr ""
@@ -2449,6 +2453,18 @@ msgid "Change label of the counterpart that will hold the payment difference"
 msgstr ""
 
 #. module: account
+#: code:addons/account/controllers/portal.py:146
+#, python-format
+msgid "Changing VAT number is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
+msgstr ""
+
+#. module: account
+#: code:addons/account/controllers/portal.py:149
+#, python-format
+msgid "Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template_chart_template_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_chart_template_id
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_chart_template_id
@@ -2464,9 +2480,18 @@ msgid "Chart Templates"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_company_account_setup_coa_done
+msgid "Chart of Account Checked"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/models/company.py:206
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:13
 #: model:ir.actions.act_window,name:account.action_account_form
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.view,arch_db:account.account_planner
+#, python-format
 msgid "Chart of Accounts"
 msgstr ""
 
@@ -2529,7 +2554,7 @@ msgid "Check this option if you want the user to reconcile entries in this accou
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Checks"
 msgstr ""
 
@@ -2542,7 +2567,7 @@ msgid "Children Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:147
+#: code:addons/account/models/chart_template.py:150
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #, python-format
 msgid "Choose Accounting Template"
@@ -2550,7 +2575,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:129
+#: code:addons/account/static/src/xml/account_reconciliation.xml:131
 #, python-format
 msgid "Choose counterpart"
 msgstr ""
@@ -2576,11 +2601,6 @@ msgid "Click to add an account."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Click to add/remove from favorite"
-msgstr ""
-
-#. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_out_refund
 msgid "Click to create a credit note."
 msgstr ""
@@ -2633,14 +2653,14 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:249
+#: code:addons/account/static/src/xml/account_reconciliation.xml:260
 #, python-format
 msgid "Close"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:58
+#: code:addons/account/static/src/xml/account_reconciliation.xml:60
 #, python-format
 msgid "Close statement"
 msgstr ""
@@ -2663,11 +2683,21 @@ msgid "Code"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_group_code_prefix
+msgid "Code Prefix"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_coin_value
 msgid "Coin/Bill Value"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Collect customer payments in one-click using Euro SEPA Service."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_tag_color
 #: model:ir.model.fields,field_description:account.field_account_journal_color
 msgid "Color Index"
@@ -2722,7 +2752,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_company_id
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_company_id
 #: model:ir.model.fields,field_description:account.field_account_common_report_company_id
-#: model:ir.model.fields,field_description:account.field_account_config_settings_company_id
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_company_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_company_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_company_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_company_id
@@ -2732,6 +2762,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_company_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_company_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_company_id
+#: model:ir.model.fields,field_description:account.field_account_opening_company_id
 #: model:ir.model.fields,field_description:account.field_account_payment_company_id
 #: model:ir.model.fields,field_description:account.field_account_payment_term_company_id
 #: model:ir.model.fields,field_description:account.field_account_print_journal_company_id
@@ -2740,6 +2771,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_company_id
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_company_id
 #: model:ir.model.fields,field_description:account.field_account_tax_company_id
+#: model:ir.model.fields,field_description:account.field_account_tax_report_company_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template_company_id
 #: model:ir.model.fields,field_description:account.field_accounting_report_company_id
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_company_id
@@ -2758,7 +2790,20 @@ msgid "Company Currency"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_has_chart_of_accounts
+#. openerp-web
+#: code:addons/account/models/company.py:137
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:25
+#, python-format
+msgid "Company Data"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company_account_setup_company_data_done
+msgid "Company Setup Marked As Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_has_chart_of_accounts
 msgid "Company has a chart of accounts"
 msgstr ""
 
@@ -2774,7 +2819,7 @@ msgid "Company related to this journal"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Compare actual revenues &amp; costs with budgets"
 msgstr ""
 
@@ -2790,12 +2835,17 @@ msgid "Complete Set of Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:434
+#: code:addons/account/models/account_invoice.py:570
 #, python-format
 msgid "Compose Email"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Compute tax rates based on U.S. ZIP codes"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_counterpart
 msgid "Compute the counter part accounts of this journal item for this journal entry. This can be needed in reports."
 msgstr ""
@@ -2811,28 +2861,35 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:509
-#: code:addons/account/models/account_payment.py:511
+#: code:addons/account/models/account_payment.py:616
+#: code:addons/account/models/account_payment.py:618
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:346
+#. openerp-web
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:29
+#, python-format
+msgid "Configuration Steps:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:460
 #, python-format
 msgid "Configuration error!\n"
 "Could not find any account to create the invoice, are you sure you have a chart of account installed?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:259
+#: code:addons/account/models/account.py:443
 #, python-format
 msgid "Configuration error!\n"
 "The currency of the journal should be the same than the default credit account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:261
+#: code:addons/account/models/account.py:445
 #, python-format
 msgid "Configuration error!\n"
 "The currency of the journal should be the same than the default debit account."
@@ -2850,7 +2907,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_config
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
 msgid "Configure Accounting"
 msgstr ""
 
@@ -2873,6 +2929,11 @@ msgid "Confirm Invoices"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.server,name:account.action_account_confirm_payments
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
 msgstr ""
@@ -2889,9 +2950,9 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:50
+#: code:addons/account/static/src/xml/account_reconciliation.xml:52
 #, python-format
-msgid "Congrats, you're all done !"
+msgid "Congrats, you're all done!"
 msgstr ""
 
 #. module: account
@@ -2928,6 +2989,12 @@ msgid "Cost of Revenue"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/chart_template.py:860
+#, python-format
+msgid "Could not install new chart of account as there are already accounting entries existing"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_counterpart
 msgid "Counterpart"
 msgstr ""
@@ -2966,7 +3033,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:129
+#: code:addons/account/static/src/xml/account_reconciliation.xml:131
 #, python-format
 msgid "Create Write-off"
 msgstr ""
@@ -2982,25 +3049,30 @@ msgid "Create and post move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:258
+#: code:addons/account/models/account_journal_dashboard.py:285
 #, python-format
 msgid "Create cash statement"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:244
+#: code:addons/account/models/account_journal_dashboard.py:271
 #, python-format
 msgid "Create invoice/bill"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:161
+#: code:addons/account/static/src/xml/account_reconciliation.xml:163
 #, python-format
 msgid "Create model"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,help:account.rounding_list_action
+msgid "Create the first cash rounding"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Create your products"
 msgstr ""
@@ -3017,14 +3089,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_create_uid
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_create_uid
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_create_uid
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_create_uid
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_create_uid
 #: model:ir.model.fields,field_description:account.field_account_chart_template_create_uid
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_create_uid
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_create_uid
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_create_uid
 #: model:ir.model.fields,field_description:account.field_account_common_report_create_uid
-#: model:ir.model.fields,field_description:account.field_account_config_settings_create_uid
 #: model:ir.model.fields,field_description:account.field_account_financial_report_create_uid
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_create_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_create_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_create_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_create_uid
@@ -3032,7 +3105,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_create_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_create_uid
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_create_uid
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_create_uid
+#: model:ir.model.fields,field_description:account.field_account_group_create_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_create_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_create_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_create_uid
@@ -3044,6 +3117,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_create_uid
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_create_uid
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_create_uid
+#: model:ir.model.fields,field_description:account.field_account_opening_create_uid
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_create_uid
 #: model:ir.model.fields,field_description:account.field_account_payment_create_uid
 #: model:ir.model.fields,field_description:account.field_account_payment_method_create_uid
@@ -3057,6 +3131,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_create_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_group_create_uid
+#: model:ir.model.fields,field_description:account.field_account_tax_report_create_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_template_create_uid
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_create_uid
 #: model:ir.model.fields,field_description:account.field_accounting_report_create_uid
@@ -3080,14 +3155,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_create_date
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_create_date
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_create_date
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_create_date
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_create_date
 #: model:ir.model.fields,field_description:account.field_account_chart_template_create_date
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_create_date
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_create_date
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_create_date
 #: model:ir.model.fields,field_description:account.field_account_common_report_create_date
-#: model:ir.model.fields,field_description:account.field_account_config_settings_create_date
 #: model:ir.model.fields,field_description:account.field_account_financial_report_create_date
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_create_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_create_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_create_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_create_date
@@ -3095,7 +3171,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_create_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_create_date
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_create_date
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_create_date
+#: model:ir.model.fields,field_description:account.field_account_group_create_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_create_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_create_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_create_date
@@ -3107,6 +3183,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_create_date
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_create_date
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_create_date
+#: model:ir.model.fields,field_description:account.field_account_opening_create_date
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_create_date
 #: model:ir.model.fields,field_description:account.field_account_payment_create_date
 #: model:ir.model.fields,field_description:account.field_account_payment_method_create_date
@@ -3120,6 +3197,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_date
 #: model:ir.model.fields,field_description:account.field_account_tax_create_date
 #: model:ir.model.fields,field_description:account.field_account_tax_group_create_date
+#: model:ir.model.fields,field_description:account.field_account_tax_report_create_date
 #: model:ir.model.fields,field_description:account.field_account_tax_template_create_date
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_create_date
 #: model:ir.model.fields,field_description:account.field_accounting_report_create_date
@@ -3157,13 +3235,15 @@ msgid "Credit Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:998
+#: code:addons/account/models/account_invoice.py:439
+#: code:addons/account/models/account_invoice.py:1225
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 #: model:ir.model,name:account.model_account_invoice_refund
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #: model:ir.ui.view,arch_db:account.invoice_form
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #: model:ir.ui.view,arch_db:account.view_account_invoice_refund
 #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
@@ -3172,6 +3252,12 @@ msgid "Credit Note"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_invoice.py:440
+#, python-format
+msgid "Credit Note - %s"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Credit Note Bill"
 msgstr ""
@@ -3193,6 +3279,11 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_number_next
+msgid "Credit Notes: Next Number"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
 msgid "Credit account"
 msgstr ""
@@ -3209,7 +3300,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_currency_form
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Currencies"
 msgstr ""
 
@@ -3220,7 +3311,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_currency_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_currency_id
 #: model:ir.model.fields,field_description:account.field_account_chart_template_currency_id
-#: model:ir.model.fields,field_description:account.field_account_config_settings_currency_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_currency_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_currency_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_currency_id
@@ -3228,11 +3318,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_journal_currency_id
 #: model:ir.model.fields,field_description:account.field_account_move_currency_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_currency_id
+#: model:ir.model.fields,field_description:account.field_account_opening_currency_id
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_company_currency_id
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_company_id
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_currency_id
 #: model:ir.model.fields,field_description:account.field_account_payment_currency_id
 #: model:ir.model.fields,field_description:account.field_account_register_payments_currency_id
+#: model:ir.model.fields,field_description:account.field_res_config_settings_currency_id
 #: model:ir.model.fields,field_description:account.field_res_partner_currency_id
 #: model:ir.model.fields,field_description:account.field_res_users_currency_id
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_currency_id
@@ -3255,8 +3347,8 @@ msgid "Currency as per company's country."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1450
-#: code:addons/account/models/account_move.py:1465
+#: code:addons/account/models/account_move.py:1569
+#: code:addons/account/models/account_move.py:1581
 #, python-format
 msgid "Currency exchange rate difference"
 msgstr ""
@@ -3291,7 +3383,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:542
+#: code:addons/account/models/account_payment.py:649
 #, python-format
 msgid "Customer Credit Note"
 msgstr ""
@@ -3314,7 +3406,7 @@ msgid "Customer Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:185
+#: code:addons/account/models/chart_template.py:188
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -3323,7 +3415,7 @@ msgid "Customer Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:540
+#: code:addons/account/models/account_payment.py:647
 #, python-format
 msgid "Customer Payment"
 msgstr ""
@@ -3335,7 +3427,7 @@ msgid "Customer Payment Terms"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Customer Payments"
 msgstr ""
 
@@ -3356,7 +3448,15 @@ msgid "Customers"
 msgstr ""
 
 #. module: account
+#: selection:account.cash.rounding,rounding_method:0
+msgid "DOWN"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_dashboard_setup_bar.js:214
 #: model:ir.ui.menu,name:account.menu_board_journal_1
+#, python-format
 msgid "Dashboard"
 msgstr ""
 
@@ -3365,8 +3465,8 @@ msgstr ""
 #: selection:account.print.journal,sort_selection:0
 #: selection:account.report.general.ledger,sortby:0
 #: selection:accounting.report,filter_cmp:0
-#: code:addons/account/static/src/xml/account_reconciliation.xml:222
-#: code:addons/account/static/src/xml/account_reconciliation.xml:237
+#: code:addons/account/static/src/xml/account_reconciliation.xml:233
+#: code:addons/account/static/src/xml/account_reconciliation.xml:248
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_date
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_date
@@ -3387,6 +3487,16 @@ msgid "Date"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_opening_date
+msgid "Date at which the opening entry of this company's accounting has been posted."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_financial_year_op_opening_date
+msgid "Date from which the accounting is managed in Odoo. It is the date of the opening entry."
+msgstr ""
+
+#. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_payment.xml:56
 #, python-format
@@ -3410,6 +3520,11 @@ msgid "Day(s) after the invoice date"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Deactivate setup bar on the dashboard"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_debit
 #: model:ir.ui.view,arch_db:account.report_financial
 #: model:ir.ui.view,arch_db:account.report_generalledger
@@ -3470,13 +3585,13 @@ msgid "Default Debit Account"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_default_purchase_tax_id
+#: model:ir.model.fields,field_description:account.field_res_config_settings_default_purchase_tax_id
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_purchase_tax_id
 msgid "Default Purchase Tax"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_default_sale_tax_id
+#: model:ir.model.fields,field_description:account.field_res_config_settings_default_sale_tax_id
 msgid "Default Sale Tax"
 msgstr ""
 
@@ -3488,18 +3603,33 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_tax_ids
 #: model:ir.model.fields,field_description:account.field_account_account_template_tax_ids
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_form
 #: model:ir.ui.view,arch_db:account.view_account_template_form
 msgid "Default Taxes"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Default taxes applied to local transactions"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Deferred Revenues Management"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Define the smallest coinage of the currency used to pay by cash."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_cash_rounding_id
+msgid "Defines the smallest coinage of the currency that can be used to pay by cash."
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_form
 #: model:ir.ui.view,arch_db:account.view_tax_form
 msgid "Definition"
@@ -3529,9 +3659,10 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:240
+#: code:addons/account/static/src/xml/account_reconciliation.xml:251
 #: model:ir.model.fields,field_description:account.field_account_account_type_note
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_name
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #: model:ir.ui.view,arch_db:account.view_account_payment_search
 #: model:ir.ui.view,arch_db:account.view_account_type_form
@@ -3582,11 +3713,17 @@ msgid "Direct connection to your bank"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
+msgid "Discard"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_discount
 msgid "Discount (%)"
 msgstr ""
@@ -3616,14 +3753,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_display_name
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_display_name
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_display_name
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_display_name
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_display_name
 #: model:ir.model.fields,field_description:account.field_account_chart_template_display_name
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_display_name
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_display_name
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_display_name
 #: model:ir.model.fields,field_description:account.field_account_common_report_display_name
-#: model:ir.model.fields,field_description:account.field_account_config_settings_display_name
 #: model:ir.model.fields,field_description:account.field_account_financial_report_display_name
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_display_name
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_display_name
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_display_name
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_display_name
@@ -3631,7 +3769,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_display_name
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_display_name
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_display_name
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_display_name
+#: model:ir.model.fields,field_description:account.field_account_group_display_name
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_display_name
 #: model:ir.model.fields,field_description:account.field_account_invoice_display_name
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_display_name
@@ -3644,6 +3782,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_display_name
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_display_name
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_display_name
+#: model:ir.model.fields,field_description:account.field_account_opening_display_name
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_display_name
 #: model:ir.model.fields,field_description:account.field_account_payment_display_name
 #: model:ir.model.fields,field_description:account.field_account_payment_method_display_name
@@ -3657,6 +3796,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_display_name
 #: model:ir.model.fields,field_description:account.field_account_tax_display_name
 #: model:ir.model.fields,field_description:account.field_account_tax_group_display_name
+#: model:ir.model.fields,field_description:account.field_account_tax_report_display_name
 #: model:ir.model.fields,field_description:account.field_account_tax_template_display_name
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_display_name
 #: model:ir.model.fields,field_description:account.field_accounting_report_display_name
@@ -3668,6 +3808,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_report_account_report_journal_display_name
 #: model:ir.model.fields,field_description:account.field_report_account_report_overdue_display_name
 #: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger_display_name
+#: model:ir.model.fields,field_description:account.field_report_account_report_tax_display_name
 #: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance_display_name
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_display_name
 #: model:ir.model.fields,field_description:account.field_validate_account_move_display_name
@@ -3696,8 +3837,8 @@ msgid "Display on Invoices"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_print_docsaway
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_print_docsaway
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Docsaway"
 msgstr ""
 
@@ -3708,11 +3849,22 @@ msgid "Document: Customer account statement<br/>\n"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_finance_payables_documents
+#: model:ir.ui.menu,name:account.menu_finance_receivables_documents
+msgid "Documents"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Don't hesitate to"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "Download"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Download the"
 msgstr ""
@@ -3739,8 +3891,11 @@ msgid "Draft Credit Note"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_invoice.py:437
 #: model:ir.ui.view,arch_db:account.invoice_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
+#, python-format
 msgid "Draft Invoice"
 msgstr ""
 
@@ -3771,9 +3926,11 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:223
+#: code:addons/account/controllers/portal.py:71
+#: code:addons/account/static/src/xml/account_reconciliation.xml:234
 #: model:ir.model.fields,field_description:account.field_account_invoice_date_due
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_date_due
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
 #: model:ir.ui.view,arch_db:account.report_overdue_document
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 #, python-format
@@ -3791,7 +3948,7 @@ msgid "Due Month"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.action_report_print_overdue
+#: model:ir.actions.report,name:account.action_report_print_overdue
 msgid "Due Payments"
 msgstr ""
 
@@ -3806,36 +3963,31 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:940
+#: code:addons/account/models/account_invoice.py:1167
 #, python-format
 msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note."
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_invoice_action_report_duplicate
-msgid "Duplicates"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_reports
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports
 msgid "Dynamic Reports"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_l10n_eu_service
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_l10n_eu_service
 msgid "EU Digital Goods VAT"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:163
-#: code:addons/account/models/chart_template.py:178
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:166
+#: code:addons/account/models/chart_template.py:181
+#: code:addons/account/models/chart_template.py:191
 #, python-format
 msgid "EXCH"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:954
+#: code:addons/account/models/account_move.py:1021
 #, python-format
 msgid "Either pass both debit and credit or none."
 msgstr ""
@@ -3851,7 +4003,7 @@ msgid "Enable Comparison"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_reports_followup
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
 msgid "Enable payment followup management"
 msgstr ""
 
@@ -3870,6 +4022,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_print_journal_date_to
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_date_to
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_date_to
+#: model:ir.model.fields,field_description:account.field_account_tax_report_date_to
 #: model:ir.model.fields,field_description:account.field_accounting_report_date_to
 #: model:ir.model.fields,field_description:account.field_accounting_report_date_to_cmp
 msgid "End Date"
@@ -3901,7 +4054,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:919
+#: code:addons/account/models/account_move.py:986
 #, python-format
 msgid "Entries are not of the same account!"
 msgstr ""
@@ -3939,19 +4092,25 @@ msgid "Equity"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/res_config_settings.py:132
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Excel template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:191
 #, python-format
 msgid "Exchange Difference"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_currency_exchange_journal_id
 #: model:ir.model.fields,field_description:account.field_res_company_currency_exchange_journal_id
+#: model:ir.model.fields,field_description:account.field_res_config_settings_currency_exchange_journal_id
 msgid "Exchange Gain or Loss Journal"
 msgstr ""
 
@@ -3961,11 +4120,6 @@ msgid "Exchange Move"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_full_reconcile_exchange_partial_rec_id
-msgid "Exchange Partial Rec"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Exchange rates can be automatically updated once a day from <strong>Yahoo Finance</strong> or the <strong>European Central Bank</strong>. You can activate this feature in the bottom of the"
 msgstr ""
@@ -4010,11 +4164,6 @@ msgid "Extra Features"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Favorite"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_journal_search
 msgid "Favorites"
 msgstr ""
@@ -4047,7 +4196,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:139
+#: code:addons/account/static/src/xml/account_reconciliation.xml:141
 #, python-format
 msgid "Filter..."
 msgstr ""
@@ -4059,11 +4208,6 @@ msgid "Financial Account"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_account_report
-msgid "Financial Report"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_report_style_overwrite
 msgid "Financial Report Style"
 msgstr ""
@@ -4081,11 +4225,21 @@ msgid "Financial Reports Hierarchy"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.action_report_financial
+#: model:ir.model.fields,field_description:account.field_res_company_account_setup_fy_data_done
+msgid "Financial Year Setup Marked As Done"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report,name:account.action_report_financial
 msgid "Financial report"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_account_setup_fy_data_done
+msgid "Financial year setup marked as done"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "First, register any outstanding customer invoices and vendor bills:"
 msgstr ""
@@ -4096,7 +4250,7 @@ msgid "Fiscal Information"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Fiscal Localization"
 msgstr ""
 
@@ -4106,6 +4260,11 @@ msgid "Fiscal Mapping"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Fiscal Periods"
+msgstr ""
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.model,name:account.model_account_fiscal_position
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_position_id
@@ -4137,11 +4296,21 @@ msgid "Fiscal Positions"
 msgstr ""
 
 #. module: account
+#. openerp-web
+#: code:addons/account/models/company.py:179
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:17
+#, python-format
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_day
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_day
 msgid "Fiscalyear Last Day"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_month
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_month
 msgid "Fiscalyear Last Month"
 msgstr ""
@@ -4175,7 +4344,12 @@ msgid "Fixed amount will count as a debit if it is negative, as a credit if it i
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.menu,name:account.menu_finance_receivables_follow_up
+msgid "Follow-up"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Follow-up Levels"
 msgstr ""
 
@@ -4213,12 +4387,13 @@ msgstr ""
 #: code:addons/account/report/account_journal.py:100
 #: code:addons/account/report/account_partner_ledger.py:74
 #: code:addons/account/report/account_report_financial.py:149
+#: code:addons/account/report/account_tax.py:13
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:86
+#: code:addons/account/models/account_invoice.py:93
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -4250,12 +4425,17 @@ msgid "Full Reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:116
+#: code:addons/account/models/account_journal_dashboard.py:113
 #, python-format
 msgid "Future"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "GROSS PROFIT"
 msgstr ""
@@ -4267,13 +4447,8 @@ msgid "Gain Exchange Rate Account"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
-msgid "General Information"
-msgstr ""
-
-#. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
-#: model:ir.actions.report.xml,name:account.action_report_general_ledger
+#: model:ir.actions.report,name:account.action_report_general_ledger
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr ""
@@ -4284,17 +4459,27 @@ msgid "General Ledger Report"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_finance_entries_generate_entries
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_reports_legal_statements_menu
+msgid "Generic Statements"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Get started"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Get warnings when invoicing specific customers"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Get your bank statements automatically imported every 4 hours, or in one-click, using Yodlee and Plaid services. Once installed, set “Bank Feeds” to “Bank Synchronization” in bank account settings. Then, click “Configure” on the online account to enter your bank credentials."
 msgstr ""
 
@@ -4320,13 +4505,13 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:55
+#: code:addons/account/static/src/xml/account_reconciliation.xml:57
 #, python-format
 msgid "Go to bank statement(s)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:500
+#: code:addons/account/models/account_invoice.py:636
 #, python-format
 msgid "Go to the configuration panel"
 msgstr ""
@@ -4338,13 +4523,19 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:31
-#: code:addons/account/static/src/xml/account_reconciliation.xml:43
+#: code:addons/account/static/src/xml/account_reconciliation.xml:34
+#: code:addons/account/static/src/xml/account_reconciliation.xml:46
 #, python-format
 msgid "Good Job!"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_account_group_id
+#: model:ir.model.fields,field_description:account.field_account_account_template_group_id
+msgid "Group"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
 #: model:ir.ui.view,arch_db:account.view_account_financial_report_search
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -4370,11 +4561,21 @@ msgid "Group of Taxes"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Group received checks before depositing them to the bank"
 msgstr ""
 
 #. module: account
+#: selection:account.cash.rounding,rounding_method:0
+msgid "HALF-UP"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_has_accounting_entries
+msgid "Has Accounting Entries"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment_has_invoices
 msgid "Has Invoices"
 msgstr ""
@@ -4398,12 +4599,23 @@ msgid "Hide Payment Method"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_account_hide_setup_bar
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Hide Setup Bar"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_tax_hide_tax_exigibility
+msgid "Hide Use Cash Basis Option"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
-msgid "How account type affects your reports?"
+msgid "How do account types affect your reports?"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "How total tax amount is computed in orders and invoices"
 msgstr ""
 
@@ -4420,14 +4632,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_id
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_id
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_id
 #: model:ir.model.fields,field_description:account.field_account_chart_template_id
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_id
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_id
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_id
 #: model:ir.model.fields,field_description:account.field_account_common_report_id
-#: model:ir.model.fields,field_description:account.field_account_config_settings_id
 #: model:ir.model.fields,field_description:account.field_account_financial_report_id
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_id
@@ -4435,7 +4648,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_id
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_id
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_id
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_id
+#: model:ir.model.fields,field_description:account.field_account_group_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_id
@@ -4448,6 +4661,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_id
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_id
+#: model:ir.model.fields,field_description:account.field_account_opening_id
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_id
 #: model:ir.model.fields,field_description:account.field_account_payment_id
 #: model:ir.model.fields,field_description:account.field_account_payment_method_id
@@ -4461,6 +4675,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_id
 #: model:ir.model.fields,field_description:account.field_account_tax_group_id
 #: model:ir.model.fields,field_description:account.field_account_tax_id
+#: model:ir.model.fields,field_description:account.field_account_tax_report_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template_id
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_id
 #: model:ir.model.fields,field_description:account.field_accounting_report_id
@@ -4472,6 +4687,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_report_account_report_journal_id
 #: model:ir.model.fields,field_description:account.field_report_account_report_overdue_id
 #: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger_id
+#: model:ir.model.fields,field_description:account.field_report_account_report_tax_id
 #: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance_id
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_id
 #: model:ir.model.fields,field_description:account.field_validate_account_move_id
@@ -4480,13 +4696,13 @@ msgid "ID"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:185
+#: code:addons/account/models/chart_template.py:188
 #, python-format
 msgid "INV"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:393
+#: code:addons/account/models/account_bank_statement.py:389
 #, python-format
 msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
 msgstr ""
@@ -4524,13 +4740,13 @@ msgid "If this box is checked, the system will try to group the accounting lines
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "If you check this box, you will be able to register your payment using SEPA."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "If you check this box, you will be able to collect payments using SEPA Direct Debit mandates."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "If you check this box, you will be able to register your payment using SEPA."
 msgstr ""
 
 #. module: account
@@ -4578,32 +4794,37 @@ msgid "If you want to do it yourself:"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition."
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_line_product_image
+msgid "Image of the product variant (Big-sized image of product template if false). It is automatically resized as a 1024x1024px image, with aspect ratio preserved."
+msgstr ""
+
+#. module: account
 #: model:account.payment.term,name:account.account_payment_term_immediate
 msgid "Immediate Payment"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_qif
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_bank_statement_import_qif
 msgid "Import .qif files"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_csv
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_bank_statement_import_csv
 msgid "Import in .csv format"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_ofx
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_bank_statement_import_ofx
 msgid "Import in .ofx format"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_camt
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_bank_statement_import_camt
 msgid "Import in CAMT.053 format"
 msgstr ""
 
@@ -4613,27 +4834,27 @@ msgid "Import using the \"Import\" button on the top left corner of"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements automatically"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in CAMT.053"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in CSV"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in OFX"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in QIF"
 msgstr ""
 
@@ -4648,7 +4869,7 @@ msgid "In Odoo,"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:413
+#: code:addons/account/models/account_bank_statement.py:409
 #, python-format
 msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items."
 msgstr ""
@@ -4660,13 +4881,7 @@ msgid "In order to delete a bank statement, you must first cancel it to delete r
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:130
-#, python-format
-msgid "In order to pay multiple invoices at once, they must belong to the same commercial partner."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_payment.py:134
+#: code:addons/account/models/account_payment.py:144
 #, python-format
 msgid "In order to pay multiple invoices at once, they must use the same currency."
 msgstr ""
@@ -4677,6 +4892,11 @@ msgid "In your old accounting software, print a trial balance"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_tax_search
+msgid "Inactive"
+msgstr ""
+
+#. module: account
 #: selection:account.payment.method,payment_type:0
 msgid "Inbound"
 msgstr ""
@@ -4719,14 +4939,13 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:566
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:627
 #, python-format
 msgid "Incorrect Operation"
 msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
 msgid "Information"
 msgstr ""
 
@@ -4736,6 +4955,15 @@ msgid "Information addendum"
 msgstr ""
 
 #. module: account
+#. openerp-web
+#: code:addons/account/models/company.py:224
+#: code:addons/account/models/company.py:239
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:9
+#, python-format
+msgid "Initial Balances"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_input_categ_id
 #: model:ir.model.fields,field_description:account.field_res_company_property_stock_account_input_categ_id
 msgid "Input Account for Stock Valuation"
@@ -4747,7 +4975,7 @@ msgid "Install Chart of Account"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Install More Packages"
 msgstr ""
 
@@ -4801,7 +5029,7 @@ msgid "Invite Users"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:996
+#: code:addons/account/models/account_invoice.py:1223
 #: model:ir.model,name:account.model_account_invoice
 #: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id
@@ -4811,6 +5039,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.invoice_form
 #: model:ir.ui.view,arch_db:account.invoice_supplier_tree
 #: model:ir.ui.view,arch_db:account.invoice_tree
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
@@ -4820,15 +5050,29 @@ msgid "Invoice"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+msgid "Invoice #"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:438
+#, python-format
+msgid "Invoice - %s"
+msgstr ""
+
+#. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_created
 #: model:mail.message.subtype,name:account.mt_invoice_created
 msgid "Invoice Created"
 msgstr ""
 
 #. module: account
+#: code:addons/account/controllers/portal.py:70
 #: model:ir.model.fields,field_description:account.field_account_invoice_date_invoice
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
 #: model:ir.ui.view,arch_db:account.report_payment_receipt
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+#, python-format
 msgid "Invoice Date"
 msgstr ""
 
@@ -4856,6 +5100,11 @@ msgid "Invoice Number must be unique per Company!"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Invoice Number:"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_invoice_id
 msgid "Invoice Reference"
 msgstr ""
@@ -4876,31 +5125,31 @@ msgid "Invoice for which this invoice is the credit note"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:569
+#: code:addons/account/models/account_invoice.py:746
 #, python-format
 msgid "Invoice must be cancelled in order to reset it to draft."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:617
+#: code:addons/account/models/account_invoice.py:794
 #, python-format
 msgid "Invoice must be in draft or open state in order to be cancelled."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:591
+#: code:addons/account/models/account_invoice.py:768
 #, python-format
 msgid "Invoice must be in draft state in order to validate it."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:611
+#: code:addons/account/models/account_invoice.py:788
 #, python-format
 msgid "Invoice must be paid in order to set it to register payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:603
+#: code:addons/account/models/account_invoice.py:780
 #, python-format
 msgid "Invoice must be validated in order to set it to register payment."
 msgstr ""
@@ -4911,7 +5160,7 @@ msgid "Invoice paid"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1559
+#: code:addons/account/models/account_invoice.py:1815
 #, python-format
 msgid "Invoice sent"
 msgstr ""
@@ -4934,12 +5183,17 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_refund_out_tree
 #: model:ir.actions.act_window,name:account.action_invoice_tree
-#: model:ir.actions.report.xml,name:account.account_invoices
+#: model:ir.actions.report,name:account.account_invoices
 #: model:ir.model.fields,field_description:account.field_account_payment_invoice_ids
+#: model:ir.model.fields,field_description:account.field_account_register_payments_invoice_ids
 #: model:ir.model.fields,field_description:account.field_res_partner_invoice_ids
 #: model:ir.model.fields,field_description:account.field_res_users_invoice_ids
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.portal_my_home_invoice
+#: model:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 #: model:ir.ui.view,arch_db:account.view_account_payment_form
 #: model:ir.ui.view,arch_db:account.view_account_payment_graph
@@ -4965,7 +5219,7 @@ msgid "Invoices Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:179
+#: code:addons/account/models/account_journal_dashboard.py:186
 #, python-format
 msgid "Invoices owed to you"
 msgstr ""
@@ -4976,13 +5230,28 @@ msgid "Invoices to validate"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.actions.report,name:account.account_invoices_without_payment
+msgid "Invoices without Payment"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
 #: model:ir.ui.view,arch_db:account.product_template_form_view
 #: model:ir.ui.view,arch_db:account.view_partner_property_form
 msgid "Invoicing"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_is_unaffected_earnings_line
+msgid "Is Unaffected Earnings Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_line_is_rounding_line
+msgid "Is a rounding line in case of cash rounding."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_is_difference_zero
 msgid "Is zero"
 msgstr ""
@@ -5015,25 +5284,18 @@ msgid "It indicates that the invoice has been sent."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:952
+#: code:addons/account/models/account_move.py:1019
 #, python-format
 msgid "It is mandatory to specify an account and a journal to create a write-off."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:353
+#: code:addons/account/models/account_payment.py:442
 #, python-format
 msgid "It is not allowed to delete a payment that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert."
 msgstr ""
 
 #. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:51
-#, python-format
-msgid "It took you"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "It's common practice to change your accounting software \n"
 "                            at the end of a fiscal year. This allows you to have less \n"
@@ -5070,8 +5332,8 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:183
-#: code:addons/account/static/src/xml/account_reconciliation.xml:218
+#: code:addons/account/static/src/xml/account_reconciliation.xml:185
+#: code:addons/account/static/src/xml/account_reconciliation.xml:229
 #: model:ir.model,name:account.model_account_journal
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_journal_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_id
@@ -5079,12 +5341,14 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_journal_id
 #: model:ir.model.fields,field_description:account.field_account_move_journal_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_journal_id
+#: model:ir.model.fields,field_description:account.field_account_opening_journal_id
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_journal_id
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_journal_id
 #: model:ir.ui.view,arch_db:account.report_journal
 #: model:ir.ui.view,arch_db:account.view_account_journal_search
 #: model:ir.ui.view,arch_db:account.view_account_move_filter
 #: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
 #: model:ir.ui.view,arch_db:account.view_account_payment_search
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 #: model:ir.ui.view,arch_db:account.view_bank_statement_search
@@ -5098,7 +5362,7 @@ msgid "Journal & Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:261
+#: code:addons/account/models/account_bank_statement.py:254
 #: model:ir.actions.act_window,name:account.action_move_journal_line
 #: model:ir.actions.act_window,name:account.action_move_select
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
@@ -5138,7 +5402,6 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line
 #: model:ir.ui.view,arch_db:account.view_move_line_form
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
 msgid "Journal Item"
 msgstr ""
 
@@ -5151,7 +5414,7 @@ msgid "Journal Item Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:302
+#: code:addons/account/models/account_payment.py:391
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
 #: model:ir.actions.act_window,name:account.action_account_moves_all_a
@@ -5163,12 +5426,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_select_by_partner
 #: model:ir.actions.act_window,name:account.action_move_line_select_by_type
+#: model:ir.actions.act_window,name:account.action_move_line_select_tax_audit
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_entry_ids
 #: model:ir.model.fields,field_description:account.field_account_move_line_ids
 #: model:ir.model.fields,field_description:account.field_res_partner_journal_item_count
 #: model:ir.model.fields,field_description:account.field_res_users_journal_item_count
 #: model:ir.ui.menu,name:account.menu_action_account_moves_all
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
 #: model:ir.ui.view,arch_db:account.view_account_payment_form
 #: model:ir.ui.view,arch_db:account.view_move_form
 #: model:ir.ui.view,arch_db:account.view_move_line_pivot
@@ -5179,7 +5444,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:261
+#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:304
 #: model:ir.actions.client,name:account.action_manual_reconcile
 #, python-format
 msgid "Journal Items to Reconcile"
@@ -5206,6 +5471,11 @@ msgid "Journal items where matching number isn't set"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_opening_journal_id
+msgid "Journal where the opening entry of this company's accounting has been posted."
+msgstr ""
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_journal_ids
 #: model:ir.model.fields,field_description:account.field_account_balance_report_journal_ids
@@ -5216,6 +5486,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_print_journal_journal_ids
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_journal_ids
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_journal_ids
+#: model:ir.model.fields,field_description:account.field_account_tax_report_journal_ids
 #: model:ir.model.fields,field_description:account.field_accounting_report_journal_ids
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Journals"
@@ -5267,10 +5538,16 @@ msgid "Keep open"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_product_product_property_account_income_id
+#: model:ir.model.fields,help:account.field_product_template_property_account_income_id
+msgid "Keep this field empty to use the default value from the product category."
+msgstr ""
+
+#. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:468
-#: code:addons/account/static/src/xml/account_reconciliation.xml:187
-#: code:addons/account/static/src/xml/account_reconciliation.xml:219
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:494
+#: code:addons/account/static/src/xml/account_reconciliation.xml:189
+#: code:addons/account/static/src/xml/account_reconciliation.xml:230
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_name
 #: model:ir.model.fields,field_description:account.field_account_move_line_name
 #: model:ir.ui.view,arch_db:account.report_journal
@@ -5297,14 +5574,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox___last_update
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance___last_update
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line___last_update
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding___last_update
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line___last_update
 #: model:ir.model.fields,field_description:account.field_account_chart_template___last_update
 #: model:ir.model.fields,field_description:account.field_account_common_account_report___last_update
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report___last_update
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report___last_update
 #: model:ir.model.fields,field_description:account.field_account_common_report___last_update
-#: model:ir.model.fields,field_description:account.field_account_config_settings___last_update
 #: model:ir.model.fields,field_description:account.field_account_financial_report___last_update
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op___last_update
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position___last_update
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account___last_update
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template___last_update
@@ -5312,8 +5590,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template___last_update
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template___last_update
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile___last_update
+#: model:ir.model.fields,field_description:account.field_account_group___last_update
 #: model:ir.model.fields,field_description:account.field_account_invoice___last_update
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel___last_update
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm___last_update
 #: model:ir.model.fields,field_description:account.field_account_invoice_line___last_update
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund___last_update
@@ -5325,6 +5603,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile___last_update
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff___last_update
 #: model:ir.model.fields,field_description:account.field_account_move_reversal___last_update
+#: model:ir.model.fields,field_description:account.field_account_opening___last_update
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile___last_update
 #: model:ir.model.fields,field_description:account.field_account_payment___last_update
 #: model:ir.model.fields,field_description:account.field_account_payment_method___last_update
@@ -5338,6 +5617,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger___last_update
 #: model:ir.model.fields,field_description:account.field_account_tax___last_update
 #: model:ir.model.fields,field_description:account.field_account_tax_group___last_update
+#: model:ir.model.fields,field_description:account.field_account_tax_report___last_update
 #: model:ir.model.fields,field_description:account.field_account_tax_template___last_update
 #: model:ir.model.fields,field_description:account.field_account_unreconcile___last_update
 #: model:ir.model.fields,field_description:account.field_accounting_report___last_update
@@ -5349,6 +5629,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_report_account_report_journal___last_update
 #: model:ir.model.fields,field_description:account.field_report_account_report_overdue___last_update
 #: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger___last_update
+#: model:ir.model.fields,field_description:account.field_report_account_report_tax___last_update
 #: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance___last_update
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard___last_update
 #: model:ir.model.fields,field_description:account.field_validate_account_move___last_update
@@ -5363,7 +5644,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:117
+#: code:addons/account/static/src/xml/account_reconciliation.xml:119
 #, python-format
 msgid "Last Reconciliation:"
 msgstr ""
@@ -5380,14 +5661,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_write_uid
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_write_uid
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_write_uid
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_write_uid
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_write_uid
 #: model:ir.model.fields,field_description:account.field_account_chart_template_write_uid
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_write_uid
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_write_uid
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_write_uid
 #: model:ir.model.fields,field_description:account.field_account_common_report_write_uid
-#: model:ir.model.fields,field_description:account.field_account_config_settings_write_uid
 #: model:ir.model.fields,field_description:account.field_account_financial_report_write_uid
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_write_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_write_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_write_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_write_uid
@@ -5395,7 +5677,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_write_uid
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_write_uid
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_write_uid
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_write_uid
+#: model:ir.model.fields,field_description:account.field_account_group_write_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_write_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_write_uid
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_write_uid
@@ -5407,6 +5689,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_write_uid
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_write_uid
 #: model:ir.model.fields,field_description:account.field_account_move_write_uid
+#: model:ir.model.fields,field_description:account.field_account_opening_write_uid
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_write_uid
 #: model:ir.model.fields,field_description:account.field_account_payment_method_write_uid
 #: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_uid
@@ -5419,6 +5702,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_uid
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_group_write_uid
+#: model:ir.model.fields,field_description:account.field_account_tax_report_write_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_template_write_uid
 #: model:ir.model.fields,field_description:account.field_account_tax_write_uid
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_write_uid
@@ -5443,14 +5727,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance_write_date
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_write_date
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_write_date
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_write_date
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_write_date
 #: model:ir.model.fields,field_description:account.field_account_chart_template_write_date
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_write_date
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report_write_date
 #: model:ir.model.fields,field_description:account.field_account_common_partner_report_write_date
 #: model:ir.model.fields,field_description:account.field_account_common_report_write_date
-#: model:ir.model.fields,field_description:account.field_account_config_settings_write_date
 #: model:ir.model.fields,field_description:account.field_account_financial_report_write_date
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_write_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_write_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_write_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_write_date
@@ -5458,7 +5743,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_write_date
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_write_date
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_write_date
-#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_write_date
+#: model:ir.model.fields,field_description:account.field_account_group_write_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_confirm_write_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_write_date
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_write_date
@@ -5470,6 +5755,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_write_date
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_write_date
 #: model:ir.model.fields,field_description:account.field_account_move_write_date
+#: model:ir.model.fields,field_description:account.field_account_opening_write_date
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_write_date
 #: model:ir.model.fields,field_description:account.field_account_payment_method_write_date
 #: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_date
@@ -5482,6 +5768,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_date
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_date
 #: model:ir.model.fields,field_description:account.field_account_tax_group_write_date
+#: model:ir.model.fields,field_description:account.field_account_tax_report_write_date
 #: model:ir.model.fields,field_description:account.field_account_tax_template_write_date
 #: model:ir.model.fields,field_description:account.field_account_tax_write_date
 #: model:ir.model.fields,field_description:account.field_account_unreconcile_write_date
@@ -5516,6 +5803,11 @@ msgid "Last time the invoices & payments matching was performed on this account.
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_last_time_entries_checked
 #: model:ir.model.fields,field_description:account.field_res_partner_last_time_entries_checked
 #: model:ir.model.fields,field_description:account.field_res_users_last_time_entries_checked
@@ -5523,6 +5815,11 @@ msgid "Latest Invoices & Payments Matching Date"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_group_parent_left
+msgid "Left Parent"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Legal Name"
 msgstr ""
@@ -5538,7 +5835,7 @@ msgid "Legal mentions that have to be printed on the invoices."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:154
+#: code:addons/account/models/account_invoice.py:213
 #, python-format
 msgid "Less Payment"
 msgstr ""
@@ -5551,6 +5848,11 @@ msgid "Let odoo try to reconcile entries for the user"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Let your customers pay their invoices online"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_report_level
 msgid "Level"
 msgstr ""
@@ -5583,6 +5885,13 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:29
+#, python-format
+msgid "Load more"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_lock_date
 msgid "Lock Date"
 msgstr ""
@@ -5615,19 +5924,19 @@ msgid "Loss Exchange Rate Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:187
+#: code:addons/account/models/chart_template.py:190
 #, python-format
 msgid "MISC"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Mail your invoices in one-click using"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.account_planner
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Main Currency"
 msgstr ""
 
@@ -5637,12 +5946,12 @@ msgid "Main Title 1 (bold, underlined)"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_config_settings_currency_id
+#: model:ir.model.fields,help:account.field_res_config_settings_currency_id
 msgid "Main currency of the company."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Main currency of your company"
 msgstr ""
 
@@ -5664,6 +5973,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.account_management_menu
 #: model:ir.ui.menu,name:account.account_reports_management_menu
+#: model:ir.ui.menu,name:account.menu_finance_entries_management
 msgid "Management"
 msgstr ""
 
@@ -5692,6 +6002,31 @@ msgid "Manual Reconciliation"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_journal_inbound_payment_method_ids
+msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
+"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
+"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
+#: model:ir.model.fields,help:account.field_account_payment_payment_method_id
+#: model:ir.model.fields,help:account.field_account_register_payments_payment_method_id
+msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
+"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
+"Check: Pay bill by check and print it from Odoo.\n"
+"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
+"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed "
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
+msgid "Manual:Pay bill by cash or any other method outside of Odoo.\n"
+"Check:Pay bill by check and print it from Odoo.\n"
+"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings."
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Manually enter your transactions using our"
 msgstr ""
@@ -5702,16 +6037,29 @@ msgid "March"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Margin Analysis"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
+#: model:ir.ui.view,arch_db:account.setup_view_company_form
+msgid "Mark as done"
+msgstr ""
+
+#. module: account
 #: selection:account.payment,payment_difference_handling:0
 msgid "Mark invoice as fully paid"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_finance_payables_master_data
+#: model:ir.ui.menu,name:account.menu_finance_receivables_master_data
+msgid "Master Data"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_matched_credit_ids
 msgid "Matched Credit"
 msgstr ""
@@ -5749,16 +6097,6 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_journal_inbound_payment_method_ids
-msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
-msgid "Means of payment for sending money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_communication
 #: model:ir.model.fields,field_description:account.field_account_payment_communication
 #: model:ir.model.fields,field_description:account.field_account_register_payments_communication
@@ -5816,7 +6154,7 @@ msgid "Miscellaneous"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:187
+#: code:addons/account/models/chart_template.py:190
 #: model:ir.ui.view,arch_db:account.view_account_move_filter
 #, python-format
 msgid "Miscellaneous Operations"
@@ -5824,18 +6162,23 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:162
+#: code:addons/account/static/src/xml/account_reconciliation.xml:164
 #, python-format
 msgid "Modify models"
 msgstr ""
 
 #. module: account
+#: selection:account.cash.rounding,strategy:0
+msgid "Modify tax amount"
+msgstr ""
+
+#. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create credit note, reconcile and create a new draft invoice"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Monitor your product margins from invoices"
 msgstr ""
 
@@ -5876,19 +6219,23 @@ msgid "Move Reconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1245
+#: code:addons/account/models/account_move.py:1322
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_register_payments_multi
+msgid "Multi"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Multi Currency"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_config_multi_currency
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Multi-Currencies"
 msgstr ""
 
@@ -5917,7 +6264,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_account_name
 #: model:ir.model.fields,field_description:account.field_account_account_tag_name
 #: model:ir.model.fields,field_description:account.field_account_account_template_name
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_name
 #: model:ir.model.fields,field_description:account.field_account_chart_template_name
+#: model:ir.model.fields,field_description:account.field_account_group_name
 #: model:ir.model.fields,field_description:account.field_account_payment_method_name
 #: model:ir.model.fields,field_description:account.field_account_payment_name
 #: model:ir.model.fields,field_description:account.field_account_tax_group_name
@@ -5939,13 +6288,13 @@ msgid "Narration"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Navigate easily through reports and see what is behind the numbers"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.act_account_tax_net_posted
-msgid "Net Tax Lines (Posted)"
+#: model:ir.ui.view,arch_db:account.report_tax
+msgid "Net"
 msgstr ""
 
 #. module: account
@@ -5964,12 +6313,19 @@ msgid "New Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1222
+#: code:addons/account/models/account_move.py:1299
 #, python-format
 msgid "New expected payment date: "
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_sequence_number_next
+#: model:ir.model.fields,field_description:account.field_account_invoice_sequence_number_next_prefix
+#: model:ir.model.fields,field_description:account.field_account_journal_sequence_number_next
+msgid "Next Number"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Next, register any unmatched payments:<br/>"
 msgstr ""
@@ -5990,7 +6346,7 @@ msgid "No Message"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1135
+#: code:addons/account/models/account_invoice.py:1381
 #, python-format
 msgid "No appropriate payment method enabled on journal %s"
 msgstr ""
@@ -6001,6 +6357,18 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/company.py:264
+#, python-format
+msgid "No miscellanous journal could be found. Please create one before proceeding."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account.py:116
+#, python-format
+msgid "No opening move defined !"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_res_company_fiscalyear_lock_date
 msgid "No users, including Advisers, can edit accounts prior to and inclusive of this date. Use it for fiscal year locking for example."
 msgstr ""
@@ -6012,7 +6380,7 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_config_settings_code_digits
+#: model:ir.model.fields,help:account.field_res_config_settings_code_digits
 msgid "No. of digits to use for account code"
 msgstr ""
 
@@ -6043,13 +6411,19 @@ msgid "Normal Text"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_credit_notes
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_invoices
+msgid "Not Draft"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 msgid "Not Paid"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:243
+#: code:addons/account/static/src/xml/account_reconciliation.xml:254
 #: model:ir.model.fields,field_description:account.field_account_account_template_note
 #, python-format
 msgid "Note"
@@ -6107,7 +6481,7 @@ msgid "Number of digits in an account code"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "OFX Import"
 msgstr ""
 
@@ -6180,7 +6554,7 @@ msgid "Once draft invoices are confirmed, you will not be able\n"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard."
 msgstr ""
 
@@ -6207,18 +6581,24 @@ msgid "One bank statement for each bank account you hold."
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_payment
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Online Payment"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_only_one_chart_template
 msgid "Only One Chart Template Available"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:367
+#: code:addons/account/models/account_payment.py:456
 #, python-format
 msgid "Only a draft payment can be posted. Trying to post a payment in state %s."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:839
+#: code:addons/account/models/chart_template.py:853
 #, python-format
 msgid "Only administrators can change the settings"
 msgstr ""
@@ -6229,23 +6609,49 @@ msgid "Only users with the 'Adviser' role can edit accounts prior to and inclusi
 msgstr ""
 
 #. module: account
+#. openerp-web
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
+#: code:addons/account/static/src/xml/account_payment.xml:82
+#, python-format
 msgid "Open"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_payment.xml:82
+#: code:addons/account/static/src/xml/account_reconciliation.xml:131
 #, python-format
-msgid "Open Payment"
+msgid "Open balance"
 msgstr ""
 
 #. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:129
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_opening_date
+#: model:ir.model.fields,field_description:account.field_account_opening_date
+#: model:ir.model.fields,field_description:account.field_res_company_account_opening_date
+msgid "Opening Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company_account_opening_journal_id
+msgid "Opening Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:267
+#: model:ir.model.fields,field_description:account.field_account_opening_opening_move_id
+#: model:ir.model.fields,field_description:account.field_res_company_account_opening_move_id
 #, python-format
-msgid "Open balance"
+msgid "Opening Journal Entry"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_opening_opening_move_line_ids
+msgid "Opening Journal Items"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_financial_year_op_opening_move_posted
+msgid "Opening Move Posted"
 msgstr ""
 
 #. module: account
@@ -6254,31 +6660,45 @@ msgid "Opening Unit Numbers"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
-msgid "Operation Templates"
+#: code:addons/account/models/account.py:138
+#, python-format
+msgid "Opening balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:1013
-#, python-format
-msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
+#: model:ir.model.fields,field_description:account.field_account_account_opening_credit
+msgid "Opening credit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:66
-#: code:addons/account/wizard/account_reconcile.py:129
-#, python-format
-msgid "Operation not allowed. You can only reconcile entries that share the same secondary currency or that don't have one. Edit your journal items or make another selection before proceeding any further."
+#: model:ir.model.fields,help:account.field_account_account_opening_credit
+msgid "Opening credit value for this account."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_account_template_nocreate
-msgid "Optional Create"
+#: model:ir.model.fields,field_description:account.field_account_account_opening_debit
+msgid "Opening debit"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_account_opening_debit
+msgid "Opening debit value for this account."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
+msgid "Operation Templates"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
-msgid "Optional Information"
+#: code:addons/account/models/account_bank_statement.py:1009
+#, python-format
+msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_account_template_nocreate
+msgid "Optional Create"
 msgstr ""
 
 #. module: account
@@ -6343,13 +6763,13 @@ msgid "Outstanding Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:121
+#: code:addons/account/models/account_invoice.py:128
 #, python-format
 msgid "Outstanding credits"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:124
+#: code:addons/account/models/account_invoice.py:131
 #, python-format
 msgid "Outstanding debits"
 msgstr ""
@@ -6360,11 +6780,6 @@ msgid "Overdue"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_overdue_msg
 msgid "Overdue Payments Message"
 msgstr ""
@@ -6380,7 +6795,7 @@ msgid "PDF Reports"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Package"
 msgstr ""
 
@@ -6393,7 +6808,7 @@ msgid "Paid"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:314
+#: code:addons/account/models/account_payment.py:403
 #, python-format
 msgid "Paid Invoices"
 msgstr ""
@@ -6401,6 +6816,7 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_payment.xml:28
+#: model:ir.ui.view,arch_db:account.report_invoice_document_with_payments
 #, python-format
 msgid "Paid on"
 msgstr ""
@@ -6412,6 +6828,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_report_parent_id
+#: model:ir.model.fields,field_description:account.field_account_group_parent_id
 msgid "Parent"
 msgstr ""
 
@@ -6426,6 +6843,11 @@ msgid "Parent Report"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_parent_state
+msgid "Parent State"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_partial_reconcile
 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
 msgid "Partial Reconcile"
@@ -6433,8 +6855,8 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:221
-#: code:addons/account/static/src/xml/account_reconciliation.xml:238
+#: code:addons/account/static/src/xml/account_reconciliation.xml:232
+#: code:addons/account/static/src/xml/account_reconciliation.xml:249
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_id
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_partner_id
@@ -6463,7 +6885,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger_menu
-#: model:ir.actions.report.xml,name:account.action_report_partnerledger
+#: model:ir.actions.report,name:account.action_report_partnerledger
 #: model:ir.ui.menu,name:account.menu_partner_ledger
 #: model:ir.ui.view,arch_db:account.report_partnerledger
 msgid "Partner Ledger"
@@ -6494,14 +6916,14 @@ msgid "Partners"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:109
+#: code:addons/account/models/account_journal_dashboard.py:106
 #, python-format
 msgid "Past"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Pay your bills in one-click, using Euro SEPA service"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Pay your bills in one-click using Euro SEPA service"
 msgstr ""
 
 #. module: account
@@ -6534,6 +6956,12 @@ msgid "Payable Limit"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.product_template_form_view
+#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
+msgid "Payables"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_amount
 #: model:ir.model.fields,field_description:account.field_account_payment_amount
 #: model:ir.model.fields,field_description:account.field_account_register_payments_amount
@@ -6596,6 +7024,11 @@ msgid "Payment Move Lines"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report,name:account.action_report_payment_receipt
+msgid "Payment Receipt"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.report_payment_receipt
 msgid "Payment Receipt:"
 msgstr ""
@@ -6619,6 +7052,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_tree
 #: model:ir.ui.view,arch_db:account.view_payment_term_search
+#: model:ir.ui.view,arch_db:account.view_payment_term_tree
 msgid "Payment Terms"
 msgstr ""
 
@@ -6661,6 +7095,7 @@ msgid "Payment that created this entry"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_payment.py:229
 #: model:ir.actions.act_window,name:account.action_account_payments
 #: model:ir.actions.act_window,name:account.action_account_payments_payable
 #: model:ir.model,name:account.model_account_payment
@@ -6669,6 +7104,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_payments_receivable
 #: model:ir.ui.view,arch_db:account.partner_view_buttons
 #: model:ir.ui.view,arch_db:account.view_account_payment_search
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -6734,7 +7170,7 @@ msgid "Percentage of balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1541
+#: code:addons/account/models/account_invoice.py:1797
 #, python-format
 msgid "Percentages for Payment Terms Line must be between 0 and 100."
 msgstr ""
@@ -6750,7 +7186,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_plaid
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_plaid
 msgid "Plaid Connector"
 msgstr ""
 
@@ -6772,25 +7208,25 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:843
+#: code:addons/account/models/account_invoice.py:1063
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:151
+#: code:addons/account/models/account_move.py:157
 #, python-format
 msgid "Please define a sequence for the credit notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:156
+#: code:addons/account/models/account_move.py:162
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:841
+#: code:addons/account/models/account_invoice.py:1061
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -6821,6 +7257,7 @@ msgid "Plus Other Income"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
 #: model:ir.ui.view,arch_db:account.view_move_form
 msgid "Post"
 msgstr ""
@@ -6904,18 +7341,13 @@ msgid "Print Invoice"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.action_report_payment_receipt
-msgid "Print Receipt"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,help:account.field_account_common_journal_report_amount_currency
 #: model:ir.model.fields,help:account.field_account_print_journal_amount_currency
 msgid "Print Report with the currency column if the currency differs from the company currency."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Print checks to pay your vendors"
 msgstr ""
 
@@ -6936,6 +7368,11 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_image
+msgid "Product Image"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_product_qty
 msgid "Product Quantity"
 msgstr ""
@@ -6947,7 +7384,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.product_product_action
-#: model:ir.ui.menu,name:account.menu_product_product_action
 #: model:ir.ui.view,arch_db:account.product_product_view_tree
 msgid "Products"
 msgstr ""
@@ -6981,20 +7417,20 @@ msgid "Profit and Loss"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:123
+#: code:addons/account/models/account_payment.py:135
 #, python-format
-msgid "Programmation error: the expected model for this action is 'account.invoice'. The provided one is '%d'."
+msgid "Programmation error: wizard action executed without active_ids in context."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:121
-#, python-format
-msgid "Programmation error: wizard action executed without active_model or active_ids in context."
+#: model:ir.ui.view,arch_db:account.view_account_chart_template_form
+msgid "Properties"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_account_chart_template_form
-msgid "Properties"
+#: model:ir.actions.act_window,name:account.product_product_action_purchasable
+#: model:ir.ui.menu,name:account.product_product_menu_purchasable
+msgid "Purchasable Products"
 msgstr ""
 
 #. module: account
@@ -7006,7 +7442,7 @@ msgid "Purchase"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
 msgid "Purchase Tax"
 msgstr ""
@@ -7017,7 +7453,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:38
+#: code:addons/account/models/account_journal_dashboard.py:35
 #, python-format
 msgid "Purchase: Untaxed Total"
 msgstr ""
@@ -7044,13 +7480,14 @@ msgid "Python Code"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "QIF Import"
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_quantity
 #: model:ir.model.fields,field_description:account.field_account_move_line_quantity
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Quantity"
 msgstr ""
@@ -7100,6 +7537,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.product_template_form_view
+#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
+msgid "Receivables"
+msgstr ""
+
+#. module: account
 #: selection:account.abstract.payment,payment_type:0
 #: selection:account.payment,payment_type:0
 #: selection:account.register.payments,payment_type:0
@@ -7109,9 +7552,9 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:71
-#: code:addons/account/static/src/xml/account_reconciliation.xml:103
-#: code:addons/account/static/src/xml/account_reconciliation.xml:104
+#: code:addons/account/static/src/xml/account_reconciliation.xml:73
+#: code:addons/account/static/src/xml/account_reconciliation.xml:105
+#: code:addons/account/static/src/xml/account_reconciliation.xml:106
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
@@ -7131,7 +7574,7 @@ msgid "Reconcile With Write-Off"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:98
+#: code:addons/account/wizard/account_reconcile.py:86
 #, python-format
 msgid "Reconcile Writeoff"
 msgstr ""
@@ -7198,7 +7641,7 @@ msgid "Record Manually"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Record transactions in foreign currencies"
 msgstr ""
 
@@ -7209,7 +7652,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:220
+#: code:addons/account/static/src/xml/account_reconciliation.xml:231
 #: model:ir.ui.view,arch_db:account.report_generalledger
 #: model:ir.ui.view,arch_db:account.report_partnerledger
 #, python-format
@@ -7222,11 +7665,13 @@ msgid "Ref."
 msgstr ""
 
 #. module: account
+#: code:addons/account/controllers/portal.py:72
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_name
 #: model:ir.model.fields,field_description:account.field_account_move_line_ref
 #: model:ir.model.fields,field_description:account.field_account_move_ref
 #: model:ir.model.fields,field_description:account.field_cash_box_in_ref
+#, python-format
 msgid "Reference"
 msgstr ""
 
@@ -7257,6 +7702,11 @@ msgid "Reference/Description"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_refund_invoice_ids
+msgid "Refund Invoices"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_filter_refund
 msgid "Refund Method"
 msgstr ""
@@ -7357,13 +7807,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_cash_rounding_rounding
+msgid "Represent the non-zero value smallest coinage (for example, 0.05)."
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
 msgid "Reset to Draft"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:225
+#: code:addons/account/static/src/xml/account_reconciliation.xml:236
 #, python-format
 msgid "Residual"
 msgstr ""
@@ -7385,7 +7840,7 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_deferred_revenue
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_deferred_revenue
 msgid "Revenue Recognition"
 msgstr ""
 
@@ -7438,6 +7893,11 @@ msgid "Review the list of available currencies (from the"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_group_parent_right
+msgid "Right Parent"
+msgstr ""
+
+#. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
 msgstr ""
@@ -7448,17 +7908,49 @@ msgid "Round per Line"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.rounding_form_view
+msgid "Rounding Form"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line_is_rounding_line
+msgid "Rounding Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_rounding_method
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Rounding Method"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "SEPA Payments"
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_rounding
+msgid "Rounding Precision"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_cash_rounding_strategy
+msgid "Rounding Strategy"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.rounding_tree_view
+msgid "Rounding Tree"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "SEPA Credit Transfer (SCT)"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "SEPA Direct Debit (SDD)"
 msgstr ""
 
 #. module: account
 #: selection:account.journal,type:0
+#: model:ir.ui.view,arch_db:account.report_tax
 #: model:ir.ui.view,arch_db:account.view_account_tax_search
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_search
 #: model:ir.ui.view,arch_db:account.view_partner_property_form
@@ -7472,7 +7964,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal_menu
-#: model:ir.actions.report.xml,name:account.action_report_journal
+#: model:ir.actions.report,name:account.action_report_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Sale/Purchase Journal"
 msgstr ""
@@ -7487,7 +7979,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Sales Tax"
 msgstr ""
 
@@ -7497,7 +7989,7 @@ msgid "Sales Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:36
+#: code:addons/account/models/account_journal_dashboard.py:33
 #, python-format
 msgid "Sales: Untaxed Total"
 msgstr ""
@@ -7511,19 +8003,23 @@ msgid "Salesperson"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
+#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
+#: model:ir.ui.view,arch_db:account.setup_posted_move_form
+#: model:ir.ui.view,arch_db:account.setup_view_company_form
 msgid "Save"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:197
+#: code:addons/account/static/src/xml/account_reconciliation.xml:199
 #, python-format
 msgid "Save and New"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Save this page and come back here to set up the feature."
 msgstr ""
 
@@ -7623,6 +8119,11 @@ msgid "Second Tax"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_journal_type
 msgid "Select 'Sale' for customer invoices journals.\n"
 "Select 'Purchase' for vendor bills journals.\n"
@@ -7632,7 +8133,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:72
+#: code:addons/account/static/src/xml/account_reconciliation.xml:74
 #, python-format
 msgid "Select a partner or choose a counterpart"
 msgstr ""
@@ -7643,15 +8144,8 @@ msgid "Select here the kind of valuation related to this payment terms line."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_tax_template_use_cash_basis
-#: model:ir.model.fields,help:account.field_account_tax_use_cash_basis
-msgid "Select this if the tax should use cash basis,which will create an entry for this tax on a given account during reconciliation"
-msgstr ""
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_state.py:42
-#, python-format
-msgid "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Select this if the taxes should use cash basis, which will create an entry for such taxes on a given account during reconciliation."
 msgstr ""
 
 #. module: account
@@ -7667,7 +8161,8 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_product_template_action
+#: model:ir.actions.act_window,name:account.product_product_action_sellable
+#: model:ir.ui.menu,name:account.product_product_menu_sellable
 msgid "Sellable Products"
 msgstr ""
 
@@ -7715,6 +8210,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_invoice_tax_sequence
 #: model:ir.model.fields,field_description:account.field_account_journal_sequence
 #: model:ir.model.fields,field_description:account.field_account_payment_term_line_sequence
+#: model:ir.model.fields,field_description:account.field_account_payment_term_sequence
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_sequence
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_sequence
 #: model:ir.model.fields,field_description:account.field_account_tax_group_sequence
@@ -7724,6 +8220,21 @@ msgid "Sequence"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_payment_form
+msgid "Set To Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_account_tag_active
+msgid "Set active to false to hide the Account Tag without removing it."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_journal_active
+msgid "Set active to false to hide the Journal without removing it."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_tax_active
 #: model:ir.model.fields,help:account.field_account_tax_template_active
 msgid "Set active to false to hide the tax without removing it."
@@ -7746,7 +8257,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.view_account_payment_form
 msgid "Set to Draft"
 msgstr ""
 
@@ -7757,16 +8267,41 @@ msgid "Settings"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Setup"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company_account_setup_bar_closed
+msgid "Setup Bar Closed"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_code
 msgid "Short Code"
 msgstr ""
 
 #. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Show Full Accounting Features"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_tax_search
+msgid "Show active taxes"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.view_account_tax_search
+msgid "Show inactive taxes"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard
 msgid "Show journal on dashboard"
 msgstr ""
@@ -7783,7 +8318,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:105
+#: code:addons/account/static/src/xml/account_reconciliation.xml:107
 #, python-format
 msgid "Skip"
 msgstr ""
@@ -7801,11 +8336,17 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_origin
 #: model:ir.model.fields,field_description:account.field_account_invoice_origin
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Source Document"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_cash_rounding_strategy
+msgid "Specify which way will be used to round the invoice amount to the rounding precision"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_date_from
 #: model:ir.model.fields,field_description:account.field_account_balance_report_date_from
 #: model:ir.model.fields,field_description:account.field_account_common_account_report_date_from
@@ -7815,6 +8356,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_print_journal_date_from
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_date_from
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_date_from
+#: model:ir.model.fields,field_description:account.field_account_tax_report_date_from
 #: model:ir.model.fields,field_description:account.field_accounting_report_date_from
 #: model:ir.model.fields,field_description:account.field_accounting_report_date_from_cmp
 msgid "Start Date"
@@ -7836,13 +8378,18 @@ msgid "State"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_move_line_parent_state
+msgid "State of the parent account.move"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_statement_id
 #: model:ir.model.fields,field_description:account.field_account_move_line_statement_id
 msgid "Statement"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_bank_statement.py:252
+#: code:addons/account/models/account_bank_statement.py:245
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
 msgstr ""
@@ -7875,6 +8422,7 @@ msgid "States Count"
 msgstr ""
 
 #. module: account
+#: code:addons/account/controllers/portal.py:73
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_state
 #: model:ir.model.fields,field_description:account.field_account_invoice_state
@@ -7884,7 +8432,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
 #: model:ir.ui.view,arch_db:account.view_account_move_filter
 #: model:ir.ui.view,arch_db:account.view_bank_statement_search
-#: model:ir.ui.view,arch_db:account.view_move_line_form2
+#, python-format
 msgid "Status"
 msgstr ""
 
@@ -7894,6 +8442,11 @@ msgid "Subtotal"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Supplier Payments"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "TOTAL ASSETS"
 msgstr ""
@@ -7911,7 +8464,7 @@ msgid "Tags"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Tags for Multidimensional Analytics"
 msgstr ""
 
@@ -7931,19 +8484,21 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_print_journal_target_move
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_target_move
 #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_target_move
+#: model:ir.model.fields,field_description:account.field_account_tax_report_target_move
 #: model:ir.model.fields,field_description:account.field_accounting_report_target_move
 msgid "Target Moves"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:172
+#: code:addons/account/static/src/xml/account_reconciliation.xml:174
 #: model:ir.model,name:account.model_account_tax
 #: model:ir.model.fields,field_description:account.field_account_invoice_amount_tax
 #: model:ir.model.fields,field_description:account.field_account_invoice_tax_tax_id
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_tax_id
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_tax_id
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
+#: model:ir.ui.view,arch_db:account.report_tax
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 #: model:ir.ui.view,arch_db:account.view_account_tax_search
 #, python-format
@@ -7951,8 +8506,8 @@ msgid "Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:820
-#: code:addons/account/models/chart_template.py:823
+#: code:addons/account/models/chart_template.py:831
+#: code:addons/account/models/chart_template.py:834
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -7975,14 +8530,18 @@ msgid "Tax Account on Refunds"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.tax_adjustments_form
 #: model:ir.model.fields,field_description:account.field_account_tax_tax_adjustment
 #: model:ir.model.fields,field_description:account.field_account_tax_template_tax_adjustment
-#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
 msgid "Tax Adjustment"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.tax_adjustments_form
+#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
+msgid "Tax Adjustments"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "Tax Amount"
 msgstr ""
@@ -8003,6 +8562,11 @@ msgid "Tax Cash Basis Entry of"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_tax_cash_basis_journal_id
+msgid "Tax Cash Basis Journal"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_amount_type
 #: model:ir.model.fields,field_description:account.field_account_tax_template_amount_type
 msgid "Tax Computation"
@@ -8019,6 +8583,12 @@ msgid "Tax Description"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_tax_tax_exigibility
+#: model:ir.model.fields,field_description:account.field_account_tax_template_tax_exigibility
+msgid "Tax Due"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_tax_group_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template_tax_group_id
 msgid "Tax Group"
@@ -8035,11 +8605,6 @@ msgid "Tax Lines"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.act_account_tax_tax_posted
-msgid "Tax Lines (Posted)"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_ids
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_tax_ids
 #: model:ir.ui.view,arch_db:account.view_account_position_form
@@ -8059,6 +8624,19 @@ msgid "Tax Received Account"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report,name:account.action_report_account_tax
+#: model:ir.model,name:account.model_account_tax_report
+#: model:ir.ui.menu,name:account.menu_account_report
+#: model:ir.ui.view,arch_db:account.report_tax
+msgid "Tax Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_report
+msgid "Tax Reports"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_template_type_tax_use
 #: model:ir.model.fields,field_description:account.field_account_tax_type_tax_use
 msgid "Tax Scope"
@@ -8085,7 +8663,7 @@ msgid "Tax Templates"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_tax_calculation_rounding_method
+#: model:ir.model.fields,field_description:account.field_res_config_settings_tax_calculation_rounding_method
 msgid "Tax calculation rounding method"
 msgstr ""
 
@@ -8106,17 +8684,23 @@ msgid "Tax to Apply"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "TaxCloud Connection"
+msgstr ""
+
+#. module: account
 #: selection:account.account.tag,applicability:0
 #: model:account.tax.group,name:account.tax_group_taxes
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_invoice_line_tax_ids
 #: model:ir.model.fields,field_description:account.field_account_move_line_tax_ids
 #: model:ir.ui.menu,name:account.menu_action_tax_form
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.account_planner
 #: model:ir.ui.view,arch_db:account.invoice_form
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:account.view_move_line_form
 msgid "Taxes"
 msgstr ""
@@ -8142,7 +8726,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Taxes, fiscal positions, chart of accounts &amp; legal statements for your country"
 msgstr ""
 
@@ -8168,6 +8752,36 @@ msgid "Technical field holding the number given to the journal entry, automatica
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_setup_bank_data_done
+msgid "Technical field holding the status of the bank setup step."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_setup_coa_done
+msgid "Technical field holding the status of the chart of account setup step."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_setup_company_data_done
+msgid "Technical field holding the status of the company setup step."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_setup_fy_data_done
+msgid "Technical field holding the status of the financial year setup step."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_register_payments_multi
+msgid "Technical field indicating if the user selected invoices from multiple partners or from different types."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_company_account_setup_bar_closed
+msgid "Technical field set to True when setup bar has been closed by the user."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_refund_only
 msgid "Technical field to hide filter_refund in case invoice is partially paid"
 msgstr ""
@@ -8184,6 +8798,11 @@ msgid "Technical field used in cash basis method"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_journal_account_setup_bank_data_done
+msgid "Technical field used in the special view for the setup bar step."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_code
 #: model:ir.model.fields,help:account.field_account_payment_payment_method_code
 #: model:ir.model.fields,help:account.field_account_register_payments_payment_method_code
@@ -8213,7 +8832,12 @@ msgid "Technical field used to mark a tax line as exigible in the vat report or
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_chart_template_id
+#: model:ir.model.fields,help:account.field_account_move_line_is_unaffected_earnings_line
+msgid "Tells whether or not this line belongs to an unaffected earnings account"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_chart_template_id
 msgid "Template"
 msgstr ""
 
@@ -8270,7 +8894,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:51
+#: code:addons/account/static/src/xml/account_reconciliation.xml:53
 #, python-format
 msgid "That's on average"
 msgstr ""
@@ -8293,7 +8917,13 @@ msgid "The Deposit Ticket module can also be used to settle credit card batch ma
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:921
+#: code:addons/account/models/account_move.py:1169
+#, python-format
+msgid "The account %s (%s) is deprecated !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:988
 #, python-format
 msgid "The account %s (%s) is not marked as reconciliable !"
 msgstr ""
@@ -8304,7 +8934,7 @@ msgid "The accounting journal corresponding to this bank account."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_config_settings_currency_exchange_journal_id
+#: model:ir.model.fields,help:account.field_res_config_settings_currency_exchange_journal_id
 msgid "The accounting journal where automatic exchange differences will be registered"
 msgstr ""
 
@@ -8321,19 +8951,19 @@ msgid "The amount expressed in the related account currency if not equal to the
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:477
+#: code:addons/account/models/account_move.py:504
 #, python-format
 msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:590
+#: code:addons/account/models/account.py:780
 #, python-format
 msgid "The application scope of taxes in a group must be either the same as the group or \"None\"."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:268
+#: code:addons/account/models/account.py:452
 #, python-format
 msgid "The bank account of a bank journal must belong to the same company (%s)."
 msgstr ""
@@ -8344,6 +8974,13 @@ msgid "The bank statement used for bank reconciliation"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_invoice.py:1156
+#, python-format
+msgid "The cash rounding cannot be computed because the difference must be added on the biggest tax found and no tax are specified.\n"
+"Please set up a tax or change the cash rounding method."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_res_company_chart_template_id
 msgid "The chart template for the company (if any)"
 msgstr ""
@@ -8387,6 +9024,17 @@ msgid "The ending balance is incorrect !\n"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_product_category_property_account_expense_categ_id
+msgid "The expense is accounted for when a vendor bill is validated, except in anglo-saxon accounting with perpetual inventory valuation in which case the expense (Cost of Goods Sold account) is recognized at the customer invoice validation."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_product_product_property_account_expense_id
+#: model:ir.model.fields,help:account.field_product_template_property_account_expense_id
+msgid "The expense is accounted for when a vendor bill is validated, except in anglo-saxon accounting with perpetual inventory valuation in which case the expense (Cost of Goods Sold account) is recognized at the customer invoice validation. If the field is empty, it uses the one defined in the product category."
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "The first step is to set up your company's information. This is mostly used in printed business documents like orders and invoices."
 msgstr ""
@@ -8398,7 +9046,7 @@ msgid "The fiscal position will determine taxes and accounts used for the partne
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:272
+#: code:addons/account/models/account.py:456
 #, python-format
 msgid "The holder of a journal's bank account must be the company (%s)."
 msgstr ""
@@ -8409,7 +9057,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:509
+#: code:addons/account/models/account_payment.py:616
 #, python-format
 msgid "The journal %s does not have a sequence, please specify one."
 msgstr ""
@@ -8420,6 +9068,12 @@ msgid "The journal entries of this journal will be named using this prefix."
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_opening_opening_move_id
+#: model:ir.model.fields,help:account.field_res_company_account_opening_move_id
+msgid "The journal entry containing the initial balance of all this company's accounts."
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_form
 msgid "The last line's computation type should be \"Balance\" to ensure that the whole amount will be allocated."
 msgstr ""
@@ -8442,6 +9096,16 @@ msgid "The name that will be used on account move lines"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
+msgid "The next sequence number will be used for the next credit note."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_journal_sequence_number_next
+msgid "The next sequence number will be used for the next invoice."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line_currency_id
 #: model:ir.model.fields,help:account.field_account_move_line_currency_id
 msgid "The optional other currency if it is a multi-currency entry."
@@ -8464,7 +9128,7 @@ msgid "The partner has at least one unreconciled debit and credit since last tim
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:923
+#: code:addons/account/models/account_move.py:990
 #, python-format
 msgid "The partner has to be the same on all lines for receivable and payable accounts!"
 msgstr ""
@@ -8475,13 +9139,13 @@ msgid "The partner reference of this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:55
+#: code:addons/account/models/account_payment.py:60
 #, python-format
-msgid "The payment amount must be strictly positive."
+msgid "The payment amount cannot be negative."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:370
+#: code:addons/account/models/account_payment.py:459
 #, python-format
 msgid "The payment cannot be processed because the invoice is not open!"
 msgstr ""
@@ -8497,13 +9161,13 @@ msgid "The residual amount on a journal item expressed in the company currency."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:462
+#: code:addons/account/models/account_move.py:489
 #, python-format
 msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1383
+#: code:addons/account/models/account_invoice.py:1634
 #, python-format
 msgid "The selected unit of measure is not compatible with the unit of measure of the product."
 msgstr ""
@@ -8515,13 +9179,18 @@ msgid "The sequence field is used to define order in which the tax lines are app
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:511
+#: code:addons/account/models/account_payment.py:618
 #, python-format
 msgid "The sequence of journal %s is deactivated."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/company.py:95
+#: model:ir.ui.view,arch_db:account.portal_my_invoices
+msgid "There are currently no invoices and payments for your account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:111
 #, python-format
 msgid "There are still unposted entries in the period you want to lock. You should either post or delete them."
 msgstr ""
@@ -8539,7 +9208,7 @@ msgid "There is no journal items in draft state to post."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1641
+#: code:addons/account/models/account_move.py:1694
 #, python-format
 msgid "There is no tax cash basis journal defined for this company: \"%s\" \n"
 "Configure it in Accounting/Configuration/Settings"
@@ -8547,13 +9216,18 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:43
+#: code:addons/account/static/src/xml/account_reconciliation.xml:46
 #, python-format
 msgid "There is nothing to reconcile."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_error
+msgid "There was an error processing this page."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "These taxes are set in any new product created."
 msgstr ""
 
@@ -8568,7 +9242,12 @@ msgid "These users handle billing specifically."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1110
+#: model:ir.model.fields,help:account.field_account_cash_rounding_rounding_method
+msgid "These values must correspond to the rounding_method of the float_round tools method."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:1356
 #, python-format
 msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>"
 msgstr ""
@@ -8579,7 +9258,7 @@ msgid "This Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_journal_dashboard.py:114
+#: code:addons/account/models/account_journal_dashboard.py:111
 #, python-format
 msgid "This Week"
 msgstr ""
@@ -8590,48 +9269,41 @@ msgid "This Year"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_product_product_property_account_expense_id
-#: model:ir.model.fields,help:account.field_product_template_property_account_expense_id
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_product_product_property_account_income_id
-#: model:ir.model.fields,help:account.field_product_template_property_account_income_id
-msgid "This account will be used for invoices instead of the default one to value sales for the current product."
+#: model:ir.model.fields,help:account.field_res_partner_property_account_payable_id
+#: model:ir.model.fields,help:account.field_res_users_property_account_payable_id
+msgid "This account will be used instead of the default one as the payable account for the current partner"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_product_category_property_account_expense_categ_id
-msgid "This account will be used for invoices to value expenses."
+#: model:ir.model.fields,help:account.field_res_partner_property_account_receivable_id
+#: model:ir.model.fields,help:account.field_res_users_property_account_receivable_id
+msgid "This account will be used instead of the default one as the receivable account for the current partner"
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,help:account.field_product_category_property_account_income_categ_id
-msgid "This account will be used for invoices to value sales."
+msgid "This account will be used when validating a customer invoice."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_res_partner_property_account_payable_id
-#: model:ir.model.fields,help:account.field_res_users_property_account_payable_id
-msgid "This account will be used instead of the default one as the payable account for the current partner"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_res_partner_property_account_receivable_id
-#: model:ir.model.fields,help:account.field_res_users_property_account_receivable_id
-msgid "This account will be used instead of the default one as the receivable account for the current partner"
+#: model:ir.model.fields,help:account.field_res_config_settings_module_account_batch_deposit
+msgid "This allows you to group received checks before you deposit them to the bank.\n"
+"-This installs the module account_batch_deposit."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "This allows you to manage the assets owned by a company or a person. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines."
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,help:account.field_account_config_settings_module_account_batch_deposit
-msgid "This allows you to group received checks before you deposit them to the bank.\n"
-"-This installs the module account_batch_deposit."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "This allows you to manage the revenue recognition on selling products. It keeps track of the installments occurred on those revenue recognitions, and creates account moves for those installment lines."
 msgstr ""
 
 #. module: account
@@ -8645,7 +9317,7 @@ msgid "This boolean helps you to choose if you want to propose to the user to en
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "This feature is useful if you issue a high amounts of invoices."
 msgstr ""
 
@@ -8688,13 +9360,13 @@ msgid "This is the accounting dashboard. If you have not yet\n"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:309
+#: code:addons/account/models/account.py:493
 #, python-format
 msgid "This journal already contains items, therefore you cannot modify its company."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:312
+#: code:addons/account/models/account.py:496
 #, python-format
 msgid "This journal already contains items, therefore you cannot modify its short name."
 msgstr ""
@@ -8705,8 +9377,14 @@ msgid "This label will be displayed on report to show the balance computed for t
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_payment.py:504
+#, python-format
+msgid "This method should only be called to process a single invoice's payment."
+msgstr ""
+
+#. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:351
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:376
 #, python-format
 msgid "This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open."
 msgstr ""
@@ -8723,14 +9401,14 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:32
+#: code:addons/account/static/src/xml/account_reconciliation.xml:35
 #, python-format
 msgid "This page displays all the bank transactions that are to be reconciled and provides with a neat interface to do so."
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:229
+#: code:addons/account/static/src/xml/account_reconciliation.xml:240
 #, python-format
 msgid "This payment is registered but not reconciled."
 msgstr ""
@@ -8769,8 +9447,13 @@ msgid "Those can be used to quickly create a journal items when reconciling\n"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_res_config_settings_account_hide_setup_bar
+msgid "Tick if you wish to hide the setup bar on the dashboard"
+msgstr ""
+
+#. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:28
+#: code:addons/account/static/src/xml/account_reconciliation.xml:31
 #, python-format
 msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
 msgstr ""
@@ -8806,7 +9489,7 @@ msgid "To pay"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:917
+#: code:addons/account/models/account_move.py:984
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries!"
 msgstr ""
@@ -8831,17 +9514,20 @@ msgid "Total"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
 #: model:ir.ui.view,arch_db:account.view_move_tree
 msgid "Total Amount"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
 #: model:ir.ui.view,arch_db:account.view_move_form
 #: model:ir.ui.view,arch_db:account.view_move_line_tree
 msgid "Total Credit"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
 #: model:ir.ui.view,arch_db:account.view_move_form
 #: model:ir.ui.view,arch_db:account.view_move_line_tree
 msgid "Total Debit"
@@ -8898,6 +9584,16 @@ msgid "Total amount this customer owes you."
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_line_price_total
+msgid "Total amount with taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_line_price_subtotal
+msgid "Total amount without taxes"
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_res_partner_debit
 #: model:ir.model.fields,help:account.field_res_users_debit
 msgid "Total amount you have to pay to this vendor."
@@ -8919,13 +9615,13 @@ msgid "Total of transaction lines."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Track costs &amp; revenues by project, department, etc."
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:239
+#: code:addons/account/static/src/xml/account_reconciliation.xml:250
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #, python-format
 msgid "Transaction"
@@ -8953,19 +9649,19 @@ msgid "Transfer To"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:252
+#: code:addons/account/models/account_payment.py:344
 #, python-format
 msgid "Transfer account not defined on the company."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:482
+#: code:addons/account/models/account_payment.py:589
 #, python-format
 msgid "Transfer from %s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:565
+#: code:addons/account/models/account_payment.py:672
 #, python-format
 msgid "Transfer to %s"
 msgstr ""
@@ -8977,7 +9673,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_balance_menu
-#: model:ir.actions.report.xml,name:account.action_report_trial_balance
+#: model:ir.actions.report,name:account.action_report_trial_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
 msgstr ""
@@ -9002,25 +9698,31 @@ msgid "Type"
 msgstr ""
 
 #. module: account
+#: selection:account.cash.rounding,rounding_method:0
+msgid "UP"
+msgstr ""
+
+#. module: account
 #: selection:account.journal,bank_statements_source:0
 msgid "Undefined Yet"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:881
+#: code:addons/account/models/company.py:294
 #, python-format
 msgid "Undistributed Profits/Losses"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:348
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:373
 #, python-format
 msgid "Undo the partial reconciliation."
 msgstr ""
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_unit
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Unit Price"
 msgstr ""
@@ -9044,6 +9746,13 @@ msgid "Unless you are starting a new business, you probably have a list of custo
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
+#: model:ir.ui.view,arch_db:account.setup_view_company_form
+msgid "Unmark as done"
+msgstr ""
+
+#. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
 msgstr ""
@@ -9104,12 +9813,7 @@ msgid "Untaxed Amount in Company Currency"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Update exchange rates automatically"
 msgstr ""
 
@@ -9129,13 +9833,17 @@ msgid "Use Anglo-Saxon accounting"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_tax_template_use_cash_basis
-#: model:ir.model.fields,field_description:account.field_account_tax_use_cash_basis
+#: model:ir.model.fields,field_description:account.field_res_company_tax_exigibility
 msgid "Use Cash Basis"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_sepa
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa_direct_debit
+msgid "Use SEPA Direct Debit"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
 msgid "Use SEPA payments"
 msgstr ""
 
@@ -9150,12 +9858,17 @@ msgid "Use anglo-saxon accounting"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_batch_deposit
+#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_batch_deposit
 msgid "Use batch deposit"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Use depreciation boards, automate amortization entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Use follow-up levels and schedule actions"
 msgstr ""
 
@@ -9221,13 +9934,13 @@ msgid "VAT required"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 msgid "VAT:"
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:70
+#: code:addons/account/static/src/xml/account_reconciliation.xml:72
 #: model:ir.ui.view,arch_db:account.invoice_form
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
 #: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
@@ -9272,15 +9985,23 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:997
+#: code:addons/account/models/account_invoice.py:441
+#: code:addons/account/models/account_invoice.py:1224
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #, python-format
 msgid "Vendor Bill"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/chart_template.py:186
+#: code:addons/account/models/account_invoice.py:442
+#, python-format
+msgid "Vendor Bill - %s"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/chart_template.py:189
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -9291,20 +10012,28 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:545
+#: code:addons/account/models/account_invoice.py:443
+#: code:addons/account/models/account_payment.py:652
+#: model:ir.ui.view,arch_db:account.portal_invoice_report
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #, python-format
 msgid "Vendor Credit Note"
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_invoice.py:444
+#, python-format
+msgid "Vendor Credit Note - %s"
+msgstr ""
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_in_refund
 #: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
 msgid "Vendor Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:999
+#: code:addons/account/models/account_invoice.py:1226
 #, python-format
 msgid "Vendor Credit note"
 msgstr ""
@@ -9315,7 +10044,7 @@ msgid "Vendor Flow"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:547
+#: code:addons/account/models/account_payment.py:654
 #, python-format
 msgid "Vendor Payment"
 msgstr ""
@@ -9354,7 +10083,7 @@ msgid "Warning"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:520
+#: code:addons/account/models/account_invoice.py:656
 #, python-format
 msgid "Warning for %s"
 msgstr ""
@@ -9365,14 +10094,14 @@ msgid "Warning on the Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1323
-#: code:addons/account/models/account_invoice.py:1382
+#: code:addons/account/models/account_invoice.py:1574
+#: code:addons/account/models/account_invoice.py:1633
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_group_warning_account
+#: model:ir.model.fields,field_description:account.field_res_config_settings_group_warning_account
 msgid "Warnings"
 msgstr ""
 
@@ -9453,7 +10182,7 @@ msgid "Wizard for Tax Adjustments"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:958
+#: code:addons/account/models/account_move.py:1025
 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
 #, python-format
 msgid "Write-Off"
@@ -9485,7 +10214,7 @@ msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:915
+#: code:addons/account/models/account_move.py:982
 #, python-format
 msgid "You are trying to reconcile some entries that are already reconciled!"
 msgstr ""
@@ -9502,9 +10231,8 @@ msgid "You can control the invoice from your vendor according to\n"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/res_config.py:94
-#, python-format
-msgid "You can not change a company chart of account once it has been installed"
+#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
+msgid "You can define additional accounts here"
 msgstr ""
 
 #. module: account
@@ -9514,19 +10242,19 @@ msgid "You can not change the unit of measure of a product that has been already
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:351
+#: code:addons/account/models/account_payment.py:440
 #, python-format
 msgid "You can not delete a payment that is already posted"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1404
+#: code:addons/account/models/account_invoice.py:1655
 #, python-format
 msgid "You can only delete an invoice line if the invoice is in draft state."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:128
+#: code:addons/account/models/account_payment.py:141
 #, python-format
 msgid "You can only register payments for open invoices"
 msgstr ""
@@ -9537,108 +10265,107 @@ msgid "You can set up here the format you want this record to be displayed. If y
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:201
+#: code:addons/account/models/account_move.py:207
 #, python-format
 msgid "You cannot add/modify entries prior to and inclusive of the lock date %s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:203
+#: code:addons/account/models/account_move.py:209
 #, python-format
 msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:978
+#: code:addons/account/models/account_invoice.py:1205
 #, python-format
 msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:138
+#: code:addons/account/models/account.py:235
 #, python-format
 msgid "You cannot change the owner company of an account that already contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:145
+#: code:addons/account/models/account.py:242
 #, python-format
 msgid "You cannot change the value of the reconciliation on this account as it already has some moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:469
+#: code:addons/account/models/account_move.py:496
 #, python-format
 msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:471
+#: code:addons/account/models/account_invoice.py:607
 #, python-format
 msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:469
+#: code:addons/account/models/account_invoice.py:605
 #, python-format
 msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:151
+#: code:addons/account/models/res_config_settings.py:133
+#, python-format
+msgid "You cannot disable this setting because some of your taxes are cash basis. Modify your taxes first before disabling this setting."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account.py:248
 #, python-format
 msgid "You cannot do that on an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1247
+#: code:addons/account/models/account_move.py:1324
 #, python-format
 msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n"
 "%s."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1249
+#: code:addons/account/models/account_move.py:1326
 #, python-format
 msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:324
+#: code:addons/account/models/account.py:508
 #, python-format
-msgid "You cannot empty the account number once set.\n"
-"If you would like to delete the account number, you can do it from the Bank Accounts list."
+msgid "You cannot empty the bank account once set."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:54
+#: code:addons/account/models/account.py:55
 #, python-format
 msgid "You cannot have a receivable/payable account that is not reconciliable. (account code: %s)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:132
-#, python-format
-msgid "You cannot mix customer invoices and vendor bills in a single payment."
-msgstr ""
-
-#. module: account
 #. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:567
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:628
 #, python-format
 msgid "You cannot mix items from receivable and payable accounts."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:166
+#: code:addons/account/models/account_move.py:172
 #, python-format
 msgid "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:605
+#: code:addons/account/models/account_invoice.py:782
 #, python-format
 msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first."
 msgstr ""
@@ -9650,34 +10377,33 @@ msgid "You cannot put/take money in/out for a bank statement which is closed."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account.py:156
+#: code:addons/account/models/account.py:253
 #, python-format
 msgid "You cannot remove/deactivate an account which is set on a customer or vendor."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1092
-#: code:addons/account/models/account_move.py:1213
+#: code:addons/account/models/account_move.py:1290
 #, python-format
 msgid "You cannot use deprecated account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1133
+#: code:addons/account/models/account_move.py:1210
 #, python-format
 msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:64
-#: code:addons/account/models/account_invoice.py:593
+#: code:addons/account/models/account_invoice.py:71
+#: code:addons/account/models/account_invoice.py:770
 #, python-format
 msgid "You cannot validate an invoice with a negative total amount. You should create a credit note instead."
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:156
+#: code:addons/account/static/src/xml/account_reconciliation.xml:158
 #, python-format
 msgid "You did not configure any reconcile model yet, you can do it"
 msgstr ""
@@ -9689,7 +10415,7 @@ msgid "You have"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_payment.py:360
+#: code:addons/account/models/account_payment.py:477
 #, python-format
 msgid "You have to define a sequence for %s in your company."
 msgstr ""
@@ -9701,7 +10427,7 @@ msgid "You must define a Start Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_invoice.py:1324
+#: code:addons/account/models/account_invoice.py:1575
 #, python-format
 msgid "You must first select a partner!"
 msgstr ""
@@ -9719,19 +10445,26 @@ msgid "You must set a start date."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1512
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#, python-format
+msgid "You reconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:1835
 #, python-format
 msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1514
+#: code:addons/account/models/account_move.py:1837
 #, python-format
 msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:1516
+#: code:addons/account/models/account_move.py:1839
 #, python-format
 msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
 msgstr ""
@@ -9804,13 +10537,38 @@ msgid "Zip Range To"
 msgstr ""
 
 #. module: account
+#: model:mail.template,body_html:account.mail_template_data_payment_receipt
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c703e4465617220247b6f626a6563742e706172746e65725f69642e6e616d657d2c3c2f703e0a3c703e5468616e6b20796f7520666f7220796f7572207061796d656e742e3c62722f3e4865726520697320796f7572207061796d656e742072656365697074203c7374726f6e673e247b286f626a6563742e6e616d65206f72202727292e7265706c61636528272f272c272d27297d3c2f7374726f6e673e20616d6f756e74696e6720746f203c7374726f6e673e247b6f626a6563742e616d6f756e747d20247b6f626a6563742e63757272656e63795f69642e6e616d657d3c2f7374726f6e673e2066726f6d20247b6f626a6563742e636f6d70616e795f69642e6e616d657d2e3c2f703e0a3c703e496620796f75206861766520616e79207175657374696f6e732c20706c6561736520646f206e6f7420686573697461746520746f20636f6e746163742075732e3c2f703e0a3c703e4265737420726567617264732c0a25206966207573657220616e6420757365722e7369676e61747572653a0a247b757365722e7369676e6174757265207c20736166657d0a2520656e6469660a3c2f703e0a3c2f646174613e"
+msgstr ""
+
+#. module: account
+#: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
+msgid "\\x3c6469763e0a2520736574207265636f7264203d206374782e67657428277265636f726427290a252073657420636f6d70616e79203d207265636f726420616e64207265636f72642e636f6d70616e795f6964206f7220757365722e636f6d70616e795f69640a3c7461626c6520626f726465723d2230222077696474683d2231303025222063656c6c70616464696e673d223022206267636f6c6f723d222365646564656422207374796c653d2270616464696e673a20323070783b206261636b67726f756e642d636f6c6f723a2023656465646564222073756d6d6172793d226f5f6d61696c5f6e6f74696669636174696f6e223e0a3c74626f64793e0a202020203c212d2d20484541444552202d2d3e0a202020203c74723e0a20202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a2020202020202020202020203c7461626c652077696474683d223539302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222338373541374222207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283133352c39302c313233293b2070616464696e673a20323070783b223e0a202020202020202020202020202020203c74723e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c65223e0a2020202020202020202020202020202020202020202020203c7370616e207374796c653d22666f6e742d73697a653a323070783b20636f6c6f723a77686974653b20666f6e742d7765696768743a20626f6c643b223e0a20202020202020202020202020202020202020202020202020202020496e766f69636520247b6f626a6563742e7265636f72645f6e616d657d0a2020202020202020202020202020202020202020202020203c2f7370616e3e0a20202020202020202020202020202020202020203c2f74643e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d227269676874223e0a2020202020202020202020202020202020202020202020203c696d67207372633d222f6c6f676f2e706e673f636f6d70616e793d247b636f6d70616e792e69647d22207374796c653d2270616464696e673a203070783b206d617267696e3a203070783b206865696768743a206175746f3b2077696474683a20383070783b2220616c743d22247b636f6d70616e792e6e616d657d222f3e0a20202020202020202020202020202020202020203c2f74643e0a202020202020202020202020202020203c2f74723e0a202020202020202020203c2f7461626c653e0a202020203c2f74643e0a20203c2f74723e0a20203c212d2d20434f4e54454e54202d2d3e0a20203c74723e0a20202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a2020202020202020202020203c7461626c652077696474683d223539302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222366666666666622207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283235352c203235352c20323535293b2070616464696e673a20323070783b223e0a202020202020202020202020202020203c74626f64793e0a20202020202020202020202020202020202020203c74642076616c69676e3d22746f7022207374796c653d22666f6e742d66616d696c793a417269616c2c48656c7665746963612c73616e732d73657269663b20636f6c6f723a20233535353b20666f6e742d73697a653a20313470783b223e0a202020202020202020202020202020202020202020202020247b6f626a6563742e626f6479207c20736166657d0a20202020202020202020202020202020202020203c2f74643e0a202020202020202020202020202020203c2f74626f64793e0a2020202020202020202020203c2f7461626c653e0a20202020202020203c2f74643e0a202020203c2f74723e0a202020203c212d2d20464f4f544552202d2d3e0a202020203c74723e0a20202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a2020202020202020202020203c7461626c652077696474683d223539302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222338373541374222207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283133352c39302c313233293b2070616464696e673a20323070783b223e0a202020202020202020202020202020203c74723e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d226c65667422207374796c653d22636f6c6f723a20236666663b2070616464696e672d746f703a20313070783b2070616464696e672d626f74746f6d3a20313070783b20666f6e742d73697a653a20313270783b223e0a202020202020202020202020202020202020202020202020247b636f6d70616e792e6e616d657d3c62722f3e0a202020202020202020202020202020202020202020202020247b636f6d70616e792e70686f6e65206f722027277d0a20202020202020202020202020202020202020203c2f74643e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d22726967687422207374796c653d22636f6c6f723a20236666663b2070616464696e672d746f703a20313070783b2070616464696e672d626f74746f6d3a20313070783b20666f6e742d73697a653a20313270783b223e0a2020202020202020202020202020202020202020202020202520696620636f6d70616e792e656d61696c3a0a2020202020202020202020202020202020202020202020203c6120687265663d226d61696c746f3a247b636f6d70616e792e656d61696c7d22207374796c653d22746578742d6465636f726174696f6e3a6e6f6e653b20636f6c6f723a2077686974653b223e247b636f6d70616e792e656d61696c7d3c2f613e3c62722f3e0a2020202020202020202020202020202020202020202020202520656e6469660a2020202020202020202020202020202020202020202020202520696620636f6d70616e792e776562736974653a0a2020202020202020202020202020202020202020202020203c6120687265663d22247b636f6d70616e792e776562736974657d22207374796c653d22746578742d6465636f726174696f6e3a6e6f6e653b20636f6c6f723a2077686974653b223e0a202020202020202020202020202020202020202020202020247b636f6d70616e792e776562736974657d0a2020202020202020202020202020202020202020202020203c2f613e0a2020202020202020202020202020202020202020202020202520656e6469660a20202020202020202020202020202020202020203c2f74643e0a202020202020202020202020202020203c2f74723e0a2020202020202020202020203c2f7461626c653e0a20202020202020203c2f74643e0a202020203c2f74723e0a202020203c74723e0a20202020202020203c746420616c69676e3d2263656e746572223e0a202020202020202020202020506f7765726564206279203c61207461726765743d225f626c616e6b2220687265663d2268747470733a2f2f7777772e6f646f6f2e636f6d223e4f646f6f3c2f613e2e0a20202020202020203c2f74643e0a202020203c2f74723e0a3c2f74626f64793e0a3c2f7461626c653e0a3c2f6469763e"
+msgstr ""
+
+#. module: account
+#: model:mail.template,body_html:account.email_template_edi_invoice
+msgid "\\x3c6469763e0a3c703e4465617220247b6f626a6563742e706172746e65725f69642e6e616d657d0a2520736574206163636573735f616374696f6e203d206f626a6563742e776974685f636f6e7465787428666f7263655f776562736974653d54727565292e6765745f6163636573735f616374696f6e28290a25207365742069735f6f6e6c696e65203d206163636573735f616374696f6e20616e64206163636573735f616374696f6e5b2774797065275d203d3d202769722e616374696f6e732e6163745f75726c270a2520736574206163636573735f75726c203d206f626a6563742e6765745f6d61696c5f75726c28290a0a25206966206f626a6563742e706172746e65725f69642e706172656e745f69643a0a20202020283c693e247b6f626a6563742e706172746e65725f69642e706172656e745f69642e6e616d657d3c2f693e290a2520656e6469660a2c3c2f703e0a3c703e486572652069732c20696e206174746163686d656e742c20796f7572200a25206966206f626a6563742e6e756d6265723a0a696e766f696365203c7374726f6e673e247b6f626a6563742e6e756d6265727d3c2f7374726f6e673e0a2520656c73653a0a696e766f6963650a2520656e6469660a25206966206f626a6563742e6f726967696e3a0a2877697468207265666572656e63653a20247b6f626a6563742e6f726967696e7d290a2520656e6469660a616d6f756e74696e6720696e203c7374726f6e673e247b6f626a6563742e616d6f756e745f746f74616c7d20247b6f626a6563742e63757272656e63795f69642e6e616d657d3c2f7374726f6e673e0a66726f6d20247b6f626a6563742e636f6d70616e795f69642e6e616d657d2e0a3c2f703e0a0a252069662069735f6f6e6c696e653a0a202020203c62722f3e3c62722f3e0a202020203c63656e7465723e0a2020202020203c6120687265663d22247b6163636573735f75726c7d22207374796c653d226261636b67726f756e642d636f6c6f723a20233161626339633b2070616464696e673a20323070783b20746578742d6465636f726174696f6e3a206e6f6e653b20636f6c6f723a20236666663b20626f726465722d7261646975733a203570783b20666f6e742d73697a653a20313670783b2220636c6173733d226f5f64656661756c745f736e69707065745f74657874223e5669657720496e766f6963653c2f613e0a202020203c2f63656e7465723e0a2520656e6469660a202020203c62722f3e3c62722f3e0a0a25206966206f626a6563742e73746174653d3d2770616964273a0a202020203c703e5468697320696e766f69636520697320616c726561647920706169642e3c2f703e0a2520656c73653a0a202020203c703e506c656173652072656d6974207061796d656e7420617420796f7572206561726c6965737420636f6e76656e69656e63652e3c2f703e0a2520656e6469660a0a3c703e5468616e6b20796f752c3c2f703e0a3c70207374796c653d22636f6c6f723a23383838383838223e0a25206966206f626a6563742e757365725f696420616e64206f626a6563742e757365725f69642e7369676e61747572653a0a20202020247b6f626a6563742e757365725f69642e7369676e6174757265207c20736166657d0a2520656e6469660a3c2f703e0a3c2f6469763e"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_config_settings
-msgid "account.config.settings"
+#: model:ir.model,name:account.model_account_financial_year_op
+msgid "account.financial.year.op"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_group
+msgid "account.group"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_opening
+msgid "account.opening"
 msgstr ""
 
 #. module: account
@@ -9846,6 +10604,12 @@ msgid "cash.box.out"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_error
+#: model:ir.ui.view,arch_db:account.portal_invoice_success
+msgid "close"
+msgstr ""
+
+#. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "code"
 msgstr ""
@@ -9856,11 +10620,6 @@ msgid "create a journal entry"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
-msgid "credit note"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
 msgid "days"
 msgstr ""
@@ -9891,13 +10650,8 @@ msgid "for this supplier. You can allocate them to mark this bill as paid."
 msgstr ""
 
 #. module: account
-#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
-msgid "invoice"
-msgstr ""
-
-#. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:38
+#: code:addons/account/static/src/xml/account_reconciliation.xml:41
 #, python-format
 msgid "o_manual_statement"
 msgstr ""
@@ -9943,19 +10697,29 @@ msgid "report.account.report_partnerledger"
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_report_account_report_tax
+msgid "report.account.report_tax"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_report_account_report_trialbalance
 msgid "report.account.report_trialbalance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:230
+#: model:ir.model,name:account.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:236
 #, python-format
 msgid "reversal of: "
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:51
+#: code:addons/account/static/src/xml/account_reconciliation.xml:53
 #, python-format
 msgid "seconds per transaction."
 msgstr ""
@@ -9992,7 +10756,7 @@ msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:156
+#: code:addons/account/static/src/xml/account_reconciliation.xml:158
 #, python-format
 msgid "there"
 msgstr ""
@@ -10003,22 +10767,15 @@ msgid "to describe<br/> your experience or to suggest improvements !"
 msgstr ""
 
 #. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:51
-#, python-format
-msgid "to reconcile"
-msgstr ""
-
-#. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "to set the balance of all of your accounts."
 msgstr ""
 
 #. module: account
 #. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:51
+#: code:addons/account/static/src/xml/account_reconciliation.xml:53
 #, python-format
-msgid "transactions."
+msgid "transactions in"
 msgstr ""
 
 #. module: account
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index 3c3f0da6caa..0adcbcd9ed0 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_analytic_default
-#: model:ir.model.fields,field_description:account_analytic_default.field_product_product_rules_count
-#: model:ir.model.fields,field_description:account_analytic_default.field_product_template_rules_count
-msgid "# Analytic Rules"
+#: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
+msgid "<i class=\"fa fa-calendar\"/> From"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
+msgid "<strong>Customer</strong>"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
+msgid "<strong>Product</strong>"
 msgstr ""
 
 #. module: account_analytic_default
@@ -34,7 +43,6 @@ msgstr ""
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
-#: model:ir.actions.act_window,name:account_analytic_default.action_product_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_form
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_tree
@@ -47,10 +55,9 @@ msgid "Analytic Distribution"
 msgstr ""
 
 #. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.action_product_default_list
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
-#: model:ir.ui.view,arch_db:account_analytic_default.product_form_view_default_analytic_button
-#: model:ir.ui.view,arch_db:account_analytic_default.product_template_view_default_analytic_button
 msgid "Analytic Rules"
 msgstr ""
 
@@ -76,7 +83,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.ui.view,arch_db:account_analytic_default.account_config_settings_view_form_inherit_analytic_default
+#: model:ir.ui.view,arch_db:account_analytic_default.res_config_settings_view_form
 msgid "Default Analytic Values"
 msgstr ""
 
@@ -142,18 +149,12 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_product_product
 #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_product_id
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_form_search
 msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_product_template
-msgid "Product Template"
-msgstr ""
-
-#. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
@@ -194,3 +195,8 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
+msgid "to"
+msgstr ""
+
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 068569c20b5..5929f3e9f8d 100644
--- a/addons/account_asset/i18n/account_asset.pot
+++ b/addons/account_asset/i18n/account_asset.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -171,7 +171,7 @@ msgstr ""
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal_purchase
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal_purchase
-#: model:ir.ui.view,arch_db:account_asset.account_config_settings_view_form_inherit_account_asset
+#: model:ir.ui.view,arch_db:account_asset.res_config_settings_view_form
 msgid "Asset Types"
 msgstr ""
 
@@ -297,8 +297,8 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_asset_method_time
 #: model:ir.model.fields,help:account_asset.field_account_asset_category_method_time
-msgid "Choose the method to use to compute the dates and number of depreciation lines.\n"
-"  * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n"
+msgid "Choose the method to use to compute the dates and number of entries.\n"
+"  * Number of Entries: Fix the number of entries and the time between 2 depreciations.\n"
 "  * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
 msgstr ""
 
@@ -749,8 +749,6 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: selection:account.asset.asset,method_time:0
-#: selection:account.asset.category,method_time:0
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_method_number
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_method_number
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_method_number
@@ -758,6 +756,8 @@ msgid "Number of Depreciations"
 msgstr ""
 
 #. module: account_asset
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 msgid "Number of Entries"
 msgstr ""
diff --git a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
index 04956ae121a..90a041bddd0 100644
--- a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
+++ b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:241
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
 #. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:241
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
@@ -48,12 +48,17 @@ msgid "Accounts Allowed"
 msgstr ""
 
 #. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_active
+msgid "Active"
+msgstr ""
+
+#. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_update_posted
 msgid "Allow Cancelling Entries"
 msgstr ""
 
 #. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:247
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:243
 #, python-format
 msgid "Already imported items"
 msgstr ""
@@ -101,6 +106,11 @@ msgid "Bank Statement Line"
 msgstr ""
 
 #. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_account_setup_bank_data_done
+msgid "Bank setup marked as done"
+msgstr ""
+
+#. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_belongs_to_company
 msgid "Belong to the user's current company"
 msgstr ""
@@ -118,16 +128,6 @@ msgid "Cannot find in which journal import this statement. Please manually selec
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
-msgid "Check Printing Payment Method Selected"
-msgstr ""
-
-#. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
-msgid "Check Sequence"
-msgstr ""
-
-#. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence
 msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal"
 msgstr ""
@@ -138,16 +138,6 @@ msgid "Check this box if you want to allow the cancellation the entries related
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
-msgid "Check this option if your pre-printed checks are not numbered."
-msgstr ""
-
-#. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
-msgid "Checks numbering sequence."
-msgstr ""
-
-#. module: account_bank_statement_import
 #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
 msgid "Choose a file to import..."
 msgstr ""
@@ -192,6 +182,11 @@ msgid "Credit Note Entry Sequence"
 msgstr ""
 
 #. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_number_next
+msgid "Credit Notes: Next Number"
+msgstr ""
+
+#. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id
 msgid "Currency"
 msgstr ""
@@ -355,23 +350,22 @@ msgid "Loss Account"
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
-msgid "Manual Numbering"
-msgstr ""
-
-#. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_inbound_payment_method_ids
-msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
+msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
+"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
+"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_outbound_payment_method_ids
-msgid "Means of payment for sending money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
+msgid "Manual:Pay bill by cash or any other method outside of Odoo.\n"
+"Check:Pay bill by check and print it from Odoo.\n"
+"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings."
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
-msgid "Next Check Number"
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_number_next
+msgid "Next Number"
 msgstr ""
 
 #. module: account_bank_statement_import
@@ -414,8 +408,8 @@ msgid "Sequence"
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
-msgid "Sequence number of the next printed check."
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_active
+msgid "Set active to false to hide the Journal without removing it."
 msgstr ""
 
 #. module: account_bank_statement_import
@@ -429,8 +423,8 @@ msgid "Show journal on dashboard"
 msgstr ""
 
 #. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
-msgid "Technical feature used to know whether check printing was enabled as payment method."
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_account_setup_bank_data_done
+msgid "Technical field used in the special view for the setup bar step."
 msgstr ""
 
 #. module: account_bank_statement_import
@@ -461,6 +455,16 @@ msgid "The journal entries of this journal will be named using this prefix."
 msgstr ""
 
 #. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_number_next
+msgid "The next sequence number will be used for the next credit note."
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_number_next
+msgid "The next sequence number will be used for the next invoice."
+msgstr ""
+
+#. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
 msgid "This field contains the information related to the numbering of the credit note entries of this journal."
 msgstr ""
@@ -508,7 +512,7 @@ msgid "Whether this journal should be displayed on the dashboard or not"
 msgstr ""
 
 #. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:237
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:233
 #, python-format
 msgid "You have already imported that file."
 msgstr ""
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index f71629f561a..229a6334d8a 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -69,6 +69,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_budget.field_account_analytic_account_crossovered_budget_line
 #: model:ir.model.fields,field_description:account_budget.field_account_budget_post_crossovered_budget_line
 #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_crossovered_budget_line
+#: model:ir.model.fields,field_description:account_budget.field_project_project_crossovered_budget_line
 #: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
 #: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_form
 #: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_search
@@ -94,7 +95,7 @@ msgstr ""
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
-#: model:ir.ui.view,arch_db:account_budget.account_config_settings_view_form_inherit_account_budget
+#: model:ir.ui.view,arch_db:account_budget.res_config_settings_view_form
 msgid "Budgetary Positions"
 msgstr ""
 
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index d124d34e31e..400f872ed46 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: account_cancel
-#: model:ir.model,name:account_cancel.model_account_bank_statement_line
-msgid "Bank Statement Line"
+#: model:ir.ui.view,arch_db:account_cancel.payment_cancel_form_inherit
+msgid "Cancel"
 msgstr ""
 
 #. module: account_cancel
-#: model:ir.ui.view,arch_db:account_cancel.payment_cancel_form_inherit
-msgid "Cancel"
+#: model:ir.ui.view,arch_db:account_cancel.view_move_form_inherit_account_cancel
+msgid "Cancel Entry"
 msgstr ""
 
 #. module: account_cancel
@@ -37,12 +37,6 @@ msgid "Cancel Invoice"
 msgstr ""
 
 #. module: account_cancel
-#: code:addons/account_cancel/models/account_bank_statement.py:28
-#, python-format
-msgid "Please set the bank statement to New before canceling."
-msgstr ""
-
-#. module: account_cancel
 #: model:ir.ui.view,arch_db:account_cancel.bank_statement_draft_form_inherit
 msgid "Reset to New"
 msgstr ""
diff --git a/addons/account_check_printing/i18n/account_check_printing.pot b/addons/account_check_printing/i18n/account_check_printing.pot
index ab9e18ea5de..1e9f58f2547 100644
--- a/addons/account_check_printing/i18n/account_check_printing.pot
+++ b/addons/account_check_printing/i18n/account_check_printing.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,13 +22,7 @@ msgid " : Check Number Sequence"
 msgstr ""
 
 #. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:59
-#, python-format
-msgid " and %s/100"
-msgstr ""
-
-#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:81
+#: code:addons/account_check_printing/models/account_payment.py:69
 #, python-format
 msgid "A check memo cannot exceed 60 characters."
 msgstr ""
@@ -124,7 +118,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:101
+#: code:addons/account_check_printing/models/account_payment.py:89
 #, python-format
 msgid "In order to print multiple checks at once, they must belong to the same bank journal."
 msgstr ""
@@ -157,6 +151,11 @@ msgid "Manual Numbering"
 msgstr ""
 
 #. module: account_check_printing
+#: model:ir.ui.view,arch_db:account_check_printing.view_account_bank_journal_form_inherited_check_printing
+msgid "Manual Numbering of check"
+msgstr ""
+
+#. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_next_number
 #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks_next_check_number
 msgid "Next Check Number"
@@ -173,7 +172,7 @@ msgid "Payments"
 msgstr ""
 
 #. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:98
+#: code:addons/account_check_printing/models/account_payment.py:86
 #, python-format
 msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "Print Checks"
 msgstr ""
 
 #. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:111
+#: code:addons/account_check_printing/models/account_payment.py:99
 #: model:ir.model,name:account_check_printing.model_print_prenumbered_checks
 #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
 #, python-format
@@ -233,7 +232,7 @@ msgid "The selected journal is configured to print check numbers. If your pre-pr
 msgstr ""
 
 #. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:133
+#: code:addons/account_check_printing/models/account_payment.py:121
 #, python-format
 msgid "There is no check layout configured.\n"
 "Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct."
@@ -249,3 +248,8 @@ msgstr ""
 msgid "Unmark Sent"
 msgstr ""
 
+#. module: account_check_printing
+#: model:ir.model,name:account_check_printing.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
diff --git a/addons/account_invoicing/i18n/account_invoicing.pot b/addons/account_invoicing/i18n/account_invoicing.pot
new file mode 100644
index 00000000000..031533a1d95
--- /dev/null
+++ b/addons/account_invoicing/i18n/account_invoicing.pot
@@ -0,0 +1,38 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_invoicing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoicing
+#. openerp-web
+#: code:addons/account_invoicing/static/src/js/tour.js:19
+#, python-format
+msgid "Click to <b>send the invoice by email.</b>"
+msgstr ""
+
+#. module: account_invoicing
+#. openerp-web
+#: code:addons/account_invoicing/static/src/js/tour.js:23
+#, python-format
+msgid "Click to <b>send the invoice.</b>"
+msgstr ""
+
+#. module: account_invoicing
+#. openerp-web
+#: code:addons/account_invoicing/static/src/js/tour.js:14
+#, python-format
+msgid "Click to <b>validate your invoice.</b> A reference will be assigned to this invoice and you will not be able to modify it anymore."
+msgstr ""
+
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
new file mode 100644
index 00000000000..6a9a1ab7888
--- /dev/null
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -0,0 +1,182 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment
+#: code:addons/account_payment/models/payment.py:61
+#, python-format
+msgid "<%s>  transaction (%s) invoice confirmation failed : <%s>"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/models/payment.py:45
+#, python-format
+msgid "<%s> transaction (%s) failed : <%s>"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/models/payment.py:52
+#, python-format
+msgid "<%s> transaction (%s) invalid state : %s"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<i class=\"fa fa-arrow-circle-right\"/><span class=\"hidden-xs\"> Pay Now</span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+msgid "<i class=\"fa fa-check-circle\"/> Paid"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+msgid "<i class=\"fa fa-check-circle\"/> Pending"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
+msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
+msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
+msgid "<strong>Transactions</strong>"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/controllers/payment.py:53
+#, python-format
+msgid "If we store your payment information on our server, subscription payments will be made automatically."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+#: model:ir.model.fields,field_description:account_payment.field_payment_transaction_account_invoice_id
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_success
+msgid "Invoice successfully paid."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model.fields,field_description:account_payment.field_account_invoice_payment_tx_id
+msgid "Last Transaction"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model.fields,field_description:account_payment.field_account_invoice_payment_tx_count
+msgid "Number of payment transactions"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/controllers/payment.py:50
+#, python-format
+msgid "Pay & Confirm"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/models/payment.py:119
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+#, python-format
+msgid "Pay Now"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+msgid "Pay with"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model.fields,field_description:account_payment.field_account_invoice_payment_acquirer_id
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_transaction
+msgid "Payment Transaction"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/models/account_invoice.py:28
+#, python-format
+msgid "Payment Transactions"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "Status"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: impossible to validate invoice."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: invalid invoice state."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: invalid invoice."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: issue with credit card ID validation."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: transaction amount issue.<br/>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: transaction failed.<br/>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was an error processing your payment: transaction issue.<br/>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
+msgid "There was en error processing your payment: invalid credit card ID."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model.fields,field_description:account_payment.field_account_invoice_payment_tx_ids
+#: model:ir.ui.view,arch_db:account_payment.account_invoice_view_form_inherit_payment
+msgid "Transactions"
+msgstr ""
+
diff --git a/addons/account_tax_python/i18n/account_tax_python.pot b/addons/account_tax_python/i18n/account_tax_python.pot
index b1b0668b1e6..a5bf9021dc1 100644
--- a/addons/account_tax_python/i18n/account_tax_python.pot
+++ b/addons/account_tax_python/i18n/account_tax_python.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_test/i18n/account_test.pot b/addons/account_test/i18n/account_test.pot
index e2a85df9419..6e846a7c641 100644
--- a/addons/account_test/i18n/account_test.pot
+++ b/addons/account_test/i18n/account_test.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #. module: account_test
 #: model:ir.actions.act_window,name:account_test.action_accounting_assert
-#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.actions.report,name:account_test.account_assert_test_report
 #: model:ir.ui.menu,name:account_test.menu_action_license
 msgid "Accounting Tests"
 msgstr ""
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 981be7c205c..be000a758d4 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -542,7 +542,7 @@ msgid "When the sale receipt is confirmed, you can record the customer\n"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:376
+#: code:addons/account_voucher/models/account_voucher.py:377
 #, python-format
 msgid "You must first select a partner!"
 msgstr ""
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index 4c15c5960a4..20ec0bf15e9 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,7 @@ msgstr ""
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_active
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_active
 msgid "Active"
 msgstr ""
 
@@ -108,6 +109,11 @@ msgid "Balance"
 msgstr ""
 
 #. module: analytic
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_kanban
+msgid "Balance:"
+msgstr ""
+
+#. module: analytic
 #: model:ir.actions.act_window,name:analytic.action_analytic_account_form
 msgid "Chart of Analytic Accounts"
 msgstr ""
@@ -289,6 +295,11 @@ msgid "Search Analytic Lines"
 msgstr ""
 
 #. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_tag_active
+msgid "Set active to false to hide the Analytic Tag without removing it."
+msgstr ""
+
+#. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_tag_ids
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_line_tag_ids
 msgid "Tags"
diff --git a/addons/anonymization/i18n/anonymization.pot b/addons/anonymization/i18n/anonymization.pot
index a12a4b334e9..e4237d68e53 100644
--- a/addons/anonymization/i18n/anonymization.pot
+++ b/addons/anonymization/i18n/anonymization.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: anonymization
+#: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
+msgid "<strong>Field</strong>"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
+msgid "<strong>Model</strong>"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
+msgid "<strong>Status</strong>"
+msgstr ""
+
+#. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymization_history_form
@@ -53,19 +68,19 @@ msgid "Anonymized Fields"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:197
+#: code:addons/anonymization/wizard/anonymize_wizard.py:196
 #, python-format
 msgid "Anonymized value can not be empty."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:72
+#: code:addons/anonymization/wizard/anonymize_wizard.py:71
 #, python-format
 msgid "Before executing the anonymization process, you should make a backup of your database."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:194
+#: code:addons/anonymization/wizard/anonymize_wizard.py:193
 #, python-format
 msgid "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
 msgstr ""
@@ -126,8 +141,8 @@ msgid "Done"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:142
-#: code:addons/anonymization/wizard/anonymize_wizard.py:266
+#: code:addons/anonymization/wizard/anonymize_wizard.py:141
+#: code:addons/anonymization/wizard/anonymize_wizard.py:263
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -183,7 +198,7 @@ msgid "Import"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:266
+#: code:addons/anonymization/wizard/anonymize_wizard.py:263
 #, python-format
 msgid "It is not possible to reverse the anonymization process without supplying the anonymization export file."
 msgstr ""
@@ -230,7 +245,7 @@ msgid "New"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:156
+#: code:addons/anonymization/wizard/anonymize_wizard.py:155
 #, python-format
 msgid "No fields are going to be anonymized."
 msgstr ""
@@ -289,45 +304,45 @@ msgid "Target Version"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/models/anonymization.py:55
+#: code:addons/anonymization/models/anonymization.py:56
 #, python-format
 msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:123
+#: code:addons/anonymization/wizard/anonymize_wizard.py:122
 #, python-format
 msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:146
-#: code:addons/anonymization/wizard/anonymize_wizard.py:262
+#: code:addons/anonymization/wizard/anonymize_wizard.py:145
+#: code:addons/anonymization/wizard/anonymize_wizard.py:259
 #, python-format
 msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:144
+#: code:addons/anonymization/wizard/anonymize_wizard.py:143
 #, python-format
 msgid "The database is currently anonymized, you cannot anonymize it again."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/models/anonymization.py:53
+#: code:addons/anonymization/models/anonymization.py:54
 #, python-format
 msgid "The database is currently anonymized, you cannot create, modify or delete fields."
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/wizard/anonymize_wizard.py:260
+#: code:addons/anonymization/wizard/anonymize_wizard.py:257
 #, python-format
 msgid "The database is not currently anonymized, you cannot reverse the anonymization."
 msgstr ""
 
 #. module: anonymization
 #: model:ir.model.fields,help:anonymization.field_ir_model_fields_anonymize_wizard_file_import
-msgid "This is the file created by the anonymization process. It should have the '.pickle' extention."
+msgid "This is the file created by the anonymization process. It should have the extension '.json' or '.pickle'."
 msgstr ""
 
 #. module: anonymization
@@ -336,9 +351,7 @@ msgid "Unstable"
 msgstr ""
 
 #. module: anonymization
-#: code:addons/anonymization/models/anonymization.py:32
 #: sql_constraint:ir.model.fields.anonymization:0
-#, python-format
 msgid "You cannot have two fields with the same name on the same object!"
 msgstr ""
 
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 4aead34ab83..ebf71a7ebb6 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/auth_crypt/i18n/auth_crypt.pot b/addons/auth_crypt/i18n/auth_crypt.pot
index b32bb16c7c1..ffc5bfc1837 100644
--- a/addons/auth_crypt/i18n/auth_crypt.pot
+++ b/addons/auth_crypt/i18n/auth_crypt.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot
index 8de0dd30aa5..c4511c26984 100644
--- a/addons/auth_ldap/i18n/auth_ldap.pot
+++ b/addons/auth_ldap/i18n/auth_ldap.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -62,13 +62,13 @@ msgid "LDAP Configuration"
 msgstr ""
 
 #. module: auth_ldap
-#: model:ir.model.fields,field_description:auth_ldap.field_base_config_settings_ldaps
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldaps
+#: model:ir.model.fields,field_description:auth_ldap.field_res_config_settings_ldaps
 msgid "LDAP Parameters"
 msgstr ""
 
 #. module: auth_ldap
-#: model:ir.ui.view,arch_db:auth_ldap.base_config_settings_view_form_inherit_auth_ldap
+#: model:ir.ui.view,arch_db:auth_ldap.res_config_settings_view_form
 msgid "LDAP Server"
 msgstr ""
 
@@ -183,12 +183,12 @@ msgid "Users"
 msgstr ""
 
 #. module: auth_ldap
-#: model:ir.model,name:auth_ldap.model_base_config_settings
-msgid "base.config.settings"
+#: model:ir.model,name:auth_ldap.model_res_company_ldap
+msgid "res.company.ldap"
 msgstr ""
 
 #. module: auth_ldap
-#: model:ir.model,name:auth_ldap.model_res_company_ldap
-msgid "res.company.ldap"
+#: model:ir.model,name:auth_ldap.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot
index e0269bb48c5..3c07241bdb8 100644
--- a/addons/auth_oauth/i18n/auth_oauth.pot
+++ b/addons/auth_oauth/i18n/auth_oauth.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Tutorial"
 msgstr ""
 
@@ -27,22 +27,12 @@ msgid "Access Denied"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_account_payable_id
-msgid "Account Payable"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_account_receivable_id
-msgid "Account Receivable"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_auth_oauth_google_enabled
+#: model:ir.model.fields,field_description:auth_oauth.field_res_config_settings_auth_oauth_google_enabled
 msgid "Allow users to sign in with Google"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Allow users to sign in with their Google account"
 msgstr ""
 
@@ -57,11 +47,6 @@ msgid "Authentication URL"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_bank_account_count
-msgid "Bank"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_body
 msgid "Body"
 msgstr ""
@@ -73,27 +58,16 @@ msgstr ""
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_client_id
-#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_auth_oauth_google_client_id
+#: model:ir.model.fields,field_description:auth_oauth.field_res_config_settings_auth_oauth_google_client_id
 msgid "Client ID"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Client ID:"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_ref_company_ids
-msgid "Companies that refers to partner"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_contract_ids
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_contracts_count
-msgid "Contracts"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_create_uid
 msgid "Created by"
 msgstr ""
@@ -104,67 +78,26 @@ msgid "Created on"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_currency_id
-msgid "Currency"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_payment_term_id
-msgid "Customer Payment Terms"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_data_endpoint
 msgid "Data URL"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_trust
-msgid "Degree of trust you have in this debtor"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_account_position_id
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Google Authentification"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_has_unreconciled_entries
-msgid "Has Unreconciled Entries"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_id
 msgid "ID"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_warn
-msgid "Invoice"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_ids
-msgid "Invoices"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_issued_total
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_journal_item_count
-msgid "Journal Items"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider___last_update
 msgid "Last Modified on"
 msgstr ""
@@ -180,21 +113,6 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_last_time_entries_checked
-msgid "Last time the invoices & payments matching was performed for this partner. It is set either if there's not at least an unreconciled debit and an unreconciled credit or if you click the \"Done\" button."
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_last_time_entries_checked
-msgid "Latest Invoices & Payments Matching Date"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_warn_msg
-msgid "Message for Invoice"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_res_users_oauth_access_token
 msgid "OAuth Access Token"
 msgstr ""
@@ -206,7 +124,7 @@ msgstr ""
 
 #. module: auth_oauth
 #: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "OAuth Providers"
 msgstr ""
 
@@ -236,11 +154,6 @@ msgid "Oauth Provider user_id"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_debit_limit
-msgid "Payable Limit"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_name
 msgid "Provider name"
 msgstr ""
@@ -256,17 +169,12 @@ msgid "Scope"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_invoice_warn
-msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_server_uri_google
+#: model:ir.model.fields,field_description:auth_oauth.field_res_config_settings_server_uri_google
 msgid "Server uri"
 msgstr ""
 
@@ -277,81 +185,16 @@ msgid "Sign up is not allowed on this database."
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_property_account_position_id
-msgid "The fiscal position will determine taxes and accounts used for the partner."
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_has_unreconciled_entries
-msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_property_account_payable_id
-msgid "This account will be used instead of the default one as the payable account for the current partner"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_property_account_receivable_id
-msgid "This account will be used instead of the default one as the receivable account for the current partner"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_property_supplier_payment_term_id
-msgid "This payment term will be used instead of the default one for purchase orders and vendor bills"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_property_payment_term_id
-msgid "This payment term will be used instead of the default one for sales orders and customer invoices"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_total_invoiced
-msgid "Total Invoiced"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_debit
-msgid "Total Payable"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_credit
-msgid "Total Receivable"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_credit
-msgid "Total amount this customer owes you."
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_debit
-msgid "Total amount you have to pay to this vendor."
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
 msgid "Users"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_currency_id
-msgid "Utility field to express amount currency"
-msgstr ""
-
-#. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_validation_endpoint
 msgid "Validation URL"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_supplier_payment_term_id
-msgid "Vendor Payment Terms"
-msgstr ""
-
-#. module: auth_oauth
 #: code:addons/auth_oauth/controllers/main.py:101
 #, python-format
 msgid "You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email."
@@ -364,12 +207,7 @@ msgid "arch"
 msgstr ""
 
 #. module: auth_oauth
-#: model:ir.model,name:auth_oauth.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.base_config_settings_view_form_inherit_auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "e.g. 1234-xyz.apps.googleusercontent.com"
 msgstr ""
 
@@ -378,3 +216,8 @@ msgstr ""
 msgid "ir.config_parameter"
 msgstr ""
 
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index 585daa0570f..31dcddfdf79 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -94,42 +94,35 @@ msgid "<strong>An invitation email containing the following subscription link ha
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_uninvited
-#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_uninvited
-msgid "Allow external users to sign up"
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
-msgid "Allow external users to sign up from Login page"
+#: model:ir.ui.view,arch_db:auth_signup.signup
+msgid "Already have an account?"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:61
+#: code:addons/auth_signup/controllers/main.py:78
 #, python-format
 msgid "An email has been sent with credentials to reset your password"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:38
+#: code:addons/auth_signup/controllers/main.py:52
 #, python-format
 msgid "Another user is already registered using this email address."
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:112
+#: code:addons/auth_signup/controllers/main.py:133
 #, python-format
 msgid "Authentication Failed."
 msgstr ""
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.reset_password
-#: model:ir.ui.view,arch_db:auth_signup.signup
 msgid "Back to Login"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:135
+#: code:addons/auth_signup/models/res_users.py:137
 #, python-format
 msgid "Cannot send email: user %s has no email address."
 msgstr ""
@@ -155,52 +148,92 @@ msgid "Contact"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:41
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
+msgid "Copy access rights from"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/controllers/main.py:55
 #, python-format
 msgid "Could not create a new account."
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:63
+#: code:addons/auth_signup/controllers/main.py:80
 #, python-format
 msgid "Could not reset your password"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_uninvited
+msgid "Customer Account"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Default Access Rights"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_reset_password
-#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_reset_password
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.login
+msgid "Don't have an account?"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_reset_password
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Enable password reset from Login page"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
+#: selection:res.config.settings,auth_signup_uninvited:0
+msgid "Free sign up (B2C)"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "If unchecked, only invited users may sign up."
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:92
+#: code:addons/auth_signup/controllers/main.py:111
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
+msgid "Let your customers log in to see their documents"
+msgstr ""
+
+#. module: auth_signup
 #: selection:res.users,state:0
 msgid "Never Connected"
 msgstr ""
 
 #. module: auth_signup
+#: code:addons/auth_signup/controllers/main.py:73
+#, python-format
+msgid "No login provided."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.config.settings,auth_signup_uninvited:0
+msgid "On invitation (B2B)"
+msgstr ""
+
+#. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.fields
 msgid "Password"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Password Reset"
 msgstr ""
 
@@ -210,12 +243,18 @@ msgid "Password reset"
 msgstr ""
 
 #. module: auth_signup
+#: code:addons/auth_signup/controllers/main.py:121
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
 msgid "Reset Password"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:108
+#: code:addons/auth_signup/models/res_users.py:110
 #, python-format
 msgid "Reset password: invalid username or email"
 msgstr ""
@@ -231,7 +270,6 @@ msgid "Send an Invitation Email"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.login
 #: model:ir.ui.view,arch_db:auth_signup.signup
 msgid "Sign up"
 msgstr ""
@@ -267,64 +305,47 @@ msgid "Signup URL"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_state
-msgid "Status"
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_template_user_id
-#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_template_user_id
-msgid "Template user for new users created through signup"
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.model.fields,help:auth_signup.field_res_users_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup
-msgid "User Signup"
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.model,name:auth_signup.model_res_users
-msgid "Users"
+#: code:addons/auth_signup/models/res_users.py:88
+#, python-format
+msgid "Signup is not allowed for uninvited users"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_published
-msgid "Visible in Website"
+#: code:addons/auth_signup/models/res_partner.py:146
+#, python-format
+msgid "Signup token '%s' is no longer valid"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_description
-msgid "Website Partner Full Description"
+#: code:addons/auth_signup/models/res_partner.py:142
+#, python-format
+msgid "Signup token '%s' is not valid"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_short_description
-msgid "Website Partner Short Description"
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_state
+msgid "Status"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_url
-msgid "Website URL"
+#: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_template_user_id
+msgid "Template user for new users created through signup"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_description
-msgid "Website meta description"
+#: code:addons/auth_signup/controllers/main.py:119
+#, python-format
+msgid "The form was not properly filled in."
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_keywords
-msgid "Website meta keywords"
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_title
-msgid "Website meta title"
+#: model:mail.template,subject:auth_signup.mail_template_user_signup_account_created
+msgid "Welcome to ${object.company_id.name}!"
 msgstr ""
 
 #. module: auth_signup
@@ -339,8 +360,8 @@ msgid "Your Name"
 msgstr ""
 
 #. module: auth_signup
-#: model:ir.model,name:auth_signup.model_base_config_settings
-msgid "base.config.settings"
+#: model:mail.template,body_html:auth_signup.mail_template_user_signup_account_created
+msgid "\\x3c646976207374796c653d2270616464696e673a3070783b77696474683a36303070783b6d617267696e3a6175746f3b6261636b67726f756e643a20234646464646462072657065617420746f70202f313030253b636f6c6f723a23373737373737223e0a202020203c7461626c652063656c6c73706163696e673d2230222063656c6c70616464696e673d223022207374796c653d2277696474683a36303070783b626f726465722d636f6c6c617073653a636f6c6c617073653b6261636b67726f756e643a696e68657269743b636f6c6f723a696e6865726974223e0a20202020202020203c74626f64793e3c74723e0a2020202020202020202020203c74642076616c69676e3d2263656e746572222077696474683d2232303022207374796c653d2270616464696e673a3130707820313070782031307078203570783b666f6e742d73697a653a2031327078223e0a202020202020202020202020202020203c696d67207372633d222f6c6f676f2e706e6722207374796c653d2270616464696e673a203070783b206d617267696e3a203070783b206865696768743a206175746f3b2077696474683a20383070783b2220616c743d22247b757365722e636f6d70616e795f69642e6e616d657d222f3e0a2020202020202020202020203c2f74643e0a20202020202020203c2f74723e3c2f74626f64793e0a202020203c2f7461626c653e0a3c2f6469763e0a3c646976207374796c653d2270616464696e673a3070783b77696474683a36303070783b6d617267696e3a6175746f3b6261636b67726f756e643a20234646464646462072657065617420746f70202f313030253b636f6c6f723a23373737373737223e0a202020203c703e4465617220247b6f626a6563742e6e616d657d2c3c2f703e0a202020203c703e0a2020202020202020596f7572206163636f756e7420686173206265656e207375636365737366756c6c792063726561746564210a202020203c2f703e0a202020203c703e0a2020202020202020596f7572206c6f67696e3a20247b6f626a6563742e656d61696c7d0a20202020202020203c62722f3e0a2020202020202020596f75722070617373776f72643a20247b6374785b2770617373776f7264275d7d0a202020203c2f703e0a202020203c703e0a2020202020202020546f206761696e2061636365737320746f20796f7572206163636f756e742c20796f752063616e207573652074686520666f6c6c6f77696e67206c696e6b3a0a202020203c2f703e0a202020203c646976207374796c653d22746578742d616c69676e3a2063656e7465723b206d617267696e2d746f703a20313670783b223e0a20202020202020203c6120687265663d222f7765622f6c6f67696e3f247b6374785b27617574685f6c6f67696e275d7d22207374796c653d2270616464696e673a2035707820313070783b20666f6e742d73697a653a20313270783b206c696e652d6865696768743a20313870783b20636f6c6f723a20234646464646463b20626f726465722d636f6c6f723a233837354137423b20746578742d6465636f726174696f6e3a206e6f6e653b20646973706c61793a20696e6c696e652d626c6f636b3b206d617267696e2d626f74746f6d3a203070783b20666f6e742d7765696768743a203430303b20746578742d616c69676e3a2063656e7465723b20766572746963616c2d616c69676e3a206d6964646c653b20637572736f723a20706f696e7465723b2077686974652d73706163653a206e6f777261703b206261636b67726f756e642d696d6167653a206e6f6e653b206261636b67726f756e642d636f6c6f723a20233837354137423b20626f726465723a2031707820736f6c696420233837354137423b20626f726465722d7261646975733a337078223e476f20746f204d79204163636f756e743c2f613e0a202020203c2f6469763e0a202020203c703e4265737420726567617264732c3c2f703e0a3c2f6469763e0a3c646976207374796c653d2270616464696e673a3070783b77696474683a36303070783b6d617267696e3a6175746f3b206d617267696e2d746f703a20313070783b206261636b67726f756e643a20236666662072657065617420746f70202f313030253b636f6c6f723a23373737373737223e0a20202020247b757365722e7369676e6174757265207c20736166657d0a202020203c70207374796c653d22666f6e742d73697a653a20313170783b206d617267696e2d746f703a20313070783b223e0a20202020202020203c7374726f6e673e53656e7420627920247b757365722e636f6d70616e795f69642e6e616d657d207573696e67203c6120687265663d227777772e6f646f6f2e636f6d22207374796c653d22746578742d6465636f726174696f6e3a6e6f6e653b20636f6c6f723a20233837354137423b223e4f646f6f3c2f613e3c2f7374726f6e673e0a202020203c2f703e0a3c2f6469763e"
 msgstr ""
 
 #. module: auth_signup
@@ -348,3 +369,8 @@ msgstr ""
 msgid "e.g. John Doe"
 msgstr ""
 
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index f034eee2fea..ef1b9f21c40 100644
--- a/addons/barcodes/i18n/barcodes.pot
+++ b/addons/barcodes/i18n/barcodes.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -53,13 +53,6 @@ msgid "A barcode nomenclature defines how the point of sale identify and interpr
 msgstr ""
 
 #. module: barcodes
-#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:323
-#, python-format
-msgid "Action currently unavailable"
-msgstr ""
-
-#. module: barcodes
 #: code:addons/barcodes/models/barcodes.py:183
 #: selection:barcode.rule,type:0
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
@@ -150,7 +143,7 @@ msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:286
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:359
 #, python-format
 msgid "Discard"
 msgstr ""
@@ -189,21 +182,21 @@ msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:233
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:301
 #, python-format
 msgid "Error : Barcode command is undefined"
 msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:59
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:63
 #, python-format
 msgid "Error : Document not editable"
 msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:259
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:332
 #, python-format
 msgid "Error : No last scanned barcode"
 msgstr ""
@@ -286,7 +279,7 @@ msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:279
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:352
 #, python-format
 msgid "Select"
 msgstr ""
@@ -298,7 +291,7 @@ msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:278
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:351
 #, python-format
 msgid "Set quantity"
 msgstr ""
@@ -338,14 +331,14 @@ msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:60
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:64
 #, python-format
 msgid "To modify this document, please first start edition."
 msgstr ""
 
 #. module: barcodes
 #. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:260
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:333
 #, python-format
 msgid "To set the quantity please scan a barcode first."
 msgstr ""
diff --git a/addons/base_address_city/i18n/base_address_city.pot b/addons/base_address_city/i18n/base_address_city.pot
index 395017b547b..176730d8938 100644
--- a/addons/base_address_city/i18n/base_address_city.pot
+++ b/addons/base_address_city/i18n/base_address_city.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,7 @@ msgstr ""
 #. module: base_address_city
 #: model:ir.model.fields,help:base_address_city.field_res_country_enforce_cities
 #: model:ir.model.fields,help:base_address_city.field_res_partner_country_enforce_cities
+#: model:ir.model.fields,help:base_address_city.field_res_users_country_enforce_cities
 msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities."
 msgstr ""
 
@@ -36,6 +37,7 @@ msgstr ""
 
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_partner_city_id
+#: model:ir.model.fields,field_description:base_address_city.field_res_users_city_id
 msgid "Company"
 msgstr ""
 
@@ -75,6 +77,7 @@ msgstr ""
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_country_enforce_cities
 #: model:ir.model.fields,field_description:base_address_city.field_res_partner_country_enforce_cities
+#: model:ir.model.fields,field_description:base_address_city.field_res_users_country_enforce_cities
 msgid "Enforce Cities"
 msgstr ""
 
diff --git a/addons/base_address_extended/i18n/base_address_extended.pot b/addons/base_address_extended/i18n/base_address_extended.pot
index c3730653181..3c8be635afb 100644
--- a/addons/base_address_extended/i18n/base_address_extended.pot
+++ b/addons/base_address_extended/i18n/base_address_extended.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -84,8 +84,8 @@ msgid "Street format..."
 msgstr ""
 
 #. module: base_address_extended
-#: code:addons/base_address_extended/models/base_address_extended.py:61
-#: code:addons/base_address_extended/models/base_address_extended.py:127
+#: code:addons/base_address_extended/models/base_address_extended.py:60
+#: code:addons/base_address_extended/models/base_address_extended.py:126
 #, python-format
 msgid "Unrecognized field %s in street format."
 msgstr ""
diff --git a/addons/base_automation/i18n/base_automation.pot b/addons/base_automation/i18n/base_automation.pot
index 01358b3f0bc..b803ff31136 100644
--- a/addons/base_automation/i18n/base_automation.pot
+++ b/addons/base_automation/i18n/base_automation.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_automation
-#: model:ir.model.fields,help:base_automation.field_base_automation_website_published
-msgid "A code server action can be executed from the website, using a dedicated controller. The address is <base>/website/action/<website_path>. Set this field as True to allow users to run this action. If it is set to False the action cannot be run through the website."
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_help
 msgid "Action Description"
 msgstr ""
@@ -51,11 +46,6 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_menu_ir_values_id
-msgid "Action on Object"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_active
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_active
 msgid "Active"
@@ -72,6 +62,11 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation_filter_domain
+msgid "Apply on"
+msgstr ""
+
+#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_is_assigned_to_admin
 msgid "Assigned to admin user"
 msgstr ""
@@ -93,11 +88,6 @@ msgid "Automation"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_website_published
-msgid "Available on the Website"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.actions.server,name:base_automation.ir_cron_data_base_automation_check_ir_actions_server
 #: model:ir.cron,cron_name:base_automation.ir_cron_data_base_automation_check
 #: model:ir.cron,name:base_automation.ir_cron_data_base_automation_check
@@ -105,16 +95,6 @@ msgid "Base Action Rule: check and execute"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_model_id
-msgid "Base Model"
-msgstr ""
-
-#. module: base_automation
-#: model:ir.model.fields,help:base_automation.field_base_automation_model_id
-msgid "Base model on which the server action runs."
-msgstr ""
-
-#. module: base_automation
 #: selection:base.automation,trigger:0
 msgid "Based on Form Modification"
 msgstr ""
@@ -130,6 +110,16 @@ msgid "Before Update Domain"
 msgstr ""
 
 #. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_model_id
+msgid "Binding Model"
+msgstr ""
+
+#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_type
+msgid "Binding Type"
+msgstr ""
+
+#. module: base_automation
 #: selection:base.automation.lead.test,state:0
 msgid "Cancelled"
 msgstr ""
@@ -218,11 +208,6 @@ msgid "Display Name"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_filter_domain
-msgid "Domain"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_template_id
 msgid "Email Template"
 msgstr ""
@@ -245,11 +230,6 @@ msgid "ID"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,help:base_automation.field_base_automation_xml_id
-msgid "ID of the action if defined in a XML file"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_filter_domain
 msgid "If present, this condition must be satisfied before executing the action rule."
 msgstr ""
@@ -265,11 +245,6 @@ msgid "In Progress"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,help:base_automation.field_base_automation_menu_ir_values_id
-msgid "IrValues entry of the related more menu entry action"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_customer
 msgid "Is a Customer"
 msgstr ""
@@ -326,6 +301,7 @@ msgid "Minutes"
 msgstr ""
 
 #. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation_model_id
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_model_name
 msgid "Model"
 msgstr ""
@@ -341,6 +317,11 @@ msgid "Model for record creation / update. Set this field only to specify a diff
 msgstr ""
 
 #. module: base_automation
+#: model:ir.model.fields,help:base_automation.field_base_automation_model_id
+msgid "Model on which the server action runs."
+msgstr ""
+
+#. module: base_automation
 #: selection:base.automation,trg_date_range_type:0
 msgid "Months"
 msgstr ""
@@ -436,6 +417,11 @@ msgid "Server Actions"
 msgstr ""
 
 #. module: base_automation
+#: model:ir.model.fields,help:base_automation.field_base_automation_binding_model_id
+msgid "Setting a value makes this action available in the sidebar for the given model."
+msgstr ""
+
+#. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_state
 msgid "Status"
 msgstr ""
@@ -446,8 +432,8 @@ msgid "Subject"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,help:base_automation.field_base_automation_website_url
-msgid "The full URL to access the server action through the website."
+#: model:ir.model.fields,field_description:base_automation.field_base_automation_trigger
+msgid "Trigger Condition"
 msgstr ""
 
 #. module: base_automation
@@ -456,11 +442,6 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_trigger
-msgid "Trigger condition"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_state
 msgid "Type of server action. The following values are available:\n"
 "- 'Execute Python Code': a block of python code that will be executed\n"
@@ -501,16 +482,6 @@ msgid "Value Mapping"
 msgstr ""
 
 #. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_website_path
-msgid "Website Path"
-msgstr ""
-
-#. module: base_automation
-#: model:ir.model.fields,field_description:base_automation.field_base_automation_website_url
-msgid "Website Url"
-msgstr ""
-
-#. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_trg_date_calendar_id
 msgid "When calculating a day-based timed condition, it is possible to use a calendar to compute the date based on working days."
 msgstr ""
diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot
index b9d112795d7..a46a7f04948 100644
--- a/addons/base_gengo/i18n/base_gengo.pot
+++ b/addons/base_gengo/i18n/base_gengo.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,28 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Add Gengo login Private Key..."
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Add Gengo login Public Key..."
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Add your comments here for translator...."
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Auto Approve Translation"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,field_description:base_gengo.field_base_config_settings_gengo_auto_approve
 #: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_auto_approve
+#: model:ir.model.fields,field_description:base_gengo.field_res_config_settings_gengo_auto_approve
 msgid "Auto Approve Translation ?"
 msgstr ""
 
@@ -52,8 +52,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,help:base_gengo.field_base_config_settings_gengo_sandbox
 #: model:ir.model.fields,help:base_gengo.field_res_company_gengo_sandbox
+#: model:ir.model.fields,help:base_gengo.field_res_config_settings_gengo_sandbox
 msgid "Check this box if you're using the sandbox mode of Gengo, mainly used for testing purpose."
 msgstr ""
 
@@ -63,13 +63,13 @@ msgid "Click here to Configure Gengo Parameters"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Comment"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,field_description:base_gengo.field_base_config_settings_gengo_comment
 #: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_comment
+#: model:ir.model.fields,field_description:base_gengo.field_res_config_settings_gengo_comment
 msgid "Comments"
 msgstr ""
 
@@ -109,14 +109,14 @@ msgid "Gengo Order ID"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,field_description:base_gengo.field_base_config_settings_gengo_private_key
 #: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_private_key
+#: model:ir.model.fields,field_description:base_gengo.field_res_config_settings_gengo_private_key
 msgid "Gengo Private Key"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,field_description:base_gengo.field_base_config_settings_gengo_public_key
 #: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_public_key
+#: model:ir.model.fields,field_description:base_gengo.field_res_config_settings_gengo_public_key
 msgid "Gengo Public Key"
 msgstr ""
 
@@ -179,8 +179,8 @@ msgid "ID"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,help:base_gengo.field_base_config_settings_gengo_auto_approve
 #: model:ir.model.fields,help:base_gengo.field_res_company_gengo_auto_approve
+#: model:ir.model.fields,help:base_gengo.field_res_config_settings_gengo_auto_approve
 msgid "Jobs are Automatically Approved by Gengo."
 msgstr ""
 
@@ -215,7 +215,7 @@ msgid "Note: If the translation state is 'In Progress', it means that the transl
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Private Key"
 msgstr ""
 
@@ -225,7 +225,7 @@ msgid "Pro"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Public Key"
 msgstr ""
 
@@ -235,9 +235,9 @@ msgid "Receive Translation"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,field_description:base_gengo.field_base_config_settings_gengo_sandbox
 #: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_sandbox
-#: model:ir.ui.view,arch_db:base_gengo.view_general_configuration_form_inherit_base_gengo
+#: model:ir.model.fields,field_description:base_gengo.field_res_config_settings_gengo_sandbox
+#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Sandbox Mode"
 msgstr ""
 
@@ -273,8 +273,8 @@ msgid "The private and public keys are valid"
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model.fields,help:base_gengo.field_base_config_settings_gengo_comment
 #: model:ir.model.fields,help:base_gengo.field_res_company_gengo_comment
+#: model:ir.model.fields,help:base_gengo.field_res_config_settings_gengo_comment
 msgid "This comment will be automatically be enclosed in each an every request sent to Gengo"
 msgstr ""
 
@@ -305,11 +305,6 @@ msgid "You can select here the service level you want for an automatic translati
 msgstr ""
 
 #. module: base_gengo
-#: model:ir.model,name:base_gengo.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
-
-#. module: base_gengo
 #: model:ir.model,name:base_gengo.model_base_gengo_translations
 msgid "base.gengo.translations"
 msgstr ""
@@ -319,3 +314,8 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/base_geolocalize/i18n/base_geolocalize.pot b/addons/base_geolocalize/i18n/base_geolocalize.pot
index 9c58dde0c45..d1c772aaa8a 100644
--- a/addons/base_geolocalize/i18n/base_geolocalize.pot
+++ b/addons/base_geolocalize/i18n/base_geolocalize.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "<span> ;  Long:  </span>"
 msgstr ""
 
 #. module: base_geolocalize
-#: code:addons/base_geolocalize/models/res_partner.py:17
+#: code:addons/base_geolocalize/models/res_partner.py:18
 #, python-format
 msgid "Cannot contact geolocation servers. Please make sure that your Internet connection is up and running (%s)."
 msgstr ""
@@ -43,11 +43,13 @@ msgstr ""
 
 #. module: base_geolocalize
 #: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_latitude
+#: model:ir.model.fields,field_description:base_geolocalize.field_res_users_partner_latitude
 msgid "Geo Latitude"
 msgstr ""
 
 #. module: base_geolocalize
 #: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_longitude
+#: model:ir.model.fields,field_description:base_geolocalize.field_res_users_partner_longitude
 msgid "Geo Longitude"
 msgstr ""
 
@@ -63,6 +65,7 @@ msgstr ""
 
 #. module: base_geolocalize
 #: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_date_localization
+#: model:ir.model.fields,field_description:base_geolocalize.field_res_users_date_localization
 msgid "Geolocation Date"
 msgstr ""
 
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index ef22d3fc598..a671a207653 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index c430565a184..ee661a28c90 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:599
+#: code:addons/base_import/static/src/js/import_action.js:535
 #, python-format
 msgid "(%d more)"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:376
+#: code:addons/base_import/static/src/js/import_action.js:309
 #, python-format
 msgid "A single column was found in the file, this often means the file separator is incorrect"
 msgstr ""
@@ -37,23 +37,23 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:600
+#: code:addons/base_import/models/base_import.py:596
 #, python-format
 msgid "Column %s contains incorrect values (value: %s)"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:620
+#: code:addons/base_import/models/base_import.py:618
 #, python-format
 msgid "Column %s contains incorrect values. Error in line %d: %s"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:245
-#: code:addons/base_import/static/src/js/base_import.js:256
-#: code:addons/base_import/static/src/js/base_import.js:263
-#: code:addons/base_import/static/src/js/base_import.js:275
+#: code:addons/base_import/static/src/js/import_action.js:176
+#: code:addons/base_import/static/src/js/import_action.js:187
+#: code:addons/base_import/static/src/js/import_action.js:194
+#: code:addons/base_import/static/src/js/import_action.js:206
 #, python-format
 msgid "Comma"
 msgstr ""
@@ -95,29 +95,29 @@ msgid "Created on"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:152
-#: code:addons/base_import/models/base_import.py:157
+#: code:addons/base_import/models/base_import.py:145
+#: code:addons/base_import/models/base_import.py:150
 #, python-format
 msgid "Database ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:125
+#: code:addons/base_import/static/src/js/import_action.js:55
 #, python-format
 msgid "Date Format:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:126
+#: code:addons/base_import/static/src/js/import_action.js:56
 #, python-format
 msgid "Datetime Format:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:128
+#: code:addons/base_import/static/src/js/import_action.js:58
 #, python-format
 msgid "Decimal Separator:"
 msgstr ""
@@ -142,48 +142,48 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:420
+#: code:addons/base_import/static/src/js/import_action.js:353
 #, python-format
 msgid "Don't import"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:264
-#: code:addons/base_import/static/src/js/base_import.js:282
+#: code:addons/base_import/static/src/js/import_action.js:195
+#: code:addons/base_import/static/src/js/import_action.js:213
 #, python-format
 msgid "Dot"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:120
+#: code:addons/base_import/static/src/js/import_action.js:50
 #, python-format
 msgid "Encoding:"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:622
+#: code:addons/base_import/models/base_import.py:620
 #, python-format
 msgid "Error Parsing Date [%s:L%d]: %s"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:234
+#: code:addons/base_import/models/base_import.py:227
 #, python-format
 msgid "Error cell found while reading XLS/XLSX file: %s"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:576
+#: code:addons/base_import/static/src/js/import_action.js:512
 #, python-format
 msgid "Everything seems valid."
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:117
-#: code:addons/base_import/models/base_import.py:151
+#: code:addons/base_import/models/base_import.py:110
+#: code:addons/base_import/models/base_import.py:144
 #, python-format
 msgid "External ID"
 msgstr ""
@@ -217,7 +217,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:623
+#: code:addons/base_import/static/src/js/import_action.js:559
 #, python-format
 msgid "Get all possible values"
 msgstr ""
@@ -231,7 +231,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:610
+#: code:addons/base_import/static/src/js/import_action.js:546
 #, python-format
 msgid "Here are the possible values:"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:182
+#: code:addons/base_import/static/src/js/import_action.js:111
 #, python-format
 msgid "Import a File"
 msgstr ""
@@ -387,7 +387,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:486
+#: code:addons/base_import/static/src/js/import_action.js:418
 #, python-format
 msgid "Normal Fields"
 msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:487
+#: code:addons/base_import/static/src/js/import_action.js:419
 #, python-format
 msgid "Relation Fields"
 msgstr ""
@@ -432,14 +432,14 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:246
+#: code:addons/base_import/static/src/js/import_action.js:177
 #, python-format
 msgid "Semicolon"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:121
+#: code:addons/base_import/static/src/js/import_action.js:51
 #, python-format
 msgid "Separator:"
 msgstr ""
@@ -458,21 +458,28 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:248
+#: code:addons/base_import/static/src/js/import_action.js:179
 #, python-format
 msgid "Space"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:247
+#: code:addons/base_import/static/src/js/import_action.js:178
 #, python-format
 msgid "Tab"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:122
+#: code:addons/base_import/static/src/xml/base_import.xml:86
+#, python-format
+msgid "Test Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:52
 #, python-format
 msgid "Text Delimiter:"
 msgstr ""
@@ -487,7 +494,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:127
+#: code:addons/base_import/static/src/js/import_action.js:57
 #, python-format
 msgid "Thousands Separator:"
 msgstr ""
@@ -500,25 +507,18 @@ msgid "Track history during import"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:199
+#: code:addons/base_import/models/base_import.py:192
 #, python-format
 msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:200
+#: code:addons/base_import/models/base_import.py:193
 #, python-format
 msgid "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
-#, python-format
-msgid "Validate"
-msgstr ""
-
-#. module: base_import
 #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_value
 #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_value
 #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_value
@@ -535,14 +535,14 @@ msgid "Value"
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models/base_import.py:538
+#: code:addons/base_import/models/base_import.py:534
 #, python-format
 msgid "You must configure at least one field to import"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:593
+#: code:addons/base_import/static/src/js/import_action.js:529
 #, python-format
 msgid "at row %d"
 msgstr ""
@@ -619,7 +619,7 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:595
+#: code:addons/base_import/static/src/js/import_action.js:531
 #, python-format
 msgid "between rows %d and %d"
 msgstr ""
diff --git a/addons/base_import_module/i18n/base_import_module.pot b/addons/base_import_module/i18n/base_import_module.pot
index 8af3356b3f4..c0e08856886 100644
--- a/addons/base_import_module/i18n/base_import_module.pot
+++ b/addons/base_import_module/i18n/base_import_module.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,13 +47,13 @@ msgid "Display Name"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:100
+#: code:addons/base_import_module/models/ir_module.py:101
 #, python-format
 msgid "File '%s' exceed maximum allowed file size"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:92
+#: code:addons/base_import_module/models/ir_module.py:93
 #, python-format
 msgid "File is not a zip file!"
 msgstr ""
@@ -127,7 +127,7 @@ msgid "Module .ZIP file"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:90
+#: code:addons/base_import_module/models/ir_module.py:91
 #, python-format
 msgid "No file sent."
 msgstr ""
@@ -154,7 +154,7 @@ msgid "Status"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:35
+#: code:addons/base_import_module/models/ir_module.py:36
 #, python-format
 msgid "Unmet module dependencies: %s"
 msgstr ""
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index 9273b52940f..f951b54dcbf 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,286 +16,301 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "<strong>Save</strong> this page and come back here to set up the feature."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Access Rights"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_group_multi_currency
 msgid "Allow multi currencies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_calendar
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_calendar
 msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
+#: model:ir.model.fields,help:base_setup.field_res_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_voip
+msgid "Asterisk (VoIP)"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_drive
 msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Automate inter-companies transactions"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Business Documents"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "By default, new users get highest access rights for all installed apps."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Cancel"
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Change Document Template"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Common Contact Book"
+#: code:addons/base_setup/models/res_config_settings.py:100
+#, python-format
+msgid "Choose Your Document Layout"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Companies"
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Choose your document's header and footer layout"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Company"
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_pad
+msgid "Collaborative Pads"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Common Contact Book"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Create and attach Google Drive documents to any record"
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_company_id
+msgid "Company"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_date
-msgid "Created on"
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_report_footer
 msgid "Custom Report Footer"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Default Access Rights"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_external_report_layout
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Document Template"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
-msgid "External Email Servers"
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Edit Header"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
-msgid "External Pads"
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_external_email_server
+msgid "External Email Servers"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Extract and analyze Odoo data from Google Spreadsheet"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+#: model:ir.model.fields,help:base_setup.field_res_config_settings_report_footer
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
 #. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Format"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_config
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Gengo Translations"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_spreadsheet
 msgid "Google Spreadsheet"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
-msgid "ID"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Import & Export"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Integrations"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Inter-Companies Transactions"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "LDAP Authentification"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_inter_company_rules
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_inter_company_rules
 msgid "Manage Inter Company"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_company
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_group_multi_company
 msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Manage multiple legal entities with separate accounting"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Multi-Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "OAuth Authentification"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
-msgid "Save"
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_paperformat_id
+msgid "Paper format"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Preview Document"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Set custom access rights for new users"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Set the paper format of printed documents"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_company_share_partner
 msgid "Share partners to all companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_company_share_partner
+#: model:ir.model.fields,help:base_setup.field_res_config_settings_company_share_partner
 msgid "Share your partners to all companies defined in your instance.\n"
 " * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n"
 " * Unchecked : Each company can see only its partner (partners where company is defined). Partners not related to a company are visible for all companies."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Synchronize your calendar with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Template"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_base_gengo
 msgid "Translate Your Website with Gengo"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Translate your website with Gengo"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use LDAP credentials to log in"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_oauth
 msgid "Use external authentication providers (OAuth)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use external pads in Odoo Notes"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Users"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: model:ir.model,name:base_setup.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/base_sparse_field/i18n/base_sparse_field.pot b/addons/base_sparse_field/i18n/base_sparse_field.pot
index f13fe8be1d9..e591c584b90 100644
--- a/addons/base_sparse_field/i18n/base_sparse_field.pot
+++ b/addons/base_sparse_field/i18n/base_sparse_field.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 0436b0d1657..36a705b0334 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,42 +26,42 @@ msgid "Contact"
 msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/models/res_partner.py:126
+#: model:ir.ui.view,arch_db:base_vat.res_config_settings_view_form
+msgid "If this checkbox is ticked, you will not be able to save a contact if its VAT number cannot be verified by the European VIES service."
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/models/res_partner.py:134
 #, python-format
 msgid "The VAT number [%s] for partner [%s] does not seem to be valid. \n"
 "Note: the expected format is %s"
 msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/models/res_partner.py:125
+#: code:addons/base_vat/models/res_partner.py:133
 #, python-format
 msgid "The VAT number [%s] for partner [%s] either failed the VIES VAT validation check or did not respect the expected format %s."
 msgstr ""
 
 #. module: base_vat
-#: model:ir.ui.view,arch_db:base_vat.account_config_settings_view_form_inherit_base_vat
-msgid "Use VIES service to check VAT # of your customers rather than a simple format validation."
-msgstr ""
-
-#. module: base_vat
-#: model:ir.ui.view,arch_db:base_vat.company_form_vat
 #: model:ir.ui.view,arch_db:base_vat.view_partner_form
+#: model:ir.ui.view,arch_db:base_vat.view_partner_short_form
 msgid "VAT"
 msgstr ""
 
 #. module: base_vat
-#: model:ir.ui.view,arch_db:base_vat.account_config_settings_view_form_inherit_base_vat
-msgid "VAT # check with European VIES service"
+#: model:ir.model.fields,field_description:base_vat.field_res_company_vat_check_vies
+#: model:ir.model.fields,field_description:base_vat.field_res_config_settings_vat_check_vies
+msgid "Verify VAT Numbers"
 msgstr ""
 
 #. module: base_vat
-#: model:ir.model.fields,field_description:base_vat.field_account_config_settings_vat_check_vies
-#: model:ir.model.fields,field_description:base_vat.field_res_company_vat_check_vies
-msgid "VIES VAT Check"
+#: model:ir.ui.view,arch_db:base_vat.res_config_settings_view_form
+msgid "Verify VAT numbers using the European VIES service"
 msgstr ""
 
 #. module: base_vat
-#: model:ir.model,name:base_vat.model_account_config_settings
-msgid "account.config.settings"
+#: model:ir.model,name:base_vat.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot b/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
new file mode 100644
index 00000000000..6b8d402d210
--- /dev/null
+++ b/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* base_vat_autocomplete
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_vat_autocomplete
+#: model:ir.model,name:base_vat_autocomplete.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: base_vat_autocomplete
+#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_form
+#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_short_form
+msgid "VAT"
+msgstr ""
+
+#. module: base_vat_autocomplete
+#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_form
+#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_short_form
+msgid "e.g. BE0477472701"
+msgstr ""
+
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 16ef54cf24b..ecf96b0535a 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 
 #. module: board
 #. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:332
+#: code:addons/board/static/src/js/dashboard.js:335
 #, python-format
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -95,7 +95,7 @@ msgstr ""
 
 #. module: board
 #. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:86
+#: code:addons/board/static/src/js/dashboard.js:85
 #, python-format
 msgid "Edit Layout"
 msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
 
 #. module: board
 #. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:49
+#: code:addons/board/static/src/js/dashboard.js:48
 #: model:ir.actions.act_window,name:board.open_board_my_dash_action
 #: model:ir.ui.menu,name:board.menu_board_my_dash
 #: model:ir.ui.view,arch_db:board.board_my_dash_view
diff --git a/addons/bus/i18n/bus.pot b/addons/bus/i18n/bus.pot
index 58502d70a1f..3d7ac159cc1 100644
--- a/addons/bus/i18n/bus.pot
+++ b/addons/bus/i18n/bus.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 616ee3ffe54..7f005d3238e 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -293,26 +293,26 @@ msgid "${object.event_id.name}: Date updated"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:671
+#: code:addons/calendar/models/calendar.py:695
 #, python-format
 msgid "%s at %s To\n"
 " %s at %s (%s)"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:669
+#: code:addons/calendar/models/calendar.py:693
 #, python-format
 msgid "%s at (%s To %s) (%s)"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:206
+#: code:addons/calendar/models/calendar.py:208
 #, python-format
 msgid "%s has accepted invitation"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:214
+#: code:addons/calendar/models/calendar.py:216
 #, python-format
 msgid "%s has declined invitation"
 msgstr ""
@@ -341,12 +341,27 @@ msgid "Active"
 msgstr ""
 
 #. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model,name:calendar.model_mail_activity
+msgid "Activity"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model,name:calendar.model_mail_activity_type
+msgid "Activity Type"
+msgstr ""
+
+#. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_allday
 msgid "All Day"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:666
+#: code:addons/calendar/models/calendar.py:690
 #, python-format
 msgid "AllDay , %s"
 msgstr ""
@@ -385,7 +400,7 @@ msgid "Availability"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:1508
+#: code:addons/calendar/models/calendar.py:1569
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #, python-format
@@ -417,6 +432,11 @@ msgid "Calendar Invitation"
 msgstr ""
 
 #. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_mail_activity_calendar_event_id
+msgid "Calendar Meeting"
+msgstr ""
+
+#. module: calendar
 #: model:ir.actions.server,name:calendar.ir_cron_scheduler_alarm_ir_actions_server
 #: model:ir.cron,cron_name:calendar.ir_cron_scheduler_alarm
 #: model:ir.cron,name:calendar.ir_cron_scheduler_alarm
@@ -529,6 +549,27 @@ msgid "Display Name"
 msgstr ""
 
 #. module: calendar
+#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
+#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup
+msgid "Document"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_res_id
+msgid "Document ID"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_res_model_id
+msgid "Document Model"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_res_model
+msgid "Document Model Name"
+msgstr ""
+
+#. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_duration
 #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
 msgid "Duration"
@@ -578,13 +619,13 @@ msgid "Ending at"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:854
+#: code:addons/calendar/models/calendar.py:884
 #, python-format
 msgid "Ending date cannot be set before starting date."
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:852
+#: code:addons/calendar/models/calendar.py:882
 #, python-format
 msgid "Ending datetime cannot be set before starting datetime."
 msgstr ""
@@ -605,7 +646,7 @@ msgid "Event alarm"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:1097
+#: code:addons/calendar/models/calendar.py:1127
 #, python-format
 msgid "Event recurrence interval cannot be negative."
 msgstr ""
@@ -616,6 +657,12 @@ msgid "Everyone"
 msgstr ""
 
 #. module: calendar
+#: code:addons/calendar/models/mail_activity.py:38
+#, python-format
+msgid "Feedback: "
+msgstr ""
+
+#. module: calendar
 #: selection:calendar.event,byday:0
 msgid "Fifth"
 msgstr ""
@@ -626,7 +673,7 @@ msgid "First"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:894
+#: code:addons/calendar/models/calendar.py:924
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -663,7 +710,7 @@ msgid "Group By"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:1453
+#: code:addons/calendar/models/calendar.py:1514
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -935,7 +982,7 @@ msgid "Partner-related data of the user"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:1110
+#: code:addons/calendar/models/calendar.py:1140
 #, python-format
 msgid "Please select a proper day of the month."
 msgstr ""
@@ -1034,6 +1081,11 @@ msgid "Saturday"
 msgstr ""
 
 #. module: calendar
+#: model:ir.ui.view,arch_db:calendar.mail_activity_view_form_popup
+msgid "Schedule a meeting"
+msgstr ""
+
+#. module: calendar
 #: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
 msgid "Search Meetings"
 msgstr ""
@@ -1144,9 +1196,16 @@ msgid "The"
 msgstr ""
 
 #. module: calendar
+#. openerp-web
+#: code:addons/calendar/static/src/js/mail_activity.js:42
+#, python-format
+msgid "The activity is linked to a meeting. Deleting it will remove the meeting as well. Do you want to proceed ?"
+msgstr ""
+
+#. module: calendar
 #: model:ir.actions.act_window,help:calendar.action_calendar_event
 msgid "The calendar is shared between employees and fully integrated with\n"
-"            other applications such as the employee holidays or the business\n"
+"            other applications such as the employee leaves or the business\n"
 "            opportunities."
 msgstr ""
 
@@ -1248,7 +1307,7 @@ msgid "Yes I'm going."
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:137
+#: code:addons/calendar/models/calendar.py:138
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1269,7 +1328,7 @@ msgid "e.g. Business Lunch"
 msgstr ""
 
 #. module: calendar
-#: code:addons/calendar/models/calendar.py:1095
+#: code:addons/calendar/models/calendar.py:1125
 #, python-format
 msgid "interval cannot be negative."
 msgstr ""
diff --git a/addons/contacts/i18n/contacts.pot b/addons/contacts/i18n/contacts.pot
index 9763d447c16..6224fc29e06 100644
--- a/addons/contacts/i18n/contacts.pot
+++ b/addons/contacts/i18n/contacts.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,20 +16,72 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_action_res_partner_bank_form
+#: model:ir.ui.menu,name:contacts.menu_config_bank_accounts
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_action_res_bank_form
+msgid "Banks"
+msgstr ""
+
+#. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
 msgid "Click to add a contact in your contacts directory."
 msgstr ""
 
 #. module: contacts
+#: model:ir.ui.menu,name:contacts.res_partner_menu_config
+msgid "Configuration"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_partner_category_form
+msgid "Contact Tags"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: contacts
 #: model:ir.actions.act_window,name:contacts.action_contacts
 #: model:ir.ui.menu,name:contacts.menu_contacts
+#: model:ir.ui.menu,name:contacts.res_partner_menu_contacts
 msgid "Contacts"
 msgstr ""
 
 #. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_country_group
+msgid "Country Group"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_country_state_partner
+msgid "Fed. States"
+msgstr ""
+
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.menu_localisation
+msgid "Localization"
+msgstr ""
+
+#. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
 msgid "Odoo helps you easily track all activities related to\n"
 "            a customer: discussions, history of business opportunities,\n"
 "            documents, etc."
 msgstr ""
 
+#. module: contacts
+#: model:ir.ui.menu,name:contacts.res_partner_industry_menu
+msgid "Sectors of Activity"
+msgstr ""
+
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 52c532aead2..c4f102a5fcc 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -159,14 +159,14 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:34
+#: code:addons/crm/static/src/js/tour.js:29
 #, python-format
 msgid "<b>Drag &amp; drop opportunities</b> between columns as you progress in your sales cycle."
 msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:79
+#: code:addons/crm/static/src/js/tour.js:74
 #, python-format
 msgid "<b>Invite coworkers</b> via email.<br/><i>Enter one email per line.</i>"
 msgstr ""
@@ -188,14 +188,14 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:65
+#: code:addons/crm/static/src/js/tour.js:60
 #, python-format
 msgid "<p><b>Send messages</b> to your prospect and get replies automatically attached to this opportunity.</p><p class=\"mb0\">Type <i>'@'</i> to mention people - it's like cc-ing on emails.</p>"
 msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:50
+#: code:addons/crm/static/src/js/tour.js:45
 #, python-format
 msgid "<p>You will be able to customize your followup activities. Examples:</p><ol><li>introductory email</li><li>call 10 days after</li><li>second call 3 days after, ...</li></ol><p class='mb0'><i>Select a standard activity for now on.</i></p>"
 msgstr ""
@@ -677,6 +677,11 @@ msgid "Activities Done Target"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+msgid "Activities Todo"
+msgstr ""
+
+#. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_kanban_state
 msgid "Activity State"
 msgstr ""
@@ -687,12 +692,17 @@ msgid "Activity Type"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.crm_team_menu_config_activity_types
+msgid "Activity Types"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Add Features"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Add a qualification step before creating an opportunity"
 msgstr ""
 
@@ -704,7 +714,7 @@ msgstr ""
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_alias_id
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Alias"
 msgstr ""
 
@@ -714,11 +724,6 @@ msgid "Alias Contact Security"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_alias_domain
-msgid "Alias Domain"
-msgstr ""
-
-#. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_alias_name
 msgid "Alias Name"
 msgstr ""
@@ -741,13 +746,13 @@ msgid "Aligning your sales organization on a systematic\n"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:310
+#: code:addons/crm/wizard/base_partner_merge.py:274
 #, python-format
 msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:856
+#: code:addons/crm/models/crm_lead.py:905
 #, python-format
 msgid "All email incoming to %s will automatically\n"
 "                    create new opportunity. Update your business card, phone book, social media,...\n"
@@ -826,11 +831,6 @@ msgid "Assigned"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_module_crm_voip
-msgid "Asterisk (VoIP)"
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "At the end of the deployment process, your expectations should be reached.\n"
 "                        <br/>\n"
@@ -848,11 +848,6 @@ msgid "Automatic Merge Wizard"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_generate_sales_team_alias
-msgid "Automatically generate an email alias at the sales channel creation"
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
 msgid "Avg. of Probability"
 msgstr ""
@@ -883,6 +878,12 @@ msgid "Better visibility on team activities"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/models/crm_lead.py:381
+#, python-format
+msgid "Boom! Team record for the past 30 days."
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Boost your online sales with sleek product pages."
 msgstr ""
@@ -893,7 +894,8 @@ msgid "Bounce"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.menu,name:crm.crm_menu_root
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "CRM"
 msgstr ""
 
@@ -974,20 +976,20 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:23
+#: code:addons/crm/static/src/js/tour.js:18
 #, python-format
 msgid "Click here to <b>create your first opportunity</b> and add it to your pipeline."
 msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:58
+#: code:addons/crm/static/src/js/tour.js:53
 #, python-format
 msgid "Click on an opportunity to zoom to it."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:859
+#: code:addons/crm/models/crm_lead.py:908
 #, python-format
 msgid "Click to add a new opportunity"
 msgstr ""
@@ -1072,13 +1074,23 @@ msgid "Competition Matrix comparing prices"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.crm_menu_config
+msgid "Configuration"
+msgstr ""
+
+#. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:75
+#: code:addons/crm/static/src/js/tour.js:70
 #, python-format
 msgid "Configuration options are available in the Settings app."
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_config_settings_action
+msgid "Configure CRM"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Configure the stages of your sales pipeline"
 msgstr ""
@@ -1120,6 +1132,7 @@ msgstr ""
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_partner_ids
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Contacts"
 msgstr ""
 
@@ -1164,7 +1177,7 @@ msgid "Convert to opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:1031
+#: code:addons/crm/models/crm_lead.py:1080
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
@@ -1195,6 +1208,11 @@ msgid "Create"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "Create & Edit"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Create Customers"
 msgstr ""
@@ -1222,8 +1240,8 @@ msgid "Create a Proof of Concept with consultants"
 msgstr ""
 
 #. module: crm
+#: selection:crm.lead.convert2task,action:0
 #: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2projectissue.wizard,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Create a new customer"
 msgstr ""
@@ -1315,11 +1333,6 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.action_mark_as_lost
-msgid "Crm: Mark Leads as lost"
-msgstr ""
-
-#. module: crm
 #: model:ir.actions.server,name:crm.action_your_pipeline
 msgid "Crm: My Pipeline"
 msgstr ""
@@ -1340,10 +1353,10 @@ msgid "Current Line"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:1075
+#: code:addons/crm/models/crm_lead.py:1124
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_partner_id
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_partner_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_partner_id
+#: model:ir.model.fields,field_description:crm.field_crm_lead_convert2task_partner_id
 #: model:ir.model.fields,field_description:crm.field_crm_lead_partner_id
 #: model:ir.model.fields,field_description:crm.field_crm_partner_binding_partner_id
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
@@ -1356,7 +1369,12 @@ msgid "Customer"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:1077
+#: model:ir.model.fields,field_description:crm.field_res_config_settings_module_web_clearbit
+msgid "Customer Autocomplete"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:1126
 #, python-format
 msgid "Customer Email"
 msgstr ""
@@ -1367,6 +1385,7 @@ msgid "Customer Name"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.res_partner_menu_crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 #: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
 #: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner_mass
@@ -1410,7 +1429,7 @@ msgid "Deduplicate the other Contacts"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_alias_prefix
+#: model:ir.model.fields,field_description:crm.field_res_config_settings_crm_alias_prefix
 msgid "Default Alias Name for Leads"
 msgstr ""
 
@@ -1495,9 +1514,9 @@ msgid "Display your brochures, product sheets, showcases etc."
 msgstr ""
 
 #. module: crm
+#: selection:crm.lead.convert2task,action:0
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2projectissue.wizard,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
@@ -1552,7 +1571,7 @@ msgid "Email address of the contact"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Emails received to that address generate new leads not assigned to any sales channel yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific sales channels. To do so, set an email alias on the sales channel."
 msgstr ""
 
@@ -1654,6 +1673,11 @@ msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
+#: model:ir.filters,name:crm.filter_opportunity_expected_revenue
+msgid "Expected Revenue by Team"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
 msgid "Expected Revenues"
 msgstr ""
@@ -1684,11 +1708,6 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_fax
-msgid "Fax"
-msgstr ""
-
-#. module: crm
 #. openerp-web
 #: code:addons/crm/static/src/js/web_planner_crm.js:31
 #, python-format
@@ -1711,7 +1730,7 @@ msgid "For every deal, review the next action, the expected closing, the pain po
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:299
+#: code:addons/crm/wizard/base_partner_merge.py:263
 #, python-format
 msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
 msgstr ""
@@ -1728,12 +1747,27 @@ msgid "Force assignation"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:527
+#: code:addons/crm/models/crm_lead.py:577
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+msgid "Future Activities (7 days)"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+msgid "Future Activities (All)"
+msgstr ""
+
+#. module: crm
 #. openerp-web
 #: code:addons/crm/static/src/js/web_planner_crm.js:30
 #, python-format
@@ -1751,9 +1785,9 @@ msgid "Gamification"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Generate unassigned leads from incoming emails. Leads coming from\n"
-"                                that email will be assigned manually."
+"                                    that email will be assigned manually."
 msgstr ""
 
 #. module: crm
@@ -1767,8 +1801,14 @@ msgid "Global CC"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/models/crm_lead.py:379
+#, python-format
+msgid "Go, go, go! Congrats for your first deal."
+msgstr ""
+
+#. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:84
+#: code:addons/crm/static/src/js/tour.js:79
 #, python-format
 msgid "Good job! Your completed the tour of the CRM. You can continue with the <b>implementation guide</b> to help you setup the CRM in your company."
 msgstr ""
@@ -2045,7 +2085,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:833
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:882
 #: selection:crm.activity.report,lead_type:0
 #: selection:crm.lead,type:0
 #: selection:crm.opportunity.report,type:0
@@ -2100,7 +2146,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_form_view_salesteams_lead
 #: model:ir.actions.act_window,name:crm.crm_lead_all_leads
 #: model:ir.model.fields,field_description:crm.field_crm_team_use_leads
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_group_use_lead
+#: model:ir.model.fields,field_description:crm.field_res_config_settings_group_use_lead
 #: model:ir.ui.menu,name:crm.crm_opportunity_report_menu_lead
 #: model:ir.ui.menu,name:crm.menu_crm_leads
 #: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
@@ -2116,12 +2162,6 @@ msgid "Leads & Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:55
-#, python-format
-msgid "Leads / Opportunities"
-msgstr ""
-
-#. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead_salesteam
 #: model:ir.actions.act_window,name:crm.crm_opportunity_report_action_lead
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_graph_lead
@@ -2181,13 +2221,6 @@ msgid "Leads/Opportunities"
 msgstr ""
 
 #. module: crm
-#. openerp-web
-#: code:addons/crm/static/src/js/tour.js:18
-#, python-format
-msgid "Let's have a look at your opportunities pipeline."
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Licences"
 msgstr ""
@@ -2198,8 +2231,8 @@ msgid "Lines"
 msgstr ""
 
 #. module: crm
+#: selection:crm.lead.convert2task,action:0
 #: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2projectissue.wizard,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
@@ -2215,8 +2248,13 @@ msgid "List of possible pain points by segment/profile"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
+msgid "Look up company information (name, logo, etc.)"
+msgstr ""
+
+#. module: crm
 #. openerp-web
-#: code:addons/crm/models/crm_lead.py:1037
+#: code:addons/crm/models/crm_lead.py:1086
 #: code:addons/crm/static/src/js/web_planner_crm.js:33
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -2249,12 +2287,12 @@ msgid "Low"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_default_generate_lead_from_alias
+#: model:ir.model.fields,field_description:crm.field_res_config_settings_generate_lead_from_alias
 msgid "Manual Assignation of Emails"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Manually Assignation of Incoming Emails"
 msgstr ""
 
@@ -2269,6 +2307,11 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.server,name:crm.action_mark_as_lost
+msgid "Mark as lost"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 msgid "Marketing"
 msgstr ""
@@ -2291,7 +2334,7 @@ msgid "Medium"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:875
+#: code:addons/crm/models/crm_lead.py:924
 #, python-format
 msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
 msgstr ""
@@ -2375,31 +2418,31 @@ msgid "Merge with existing opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:478
+#: code:addons/crm/models/crm_lead.py:528
 #, python-format
 msgid "Merged lead"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:509
+#: code:addons/crm/models/crm_lead.py:559
 #, python-format
 msgid "Merged leads"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:509
+#: code:addons/crm/models/crm_lead.py:559
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:478
+#: code:addons/crm/models/crm_lead.py:528
 #, python-format
 msgid "Merged opportunity"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:331
+#: code:addons/crm/wizard/base_partner_merge.py:295
 #, python-format
 msgid "Merged with the following partners:"
 msgstr ""
@@ -2432,7 +2475,6 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "My Activities"
 msgstr ""
 
@@ -2443,12 +2485,11 @@ msgstr ""
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "My Opportunities"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.menu,name:crm.menu_crm_opportunities
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "My Pipeline"
 msgstr ""
 
@@ -2498,7 +2539,6 @@ msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_action_activities
-#: model:ir.ui.menu,name:crm.crm_lead_menu_activities
 #: model:ir.ui.view,arch_db:crm.crm_lead_view_tree_activity
 msgid "Next Activities"
 msgstr ""
@@ -2514,7 +2554,7 @@ msgid "Next activity late"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:1097
+#: code:addons/crm/models/crm_lead.py:1146
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -2590,11 +2630,6 @@ msgid "Odoo is the world's only software to have a full integration of Marketing
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,help:crm.field_sale_config_settings_generate_sales_team_alias
-msgid "Odoo will generate an email alias based on the sales channel name"
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Odoo will help you create polished, professional quotations and contracts in minutes.\n"
 "                        Tell us how you sell and we will tell you what\n"
@@ -2619,7 +2654,7 @@ msgid "Online users: we do it for you!"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:323
+#: code:addons/crm/wizard/base_partner_merge.py:287
 #, python-format
 msgid "Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."
 msgstr ""
@@ -2686,7 +2721,8 @@ msgid "Opportunities that are assigned to me"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:808
+#: code:addons/crm/models/crm_lead.py:427
+#: code:addons/crm/models/crm_lead.py:857
 #: selection:crm.activity.report,lead_type:0
 #: selection:crm.lead,type:0
 #: selection:crm.opportunity.report,type:0
@@ -2755,12 +2791,6 @@ msgid "Options"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Overdue Opportunities"
 msgstr ""
@@ -2841,7 +2871,7 @@ msgid "Phone"
 msgstr ""
 
 #. module: crm
-#: model:ir.model.fields,field_description:crm.field_sale_config_settings_module_crm_phone_validation
+#: model:ir.model.fields,field_description:crm.field_res_config_settings_module_crm_phone_validation
 msgid "Phone Validation"
 msgstr ""
 
@@ -2858,9 +2888,12 @@ msgid "Phone scripts"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_team.py:172
+#: code:addons/crm/models/crm_team.py:165
+#: model:ir.actions.act_window,name:crm.crm_lead_opportunities_tree_view
 #: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities
+#: model:ir.ui.menu,name:crm.crm_menu_pipeline
 #: model:ir.ui.menu,name:crm.crm_opportunity_report_menu
+#: model:ir.ui.menu,name:crm.menu_crm_opportunities
 #: model:ir.ui.view,arch_db:crm.crm_planner
 #, python-format
 msgid "Pipeline"
@@ -2894,7 +2927,7 @@ msgid "Pipeline Analysis gives you an instant access to\n"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_team.py:238
+#: code:addons/crm/models/crm_team.py:231
 #, python-format
 msgid "Pipeline: Expected Revenue"
 msgstr ""
@@ -2910,7 +2943,7 @@ msgid "Planner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:581
+#: code:addons/crm/models/crm_lead.py:631
 #, python-format
 msgid "Please select more than one element (lead or opportunity) from the list view."
 msgstr ""
@@ -3039,7 +3072,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/crm/static/src/js/tour.js:13
 #, python-format
-msgid "Ready to boost your sales? Your <b>sales pipeline</b> can be found here, under this app."
+msgid "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under <b>CRM</b> app."
 msgstr ""
 
 #. module: crm
@@ -3060,7 +3093,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_action
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_action
-#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_action
+#: model:ir.model.fields,field_description:crm.field_crm_lead_convert2task_action
 #: model:ir.model.fields,field_description:crm.field_crm_partner_binding_action
 msgid "Related Customer"
 msgstr ""
@@ -3071,6 +3104,7 @@ msgid "Reminder: Lead ${object.name} from ${object.partner_id != False and objec
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.crm_menu_report
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Reporting"
 msgstr ""
@@ -3112,6 +3146,12 @@ msgid "Sales Channel"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.crm_team_config
+#: model:ir.ui.menu,name:crm.sales_team_menu_report_crm
+msgid "Sales Channels"
+msgstr ""
+
+#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Sales Forecasts (month+1)"
 msgstr ""
@@ -3155,18 +3195,8 @@ msgid "Save filters or add any report to your dashboard with the Favorites menu.
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
-msgid "Schedule &amp; make calls from CRM app"
-msgstr ""
-
-#. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:45
+#: code:addons/crm/static/src/js/tour.js:40
 #, python-format
 msgid "Schedule an activity by clicking here"
 msgstr ""
@@ -3255,6 +3285,11 @@ msgid "Setting up your sales funnel is just the first step. To achieve a\n"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.menu,name:crm.crm_config_settings_menu
+msgid "Settings"
+msgstr ""
+
+#. module: crm
 #: model:res.groups,name:crm.group_use_lead
 msgid "Show Lead Menu"
 msgstr ""
@@ -3581,7 +3616,7 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:40
+#: code:addons/crm/static/src/js/tour.js:35
 #, python-format
 msgid "This opportunity has <b>no activity planned</b>. <i>Click to check them.</i>"
 msgstr ""
@@ -3602,7 +3637,7 @@ msgid "This stage is folded in the kanban view when there are no records in that
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:1003
+#: code:addons/crm/models/crm_lead.py:1052
 #, python-format
 msgid "This target does not exist."
 msgstr ""
@@ -3695,16 +3730,11 @@ msgstr ""
 #: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+#: model:ir.ui.view,arch_db:crm.view_crm_lead_kanban
 msgid "Unread Messages"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_write_date
 msgid "Update Date"
 msgstr ""
@@ -3720,7 +3750,7 @@ msgid "Use"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Use an External Email Server"
 msgstr ""
 
@@ -3764,14 +3794,14 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:88
+#: code:addons/crm/static/src/js/tour.js:83
 #, python-format
 msgid "Use the <b>implementation guide</b> to setup the CRM in your company."
 msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/static/src/js/tour.js:70
+#: code:addons/crm/static/src/js/tour.js:65
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to your sales pipeline</b>."
 msgstr ""
@@ -3817,7 +3847,7 @@ msgid "VIP letter to potential sponsors"
 msgstr ""
 
 #. module: crm
-#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Validate and normalize phone numbers."
 msgstr ""
 
@@ -3911,6 +3941,11 @@ msgid "What are your sales objectives? What challenges are you\n"
 msgstr ""
 
 #. module: crm
+#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
+msgid "When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set."
+msgstr ""
+
+#. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_team_id
 msgid "When sending mails, the default email address is taken from the sales channel."
 msgstr ""
@@ -3942,7 +3977,7 @@ msgstr ""
 
 #. module: crm
 #. openerp-web
-#: code:addons/crm/models/crm_lead.py:1036
+#: code:addons/crm/models/crm_lead.py:1085
 #: code:addons/crm/static/src/js/web_planner_crm.js:15
 #: code:addons/crm/static/src/js/web_planner_crm.js:22
 #: code:addons/crm/static/src/js/web_planner_crm.js:27
@@ -3968,6 +4003,12 @@ msgid "Won in Opportunities Target"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/models/crm_lead.py:383
+#, python-format
+msgid "Yeah! Deal of the last 7 days for the team."
+msgstr ""
+
+#. module: crm
 #. openerp-web
 #: code:addons/crm/static/src/js/web_planner_crm.js:18
 #, python-format
@@ -3975,7 +4016,7 @@ msgid "You are in discussion with the decision maker and HE agreed on his pain p
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:306
+#: code:addons/crm/wizard/base_partner_merge.py:270
 #, python-format
 msgid "You cannot merge a contact with one of his parent."
 msgstr ""
@@ -3989,12 +4030,24 @@ msgid "You don't need to review lost opportunities at every sales meeting, but i
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/base_partner_merge.py:398
+#: code:addons/crm/wizard/base_partner_merge.py:362
 #, python-format
 msgid "You have to specify a filter for your selection"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/models/crm_lead.py:385
+#, python-format
+msgid "You just beat your personal record for the past 30 days."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:387
+#, python-format
+msgid "You just beat your personal record for the past 7 days."
+msgstr ""
+
+#. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
 msgid "You will be able to plan meetings and log activities from\n"
 "                    opportunities, convert them into quotations, attach related\n"
@@ -4037,11 +4090,6 @@ msgid "Your Odoo CRM application is running smoothly."
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,name:crm.crm_lead_opportunities_tree_view
-msgid "Your Pipeline"
-msgstr ""
-
-#. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Your business cards"
 msgstr ""
@@ -4119,7 +4167,7 @@ msgid "e.g. www.odoo.com"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:863
+#: code:addons/crm/models/crm_lead.py:912
 #, python-format
 msgid "opportunities"
 msgstr ""
@@ -4130,8 +4178,13 @@ msgid "or"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_sale_config_settings
-msgid "sale.config.settings"
+#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
+msgid "planned_revenue"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: crm
@@ -4181,7 +4234,7 @@ msgid "to setup your own domain\n"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/models/crm_lead.py:869
+#: code:addons/crm/models/crm_lead.py:918
 #, python-format
 msgid "unknown"
 msgstr ""
diff --git a/addons/crm_livechat/i18n/crm_livechat.pot b/addons/crm_livechat/i18n/crm_livechat.pot
index 17bac96bb8a..896f390a993 100644
--- a/addons/crm_livechat/i18n/crm_livechat.pot
+++ b/addons/crm_livechat/i18n/crm_livechat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_phone_validation/i18n/crm_phone_validation.pot b/addons/crm_phone_validation/i18n/crm_phone_validation.pot
index 1dc79b222fa..ecee08627e9 100644
--- a/addons/crm_phone_validation/i18n/crm_phone_validation.pot
+++ b/addons/crm_phone_validation/i18n/crm_phone_validation.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: crm_phone_validation
-#: model:ir.model.fields,help:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
+#: model:ir.model.fields,help:crm_phone_validation.field_res_config_settings_crm_phone_valid_method
 msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
 msgstr ""
 
@@ -26,17 +26,17 @@ msgid "Contact"
 msgstr ""
 
 #. module: crm_phone_validation
-#: model:ir.model.fields,field_description:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
-msgid "Enforce International Format"
+#: model:ir.model,name:crm_phone_validation.model_crm_lead
+msgid "Lead/Opportunity"
 msgstr ""
 
 #. module: crm_phone_validation
-#: model:ir.model,name:crm_phone_validation.model_crm_lead
-msgid "Lead/Opportunity"
+#: model:ir.model.fields,field_description:crm_phone_validation.field_res_config_settings_crm_phone_valid_method
+msgid "Local Numbers"
 msgstr ""
 
 #. module: crm_phone_validation
-#: model:ir.model,name:crm_phone_validation.model_sale_config_settings
-msgid "sale.config.settings"
+#: model:ir.model,name:crm_phone_validation.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/crm_project/i18n/crm_project.pot b/addons/crm_project/i18n/crm_project.pot
index 435cfc41d1b..7f71a871b51 100644
--- a/addons/crm_project/i18n/crm_project.pot
+++ b/addons/crm_project/i18n/crm_project.pot
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* crm_project_issue
+#	* crm_project
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,76 +15,76 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: crm_project_issue
-#: model:ir.ui.view,arch_db:crm_project_issue.crm_case_form_view_leads_project_issue
+#. module: crm_project
+#: model:ir.ui.view,arch_db:crm_project.crm_lead_view_form
 msgid "<span class=\"o_stat_text\">Convert To</span>\n"
-"                            <span class=\"o_stat_text\">Issue</span>"
+"                            <span class=\"o_stat_text\">Task</span>"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.ui.view,arch_db:crm_project_issue.view_crm_lead2projectissue_wizard
+#. module: crm_project
+#: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.actions.act_window,name:crm_project_issue.convert_lead2projectissue_wizard_action
-#: model:ir.ui.view,arch_db:crm_project_issue.crm_case_form_view_leads_project_issue
-#: model:ir.ui.view,arch_db:crm_project_issue.view_crm_lead2projectissue_wizard
-msgid "Convert to Issue"
+#. module: crm_project
+#: model:ir.actions.act_window,name:crm_project.crm_lead_convert2task_action
+#: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
+#: model:ir.ui.view,arch_db:crm_project.crm_lead_view_form
+msgid "Convert to Task"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.ui.view,arch_db:crm_project_issue.view_crm_lead2projectissue_wizard
-msgid "Create Issue"
+#. module: crm_project
+#: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
+msgid "Create Task"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_create_uid
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_create_date
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_create_date
 msgid "Created on"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_display_name
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_id
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_id
 msgid "ID"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard___last_update
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task___last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_write_uid
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_write_date
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_lead_id
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_lead_id
 msgid "Lead"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_project_id
+#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_project_id
 msgid "Project"
 msgstr ""
 
-#. module: crm_project_issue
-#: model:ir.model,name:crm_project_issue.model_crm_lead2projectissue_wizard
-msgid "crm.lead2projectissue.wizard"
+#. module: crm_project
+#: model:ir.model,name:crm_project.model_crm_lead_convert2task
+msgid "crm.lead.convert2task"
 msgstr ""
 
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index cc2cb074f49..e40c790b602 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index ff6f37f3e52..ea98ec7bcc4 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,47 +16,22 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_rules_count
-msgid "# Analytic Rules"
+#: model:mail.template,report_name:delivery.mail_template_data_delivery_confirmation
+msgid "${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_bom_count
-msgid "# Bill of Material"
+#: model:mail.template,subject:delivery.mail_template_data_delivery_confirmation
+msgid "${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_num_invoiced
-msgid "# Invoiced in Purchase"
+#: model:mail.template,subject:delivery.mail_template_data_delivery_notification
+msgid "${object.subject}"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_num_invoiced
-msgid "# Invoiced in Sale"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_mo_count
-msgid "# Manufacturing Orders"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_count
-msgid "# Product Variants"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_count
-msgid "# Purchases"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sales_count
-msgid "# Sales"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:74
+#: code:addons/delivery/models/delivery_carrier.py:76
 #, python-format
 msgid "<p class=\"oe_view_nocontent\">\n"
 "                    Buy Odoo Enterprise now to get more providers.\n"
@@ -76,37 +51,13 @@ msgstr ""
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.report_delivery_document2
-#: model:ir.ui.view,arch_db:delivery.report_shipping2
-msgid "<strong>Weight</strong>"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_sale
-msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
+msgid "<strong>Tracking Number</strong>"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_purchase
-msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_description
-msgid "A precise description of the Product, used only for internal information purposes."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_product_type
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_type
-msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
-"A consumable product, on the other hand, is a product for which stock is not managed.\n"
-"A service is a non-material product you provide.\n"
-"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_needaction
-msgid "Action Needed"
+#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
+#: model:ir.ui.view,arch_db:delivery.report_shipping2
+msgid "<strong>Weight</strong>"
 msgstr ""
 
 #. module: delivery
@@ -135,98 +86,16 @@ msgid "Archived"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_asset_category_id
-msgid "Asset Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_attribute_value_ids
-msgid "Attributes"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_available
-msgid "Available"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_available_in_pos
-msgid "Available in the Point of Sale"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_produce_delay
-msgid "Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_avg_price
-msgid "Avg. Price in Customer Invoices."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_avg_price
-msgid "Avg. Price in Vendor Bills "
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_avg_price
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_avg_price
-msgid "Avg. Unit Price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_barcode
-msgid "Barcode"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_list_price
-msgid "Base price to compute the customer price. Sometimes called the catalog price."
-msgstr ""
-
-#. module: delivery
 #: selection:delivery.carrier,delivery_type:0
 msgid "Based on Rules"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image
-msgid "Big-sized image"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_bom_ids
-msgid "Bill of Materials"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_bulk
 msgid "Bulk Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_can_be_expensed
-msgid "Can be Expensed"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_ok
-msgid "Can be Purchased"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_rental
-msgid "Can be Rent"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_sale_ok
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_ok
-msgid "Can be Sold"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,help:delivery.field_stock_quant_package_shipping_weight
 msgid "Can be changed during the 'put in pack' to adjust the weight of the shipping."
 msgstr ""
@@ -248,23 +117,8 @@ msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_route_from_categ_ids
-msgid "Category Routes"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_membership
-msgid "Check if the product is eligible for membership."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_to_weight
-msgid "Check if the product should be weighted using the hardware scale integration"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_available_in_pos
-msgid "Check if you want this product to appear in the Point of Sale"
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "Check price"
 msgstr ""
 
 #. module: delivery
@@ -273,11 +127,6 @@ msgid "Click to define a new delivery method."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_color
-msgid "Color Index"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_company_id
 msgid "Company"
 msgstr ""
@@ -293,46 +142,11 @@ msgid "Contact"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_method
-msgid "Control Purchase Bills"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_standard_price
-msgid "Cost"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_cost_method
-msgid "Cost Method"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_standard_price
-msgid "Cost Price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_standard_price
-msgid "Cost of the product template used for standard stock valuation in accounting and used as a base price on purchase orders. Expressed in the default unit of measure of the product."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_cost_method
-msgid "Costing Method"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_country_ids
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_project_id
-msgid "Create a task under this project on sales order validation. This setting must be set for each company."
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_uid
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_uid
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_uid
@@ -347,66 +161,11 @@ msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_currency_id
-msgid "Currency"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_debug_logging
+msgid "Debug logging"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_qty_available
-msgid "Current quantity of products.\n"
-"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n"
-"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n"
-"stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n"
-"Otherwise, this includes goods stored in any Stock Location with 'internal' type."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_delay
-msgid "Customer Lead Time"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_partner_ref
-msgid "Customer Ref"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_taxes_id
-msgid "Customer Taxes"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_membership_date_from
-msgid "Date from which membership becomes active."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_membership_date_to
-msgid "Date until which membership remains active."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_uom_id
-msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_uom_po_id
-msgid "Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_deferred_revenue_category_id
-msgid "Deferred Revenue Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_count
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
 msgstr ""
@@ -417,11 +176,21 @@ msgid "Delivery Carrier"
 msgstr ""
 
 #. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
+msgid "Delivery Cost"
+msgstr ""
+
+#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
 msgid "Delivery Information"
 msgstr ""
 
 #. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_message
+msgid "Delivery Message"
+msgstr ""
+
+#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
 #: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
 #: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
@@ -432,7 +201,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 #: model:ir.ui.menu,name:delivery.sale_menu_action_delivery_carrier_form
-#: model:ir.ui.view,arch_db:delivery.sale_config_settings_view_form_inherit_delivery
+#: model:ir.ui.view,arch_db:delivery.res_config_settings_view_form
 msgid "Delivery Methods"
 msgstr ""
 
@@ -465,38 +234,13 @@ msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_route_ids
-msgid "Depending on the modules installed, this will allow you to define the route of the product: whether it will be bought, manufactured, MTO/MTS,..."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description
-msgid "Description"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_pickingout
-msgid "Description on Delivery Orders"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_picking
-msgid "Description on Picking"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_pickingin
-msgid "Description on Receptions"
+#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_rating_success
+msgid "Delivery Rating Success"
 msgstr ""
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
-msgid "Destination"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_event_ok
-msgid "Determine if a product needs to create automatically an event registration at the confirmation of a sales order line."
+msgid "Destination Availability"
 msgstr ""
 
 #. module: delivery
@@ -529,53 +273,15 @@ msgid "Environment"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
-msgid "Estimated Delivery Price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_event_ok
-msgid "Event Registration"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_event_ticket_ids
-msgid "Event Tickets"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_expected_margin
-msgid "Expected Margin"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_expected_margin_rate
-msgid "Expected Margin (%)"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_expected
-msgid "Expected Sale"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_expected_margin
-msgid "Expected Sale - Normal Cost"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sales_gap
-msgid "Expected Sale - Turn Over"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_expected_margin_rate
-msgid "Expected margin * 100 / Expected Sale"
+#: code:addons/delivery/models/delivery_grid.py:50
+#: code:addons/delivery/models/delivery_grid.py:109
+#, python-format
+msgid "Error: no matching grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_account_expense_id
-msgid "Expense Account"
+#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
+msgid "Estimated Delivery Price"
 msgstr ""
 
 #. module: delivery
@@ -595,43 +301,14 @@ msgid "Fixed Price"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_virtual_available
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_virtual_available
-msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
-"In a context with a single Stock Location, this includes goods stored in this location, or any of its children.\n"
-"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n"
-"Otherwise, this includes goods stored in any Stock Location with 'internal' type."
-msgstr ""
-
-#. module: delivery
-#: model:delivery.carrier,name:delivery.free_delivery_carrier
-#: model:product.product,name:delivery.free_delivery_carrier_product_product
-#: model:product.template,name:delivery.free_delivery_carrier_product_template
+#: model:product.product,name:delivery.product_product_delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
 msgid "Free delivery charges"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_if_more_than
-msgid "Free if Order total is more than"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_over
+msgid "Free if order amount is above"
 msgstr ""
 
 #. module: delivery
@@ -645,22 +322,11 @@ msgid "Get Rate and Create Shipment"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_packaging_ids
-msgid "Gives the different ways to package the same product."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_price_rule_sequence
-msgid "Gives the sequence order when calculating delivery carrier."
-msgstr ""
-
-#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
 msgid "Group By"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_hs_code
 #: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
 #: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
 msgid "HS Code"
@@ -684,53 +350,16 @@ msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_valuation
-msgid "If perpetual valuation is enabled for a product, the system will automatically create journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_free_if_more_than
-msgid "If the order is more expensive than a certain amount, the customer can benefit from a free shipping"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_active
-msgid "If unchecked, it will allow you to hide the product without removing it."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_image
-msgid "Image of the product variant (Big-sized image of product template if false). It is automatically resized as a 1024x1024px image, with aspect ratio preserved."
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_free_over
+msgid "If the order total amount (shipping excluded) is above or equal to this value, the customer benefits from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_image_medium
-msgid "Image of the product variant (Medium-sized image of product template if false)."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_image_small
-msgid "Image of the product variant (Small-sized image of product template if false)."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_account_income_id
-msgid "Income Account"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_incoming_qty
-msgid "Incoming"
+#: code:addons/delivery/models/delivery_carrier.py:125
+#, python-format
+msgid "Info:\n"
+"Total amount of this order is above %.2f, free shipping!\n"
+"(actual cost: %.2f)"
 msgstr ""
 
 #. module: delivery
@@ -744,66 +373,16 @@ msgid "Integration Level"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_categ_id
-msgid "Internal Category"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_default_code
-msgid "Internal Reference"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_barcode
-msgid "International Article Number used for product identification."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_stock_inventory
-msgid "Inventory Location"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_valuation
-msgid "Inventory Valuation"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order_invoice_shipping_on_delivery
 msgid "Invoice Shipping on Delivery"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_invoice_state
-msgid "Invoice State"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_invoice_policy
-msgid "Invoicing Policy"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order_line_is_delivery
 msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_fixed_price
-msgid "Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_choose_delivery_package___last_update
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier___last_update
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule___last_update
@@ -835,8 +414,8 @@ msgid "Length must be positive"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_location_id
-msgid "Location"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_debug_logging
+msgid "Log requests in order to ease debugging"
 msgstr ""
 
 #. module: delivery
@@ -845,35 +424,18 @@ msgid "Manage Package Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_track_service
-msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_produce_delay
-msgid "Manufacturing Lead Time"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_margin
 msgid "Margin"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_date_from
-msgid "Margin Date From"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_date_to
-msgid "Margin Date To"
+#: sql_constraint:delivery.carrier:0
+msgid "Margin cannot be lower than -100%"
 msgstr ""
 
 #. module: delivery
-#: sql_constraint:delivery.carrier:0
-msgid "Margin cannot be lower than -100%"
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
+msgid "Margin on Rate"
 msgstr ""
 
 #. module: delivery
@@ -897,46 +459,6 @@ msgid "Maximum weight shippable in this packaging"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_medium
-msgid "Medium-sized image"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_membership
-msgid "Membership"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_membership_date_to
-msgid "Membership End Date"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_membership_date_from
-msgid "Membership Start Date"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_line_warn_msg
-msgid "Message for Purchase Order Line"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_line_warn_msg
-msgid "Message for Sales Order Line"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_orderpoint_ids
-msgid "Minimum Stock Rules"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_name
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_name
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
@@ -949,30 +471,15 @@ msgid "No carrier integration"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/models/sale_order.py:63
-#, python-format
-msgid "No carrier matching."
-msgstr ""
-
-#. module: delivery
 #: code:addons/delivery/models/sale_order.py:72
 #, python-format
 msgid "No carrier set for this order."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_normal_cost
-msgid "Normal Cost"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_gap
-msgid "Normal Cost - Total Cost"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_needaction_counter
-msgid "Number of Actions"
+#: code:addons/delivery/models/delivery_grid.py:100
+#, python-format
+msgid "No price rule matching this order; delivery cost cannot be computed."
 msgstr ""
 
 #. module: delivery
@@ -981,58 +488,11 @@ msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_alert_time
-msgid "Number of days before an alert should be raised on the lot/serial number."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_life_time
-msgid "Number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_removal_time
-msgid "Number of days before the goods should be removed from the stock. It will be computed on the lot/serial number."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_use_time
-msgid "Number of days before the goods starts deteriorating, without being dangerous yet. It will be computed on the lot/serial number."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_method
-msgid "On ordered quantities: control bills based on ordered quantities.\n"
-"On received quantities: control bills based on received quantity."
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_operator
 msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_invoice_policy
-msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n"
-"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_outgoing_qty
-msgid "Outgoing"
-msgstr ""
-
-#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
 msgid "Package"
 msgstr ""
@@ -1043,8 +503,8 @@ msgid "Package Code"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/models/stock_picking.py:36
-#: code:addons/delivery/models/stock_picking.py:129
+#: code:addons/delivery/models/stock_picking.py:34
+#: code:addons/delivery/models/stock_picking.py:124
 #, python-format
 msgid "Package Details"
 msgstr ""
@@ -1060,7 +520,7 @@ msgid "Packaging"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_pack_operation
+#: model:ir.model,name:delivery.model_stock_move_line
 msgid "Packing Operation"
 msgstr ""
 
@@ -1070,44 +530,24 @@ msgid "Physical Packages"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_pos_categ_id
-msgid "Point of Sale Category"
+#: code:addons/delivery/models/sale_order.py:74
+#, python-format
+msgid "Please use \"Check price\" in order to compute a shipping price for this quotation."
 msgstr ""
 
 #. module: delivery
 #: selection:delivery.price.rule,variable:0
 #: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price
 msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_account_creditor_price_difference
-msgid "Price Difference Account"
-msgstr ""
-
-#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
 #: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_tree
 msgid "Price Rules"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_pricelist_id
-msgid "Pricelist"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_pricelist_item_ids
-msgid "Pricelist Item"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_item_ids
-msgid "Pricelist Items"
-msgstr ""
-
-#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
 msgid "Pricing"
 msgstr ""
@@ -1118,78 +558,11 @@ msgid "Pricing Rules"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_stock_procurement
-msgid "Procurement Location"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_id
-msgid "Product"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_alert_time
-msgid "Product Alert Time"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_attribute_line_ids
-msgid "Product Attributes"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_email_template_id
-msgid "Product Email Template"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_life_time
-msgid "Product Life Time"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids
-msgid "Product Packages"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_removal_time
-msgid "Product Removal Time"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model,name:delivery.model_product_template
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_tmpl_id
 msgid "Product Template"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_type
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_type
-msgid "Product Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_use_time
-msgid "Product Use Time"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_stock_production
-msgid "Production Location"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_ids
-msgid "Products"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_project_id
-msgid "Project"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -1197,26 +570,6 @@ msgid "Provider"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_purchase
-msgid "Purchase Description"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_gap
-msgid "Purchase Gap"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_line_warn
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uom_po_id
-msgid "Purchase Unit of Measure"
-msgstr ""
-
-#. module: delivery
 #: selection:delivery.price.rule,variable:0
 #: selection:delivery.price.rule,variable_factor:0
 #: model:ir.model.fields,field_description:delivery.field_sale_order_line_product_qty
@@ -1224,98 +577,27 @@ msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_qty_available
-msgid "Quantity On Hand"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_incoming_qty
-msgid "Quantity of products that are planned to arrive.\n"
-"In a context with a single Stock Location, this includes goods arriving to this Location, or any of its children.\n"
-"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n"
-"Otherwise, this includes goods arriving to any Stock Location with 'internal' type."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_outgoing_qty
-msgid "Quantity of products that are planned to leave.\n"
-"In a context with a single Stock Location, this includes goods leaving this Location, or any of its children.\n"
-"In a context with a single Warehouse, this includes goods leaving the Stock Location of this Warehouse, or any of its children.\n"
-"Otherwise, this includes goods leaving any Stock Location with 'internal' type."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_expense_policy
-msgid "Re-Invoice Expenses"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reception_count
-msgid "Receipt"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_code
-msgid "Reference"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_max_qty
-msgid "Reordering Max Qty"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_min_qty
-msgid "Reordering Min Qty"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_nbr_reordering_rules
-msgid "Reordering Rules"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model,name:delivery.model_stock_return_picking
 msgid "Return Picking"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_route_ids
-msgid "Routes"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_base_price
 msgid "Sale Base Price"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_sale
-msgid "Sale Description"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_list_price
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_lst_price
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_price
-#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
-#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_tree
 msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sales_gap
-msgid "Sales Gap"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order_line
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_line_warn
 msgid "Sales Order Line"
 msgstr ""
 
@@ -1325,20 +607,8 @@ msgid "Save"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_categ_id
-msgid "Select category for the current product"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:296
-#, python-format
-msgid "Selected product in the delivery method doesn't fulfill any of the delivery carrier(s) criteria."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_line_warn
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_line_warn
-msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
+#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
+msgid "Send Confirmation Email"
 msgstr ""
 
 #. module: delivery
@@ -1363,7 +633,7 @@ msgid "Set to True if your credentials are certified for production."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/models/stock_picking.py:150
+#: code:addons/delivery/models/stock_picking.py:168
 #, python-format
 msgid "Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: %.2f %s"
 msgstr ""
@@ -1380,30 +650,6 @@ msgid "Shipping Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_small
-msgid "Small-sized image"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_product_sale_ok
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_ok
-msgid "Specify if the product can be selected in a sales order line."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_can_be_expensed
-msgid "Specify whether the product can be selected in an HR expense."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_cost_method
-msgid "Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).\n"
-"                Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
-"                Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_hs_code
 #: model:ir.model.fields,help:delivery.field_product_product_hs_code
 #: model:ir.model.fields,help:delivery.field_product_template_hs_code
 msgid "Standardized code for international shipping and goods declaration"
@@ -1415,99 +661,16 @@ msgid "States"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_stock_account_input
-msgid "Stock Input Account"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_stock_move_ids
 msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_stock_account_output
-msgid "Stock Output Account"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_stock_quant_ids
-msgid "Stock Quant"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
 msgid "Stock Quant Package"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_normal_cost
-msgid "Sum of Multiplication of Cost price and quantity of Vendor Bills"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_turnover
-msgid "Sum of Multiplication of Invoice price and quantity of Customer Invoices"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_total_cost
-msgid "Sum of Multiplication of Invoice price and quantity of Vendor Bills "
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_expected
-msgid "Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_num_invoiced
-msgid "Sum of Quantity in Customer Invoices"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_num_invoiced
-msgid "Sum of Quantity in Vendor Bills"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_pricelist_id
-msgid "Technical field. Used for searching on pricelists, not stored in database."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_stock_move_ids
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_stock_quant_ids
-msgid "Technical: used to compute quantities."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_delay
-msgid "The average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/sale_order.py:54
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_lst_price
-msgid "The sale price is managed from the product template. Click on the 'Variant Prices' button to set the extra attribute prices."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_volume
-msgid "The volume in m3."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_weight
-msgid "The weight of the contents in Kg, not including any packaging, etc."
-msgstr ""
-
-#. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
 msgid "These methods allow to automatically compute the delivery price\n"
 "                according to your settings; on the sales order (based on the\n"
@@ -1515,93 +678,17 @@ msgid "These methods allow to automatically compute the delivery price\n"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_account_expense_id
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_account_income_id
-msgid "This account will be used for invoices instead of the default one to value sales for the current product."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_account_creditor_price_difference
-msgid "This account will be used to value price difference between purchase price and cost price."
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
 #: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_image_variant
-msgid "This field holds the image used as image for the product variant, limited to 1024x1024px."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_price_extra
-msgid "This is the sum of the extra price of all attributes"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,help:delivery.field_delivery_carrier_margin
 msgid "This percentage will be added to the shipping price."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_production
-msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_procurement
-msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_inventory
-msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_pos_categ_id
-msgid "Those categories are used to group similar products for point of sale."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_to_weight
-msgid "To Weigh With Scale"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_total_cost
-msgid "Total Cost"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_total_margin
-msgid "Total Margin"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_total_margin_rate
-msgid "Total Margin Rate(%)"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_total_margin_rate
-msgid "Total margin * 100 / Turnover"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_track_service
-msgid "Track Service"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_tracking
 #: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
 msgid "Tracking"
 msgstr ""
@@ -1612,22 +699,16 @@ msgid "Tracking Reference"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Transfer"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_turnover
-msgid "Turnover"
+#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_url
+msgid "Tracking URL"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_total_margin
-msgid "Turnover - Standard price"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Transfer"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uom_id
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_uom_id
 msgid "Unit of Measure"
 msgstr ""
@@ -1643,21 +724,6 @@ msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_valuation
-msgid "Valuation"
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable
 msgid "Variable"
 msgstr ""
@@ -1668,47 +734,15 @@ msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_variant
-msgid "Variant Image"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_extra
-msgid "Variant Price Extra"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_supplier_taxes_id
-msgid "Vendor Taxes"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_seller_ids
-msgid "Vendors"
-msgstr ""
-
-#. module: delivery
 #: selection:delivery.price.rule,variable:0
 #: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_volume
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_volume
 msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_warehouse_id
-msgid "Warehouse"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_warranty
-msgid "Warranty"
-msgstr ""
-
-#. module: delivery
 #: selection:delivery.price.rule,variable:0
 #: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_weight
 #: model:ir.model.fields,field_description:delivery.field_stock_move_weight
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_weight
 #: model:ir.model.fields,field_description:delivery.field_stock_quant_package_weight
@@ -1733,21 +767,6 @@ msgid "Weight for Shipping"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_account_input
-msgid "When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless there is a specific valuation account set on the source location. When not set on the product, the one from the product category is used."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_account_output
-msgid "When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_email_template_id
-msgid "When validating an invoice, an email will be sent to the customer based on this template. The customer will receive an email for each product linked to an email template."
-msgstr ""
-
-#. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_product_packaging_width
 msgid "Width"
 msgstr ""
@@ -1758,14 +777,20 @@ msgid "Width must be positive"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/models/stock_picking.py:190
+#: code:addons/delivery/models/stock_picking.py:206
 #, python-format
 msgid "You are shipping different packaging types in the same shipment.\n"
 "Packaging Types: %s"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/models/stock_picking.py:166
+#: code:addons/delivery/models/sale_order.py:70
+#, python-format
+msgid "You can add delivery price only on unconfirmed quotations."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:182
 #, python-format
 msgid "Your delivery method has no redirect on courier provider's website to track this order."
 msgstr ""
@@ -1781,6 +806,16 @@ msgid "Zip To"
 msgstr ""
 
 #. module: delivery
+#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c703e4465617220247b6f626a6563742e706172746e65725f69642e6e616d657d2c3c2f703e0a3c703e57652061726520676c616420746f20696e666f726d20796f75207468617420796f7572206f7264657220686173206265656e20736869707065642e3c2f703e0a3c703e0a256966206f626a6563742e636172726965725f747261636b696e675f7265663a0a2020596f757220747261636b696e67207265666572656e63653a0a2020256966206f626a6563742e636172726965725f747261636b696e675f75726c3a0a202020203c6120687265663d22247b6f626a6563742e636172726965725f747261636b696e675f75726c7d22207461726765743d225f626c616e6b223e247b6f626a6563742e636172726965725f747261636b696e675f7265667d3c2f613e2e0a202025656c73653a0a20202020247b6f626a6563742e636172726965725f747261636b696e675f7265667d2e0a202025656e6469660a25656e6469660a3c2f703e0a3c703e46696e6420796f75722064656c6976657279206f7264657220617474616368656420666f72206d6f72652064657461696c732e3c2f703e0a3c703e5468616e6b20796f752c3c2f703e0a2020202020203c2f646174613e"
+msgstr ""
+
+#. module: delivery
+#: model:mail.template,body_html:delivery.mail_template_data_delivery_notification
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c7461626c6520626f726465723d2230222077696474683d2231303025222063656c6c70616464696e673d223022206267636f6c6f723d222365646564656422207374796c653d22666f6e742d66616d696c793a417269616c2c48656c7665746963612c73616e732d73657269663b2070616464696e673a20323070783b206261636b67726f756e642d636f6c6f723a2023656465646564222073756d6d6172793d226f5f6d61696c5f6e6f74696669636174696f6e223e0a202020202020202020203c74626f64793e0a2020202020202020202020203c212d2d20484541444552202d2d3e0a2020202020202020202020203c74723e0a20202020202020202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a202020202020202020202020202020203c7461626c652077696474683d223635302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222338373541374222207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283133352c39302c313233293b2070616464696e673a20323070783b223e0a2020202020202020202020202020202020203c74723e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c65223e0a202020202020202020202020202020202020202020203c7370616e207374796c653d22666f6e742d73697a653a323070783b20636f6c6f723a77686974653b20666f6e742d7765696768743a20626f6c643b223e247b6f626a6563742e7265636f72645f6e616d657d3c2f7370616e3e0a20202020202020202020202020202020202020203c2f74643e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d227269676874223e0a202020202020202020202020202020202020202020203c696d67207372633d222f6c6f676f2e706e6722207374796c653d2270616464696e673a203070783b206d617267696e3a203070783b206865696768743a206175746f3b2077696474683a20383070783b2220616c743d22247b757365722e636f6d70616e795f69642e6e616d657d222f3e0a20202020202020202020202020202020202020203c2f74643e0a2020202020202020202020202020202020203c2f74723e0a202020202020202020202020202020203c2f7461626c653e0a20202020202020202020202020203c2f74643e0a2020202020202020202020203c2f74723e0a2020202020202020202020203c212d2d20434f4e54454e54202d2d3e0a2020202020202020202020203c74723e0a20202020202020202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a202020202020202020202020202020203c7461626c652077696474683d223635302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222366666666666622207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283235352c203235352c20323535293b2070616464696e673a20323070783b223e0a2020202020202020202020202020202020203c74626f64793e0a20202020202020202020202020202020202020203c74642076616c69676e3d22746f7022207374796c653d22636f6c6f723a20233535353b20666f6e742d73697a653a20313470783b223e247b6f626a6563742e626f6479207c20736166657d3c2f74643e0a2020202020202020202020202020202020203c2f74626f64793e0a202020202020202020202020202020203c2f7461626c653e0a20202020202020202020202020203c2f74643e0a2020202020202020202020203c2f74723e0a2020202020202020202020203c212d2d20464f4f544552202d2d3e0a2020202020202020202020203c74723e0a20202020202020202020202020203c746420616c69676e3d2263656e74657222207374796c653d226d696e2d77696474683a2035393070783b223e0a202020202020202020202020202020203c7461626c652077696474683d223635302220626f726465723d2230222063656c6c70616464696e673d223022206267636f6c6f723d222338373541374222207374796c653d226d696e2d77696474683a2035393070783b206261636b67726f756e642d636f6c6f723a20726762283133352c39302c313233293b2070616464696e673a20323070783b223e0a2020202020202020202020202020202020203c74723e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d226c65667422207374796c653d22636f6c6f723a20236666663b2070616464696e672d746f703a20313070783b2070616464696e672d626f74746f6d3a20313070783b20666f6e742d73697a653a20313270783b223e247b757365722e636f6d70616e795f69642e6e616d657d3c62722f3e247b757365722e636f6d70616e795f69642e70686f6e65206f722027277d3c2f74643e0a20202020202020202020202020202020202020203c74642076616c69676e3d226d6964646c652220616c69676e3d22726967687422207374796c653d22636f6c6f723a20236666663b2070616464696e672d746f703a20313070783b2070616464696e672d626f74746f6d3a20313070783b20666f6e742d73697a653a20313270783b223e0a202020202020202020202020202020202020202020202520696620757365722e636f6d70616e795f69642e656d61696c3a0a202020202020202020202020202020202020202020203c6120687265663d226d61696c746f3a247b757365722e636f6d70616e795f69642e656d61696c7d22207374796c653d22746578742d6465636f726174696f6e3a6e6f6e653b20636f6c6f723a2077686974653b223e247b757365722e636f6d70616e795f69642e656d61696c7d3c2f613e3c62722f3e0a202020202020202020202020202020202020202020202520656e6469660a202020202020202020202020202020202020202020202520696620757365722e636f6d70616e795f69642e776562736974653a0a2020202020202020202020202020202020202020202020203c6120687265663d22247b757365722e636f6d70616e795f69642e776562736974657d22207374796c653d22746578742d6465636f726174696f6e3a6e6f6e653b20636f6c6f723a2077686974653b223e247b757365722e636f6d70616e795f69642e776562736974657d3c2f613e0a202020202020202020202020202020202020202020202520656e6469660a20202020202020202020202020202020202020203c2f74643e0a2020202020202020202020202020202020203c2f74723e0a202020202020202020202020202020203c2f7461626c653e0a20202020202020202020202020203c2f74643e0a2020202020202020202020203c2f74723e0a2020202020202020202020203c74723e0a20202020202020202020202020203c746420616c69676e3d2263656e746572223e506f7765726564206279203c6120687265663d2268747470733a2f2f7777772e6f646f6f2e636f6d223e4f646f6f3c2f613e2e3c2f74643e0a2020202020202020202020203c2f74723e0a202020202020202020203c2f74626f64793e0a20202020202020203c2f7461626c653e0a202020202020"
+msgstr ""
+
+#. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
 msgid "e.g. UPS Express"
 msgstr ""
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index b37c332cf8c..dd41a3976fb 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index bf5d6ec52a1..57913bca3e1 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -385,16 +385,11 @@ msgid "Active"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Add a navigation menu to your event web pages with schedule, tracks, a track proposal form, etc."
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
-msgid "Advertising"
-msgstr ""
-
-#. module: event
 #: selection:event.mail,interval_type:0
 #: selection:event.type.mail,interval_type:0
 msgid "After each registration"
@@ -417,7 +412,7 @@ msgid "Are you sure you want to cancel this event? All the linked attendees will
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Attendance"
 msgstr ""
 
@@ -501,7 +496,7 @@ msgid "Badge Inner Right"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_barcode
+#: model:ir.model.fields,field_description:event.field_res_config_settings_module_event_barcode
 msgid "Barcode"
 msgstr ""
 
@@ -512,7 +507,6 @@ msgid "Before the event"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
 #: model:ir.ui.view,arch_db:event.view_event_confirm
 msgid "Cancel"
 msgstr ""
@@ -550,7 +544,7 @@ msgid "Click to add a new event."
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:272
+#: code:addons/event/models/event.py:264
 #, python-format
 msgid "Closing Date cannot be set before Beginning Date."
 msgstr ""
@@ -567,7 +561,7 @@ msgid "Company"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:480
+#: code:addons/event/models/event.py:475
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -626,17 +620,11 @@ msgid "Contact"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.view_event_form
-msgid "Contact Email"
-msgstr ""
-
-#. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_country_id
 msgid "Country"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_create_uid
 #: model:ir.model.fields,field_description:event.field_event_confirm_create_uid
 #: model:ir.model.fields,field_description:event.field_event_event_create_uid
 #: model:ir.model.fields,field_description:event.field_event_mail_create_uid
@@ -648,7 +636,6 @@ msgid "Created by"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_create_date
 #: model:ir.model.fields,field_description:event.field_event_confirm_create_date
 #: model:ir.model.fields,field_description:event.field_event_event_create_date
 #: model:ir.model.fields,field_description:event.field_event_mail_create_date
@@ -660,13 +647,13 @@ msgid "Created on"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:443
+#: code:addons/event/models/event.py:438
 #, python-format
 msgid "Customer"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:445
+#: code:addons/event/models/event.py:440
 #, python-format
 msgid "Customer Email"
 msgstr ""
@@ -688,7 +675,6 @@ msgid "Description"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_display_name
 #: model:ir.model.fields,field_description:event.field_event_confirm_display_name
 #: model:ir.model.fields,field_description:event.field_event_event_display_name
 #: model:ir.model.fields,field_description:event.field_event_mail_display_name
@@ -746,18 +732,12 @@ msgid "Event"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:332
-#, python-format
-msgid "Event Attendees"
-msgstr ""
-
-#. module: event
 #: model:ir.model,name:event.model_event_mail
 msgid "Event Automated Mailing"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.report.xml,name:event.report_event_event_badge
+#: model:ir.actions.report,name:event.report_event_event_badge
 msgid "Event Badge"
 msgstr ""
 
@@ -849,6 +829,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.event_event_menu_pivot_report
 #: model:ir.ui.menu,name:event.event_main_menu
 #: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:event.res_partner_view_tree
 #: model:ir.ui.view,arch_db:event.view_event_form
 #: model:ir.ui.view,arch_db:event.view_event_search
@@ -920,7 +901,6 @@ msgid "Hour(s)"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_id
 #: model:ir.model.fields,field_description:event.field_event_confirm_id
 #: model:ir.model.fields,field_description:event.field_event_event_id
 #: model:ir.model.fields,field_description:event.field_event_mail_id
@@ -964,7 +944,6 @@ msgid "Kanban Color Index"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings___last_update
 #: model:ir.model.fields,field_description:event.field_event_confirm___last_update
 #: model:ir.model.fields,field_description:event.field_event_event___last_update
 #: model:ir.model.fields,field_description:event.field_event_mail___last_update
@@ -976,7 +955,6 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_write_uid
 #: model:ir.model.fields,field_description:event.field_event_confirm_write_uid
 #: model:ir.model.fields,field_description:event.field_event_event_write_uid
 #: model:ir.model.fields,field_description:event.field_event_mail_registration_write_uid
@@ -988,7 +966,6 @@ msgid "Last Updated by"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_write_date
 #: model:ir.model.fields,field_description:event.field_event_confirm_write_date
 #: model:ir.model.fields,field_description:event.field_event_event_write_date
 #: model:ir.model.fields,field_description:event.field_event_mail_registration_write_date
@@ -1052,7 +1029,7 @@ msgid "Mail Sent on Event"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Manage &amp; publish a schedule with tracks"
 msgstr ""
 
@@ -1077,7 +1054,7 @@ msgid "Maximum Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:261
+#: code:addons/event/models/event.py:253
 #, python-format
 msgid "Maximum attendees number should be greater than minimum attendees number."
 msgstr ""
@@ -1104,13 +1081,13 @@ msgid "My Events"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:266
+#: code:addons/event/models/event.py:258
 #, python-format
 msgid "No more available seats."
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:362
+#: code:addons/event/models/event.py:357
 #, python-format
 msgid "No more seats available for this event."
 msgstr ""
@@ -1151,12 +1128,7 @@ msgid "Online Event"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event
-msgid "Online Events"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_sale
+#: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_sale
 msgid "Online Ticketing"
 msgstr ""
 
@@ -1197,11 +1169,6 @@ msgid "Physical Event"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
-msgid "Publish events on your website"
-msgstr ""
-
-#. module: event
 #: model:ir.model.fields,help:event.field_event_registration_origin
 msgid "Reference of the document that created the registration, for example a sales order"
 msgstr ""
@@ -1212,7 +1179,7 @@ msgid "Register with this event"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:event.view_event_registration_form
 #: model:ir.ui.view,arch_db:event.view_event_registration_graph
 #: model:ir.ui.view,arch_db:event.view_event_registration_pivot
@@ -1221,7 +1188,7 @@ msgid "Registration"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.report.xml,name:event.report_event_registration_badge
+#: model:ir.actions.report,name:event.report_event_registration_badge
 msgid "Registration Badge"
 msgstr ""
 
@@ -1256,7 +1223,7 @@ msgid "Registration Month"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_questions
+#: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_questions
 msgid "Registration Survey"
 msgstr ""
 
@@ -1266,16 +1233,6 @@ msgid "Registration mail"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_type_default_reply_to
-msgid "Reply To"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_reply_to
-msgid "Reply-To Email"
-msgstr ""
-
-#. module: event
 #: model:ir.ui.menu,name:event.menu_reporting_events
 msgid "Reporting"
 msgstr ""
@@ -1292,17 +1249,12 @@ msgid "Responsible"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Scan badges to confirm attendances"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Schedule & Tracks"
 msgstr ""
 
@@ -1317,12 +1269,12 @@ msgid "Scheduled Time"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Sell tickets on your website"
 msgstr ""
 
 #. module: event
-#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
+#: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Sell tickets with sales orders"
 msgstr ""
 
@@ -1385,12 +1337,7 @@ msgid "Subscribe"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,help:event.field_event_event_reply_to
-msgid "The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."
-msgstr ""
-
-#. module: event
-#: code:addons/event/models/event.py:309
+#: code:addons/event/models/event.py:301
 #, python-format
 msgid "There are already attendees who attended this event. Please reset it to draft if you want to cancel this event."
 msgstr ""
@@ -1402,7 +1349,7 @@ msgid "This field contains the template of the mail that will be automatically s
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_sale
+#: model:ir.model.fields,field_description:event.field_res_config_settings_module_event_sale
 msgid "Tickets"
 msgstr ""
 
@@ -1413,7 +1360,7 @@ msgid "Timezone"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_track
+#: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_track
 msgid "Tracks and Agenda"
 msgstr ""
 
@@ -1478,11 +1425,6 @@ msgid "Use Default Hashtag"
 msgstr ""
 
 #. module: event
-#: model:ir.model.fields,field_description:event.field_event_type_use_reply_to
-msgid "Use Default Reply-To"
-msgstr ""
-
-#. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_timezone
 msgid "Use Default Timezone"
 msgstr ""
@@ -1509,13 +1451,13 @@ msgid "Week(s)"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:419
+#: code:addons/event/models/event.py:414
 #, python-format
 msgid "You must wait the event confirmation before doing this action."
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:421
+#: code:addons/event/models/event.py:416
 #, python-format
 msgid "You must wait the event starting day before doing this action."
 msgstr ""
@@ -1536,47 +1478,47 @@ msgid "badge_of_${(object.event_id.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: event
-#: model:ir.model,name:event.model_event_config_settings
-msgid "event.config.settings"
-msgstr ""
-
-#. module: event
 #: model:ir.model,name:event.model_event_confirm
 msgid "event.confirm"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:502
+#: code:addons/event/models/event.py:497
 #, python-format
 msgid "in %d days"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:506
+#: code:addons/event/models/event.py:501
 #, python-format
 msgid "next month"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:504
+#: code:addons/event/models/event.py:499
 #, python-format
 msgid "next week"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:508
+#: code:addons/event/models/event.py:503
 #, python-format
 msgid "on "
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:498
+#: model:ir.model,name:event.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: event
+#: code:addons/event/models/event.py:493
 #, python-format
 msgid "today"
 msgstr ""
 
 #. module: event
-#: code:addons/event/models/event.py:500
+#: code:addons/event/models/event.py:495
 #, python-format
 msgid "tomorrow"
 msgstr ""
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index 92dfcc47006..1eeeb66423b 100644
--- a/addons/event_sale/i18n/event_sale.pot
+++ b/addons/event_sale/i18n/event_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,6 @@ msgid "Apply"
 msgstr ""
 
 #. module: event_sale
-#: model:ir.model.fields,field_description:event_sale.field_product_product_asset_category_id
-msgid "Asset Type"
-msgstr ""
-
-#. module: event_sale
 #: model:ir.model,name:event_sale.model_event_registration
 msgid "Attendee"
 msgstr ""
@@ -70,11 +65,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: event_sale
-#: model:ir.model.fields,field_description:event_sale.field_product_product_deferred_revenue_category_id
-msgid "Deferred Revenue Type"
-msgstr ""
-
-#. module: event_sale
 #: model:ir.model.fields,help:event_sale.field_event_event_ticket_seats_max
 msgid "Define the number of available tickets. If you have too much registrations you will not be able to sell tickets anymore. Set 0 to ignore this rule set as unlimited."
 msgstr ""
@@ -123,9 +113,6 @@ msgid "Event Name"
 msgstr ""
 
 #. module: event_sale
-#: model:ir.model.fields,field_description:event_sale.field_product_product_event_ok
-#: model:ir.model.fields,field_description:event_sale.field_product_template_event_ok
-#: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ok
 #: model:product.product,name:event_sale.product_product_event
 #: model:product.template,name:event_sale.product_product_event_product_template
 msgid "Event Registration"
@@ -156,6 +143,11 @@ msgid "Event's Ticket"
 msgstr ""
 
 #. module: event_sale
+#: model:ir.ui.view,arch_db:event_sale.event_sale_product_template_form
+msgid "Events"
+msgstr ""
+
+#. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_id
 #: model:ir.model.fields,field_description:event_sale.field_registration_editor_id
 #: model:ir.model.fields,field_description:event_sale.field_registration_editor_line_id
@@ -173,6 +165,13 @@ msgid "Is Expired"
 msgstr ""
 
 #. module: event_sale
+#: model:ir.model.fields,field_description:event_sale.field_product_product_event_ok
+#: model:ir.model.fields,field_description:event_sale.field_product_template_event_ok
+#: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ok
+msgid "Is an Event Ticket"
+msgstr ""
+
+#. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket___last_update
 #: model:ir.model.fields,field_description:event_sale.field_registration_editor___last_update
 #: model:ir.model.fields,field_description:event_sale.field_registration_editor_line___last_update
@@ -210,13 +209,13 @@ msgid "Name"
 msgstr ""
 
 #. module: event_sale
-#: code:addons/event_sale/models/event.py:145
+#: code:addons/event_sale/models/event.py:151
 #, python-format
 msgid "No more available seats for the ticket"
 msgstr ""
 
 #. module: event_sale
-#: code:addons/event_sale/models/event.py:172
+#: code:addons/event_sale/models/event.py:178
 #, python-format
 msgid "No more available seats for this ticket"
 msgstr ""
@@ -337,7 +336,7 @@ msgid "Ticket Type"
 msgstr ""
 
 #. module: event_sale
-#: code:addons/event_sale/models/event.py:150
+#: code:addons/event_sale/models/event.py:156
 #, python-format
 msgid "Ticket should belong to either event category or event but not both"
 msgstr ""
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index df192400a81..0e562b642c1 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -123,7 +123,7 @@ msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.view,arch_db:fetchmail.base_config_settings_view_form_inherit_fetchmail
+#: model:ir.ui.view,arch_db:fetchmail.res_config_settings_view_form
 msgid "Incoming Email Servers"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgid "Optional custom server action to trigger for each incoming mail, on the r
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.view,arch_db:fetchmail.base_config_settings_view_form_inherit_fetchmail
+#: model:ir.ui.view,arch_db:fetchmail.res_config_settings_view_form
 msgid "Outgoing Email Servers"
 msgstr ""
 
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 3a25f7ef5ac..53b3de82cca 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:196
+#: code:addons/fleet/models/fleet_vehicle.py:198
 #, python-format
 msgid "%s %s has been added to the fleet!"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle_cost.py:266
+#: code:addons/fleet/models/fleet_vehicle_cost.py:274
 #, python-format
-msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgid "%s contract(s) will expire soon and should be renewed and/or closed!"
 msgstr ""
 
 #. module: fleet
@@ -147,11 +147,6 @@ msgid "Battery Replacement"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.service.type,category:0
-msgid "Both"
-msgstr ""
-
-#. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_11
 msgid "Brake Caliper Replacement"
 msgstr ""
@@ -280,6 +275,11 @@ msgid "Click to create a new service entry."
 msgstr ""
 
 #. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_contract_types_action
+msgid "Click to create a new type of contract."
+msgstr ""
+
+#. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
 msgid "Click to create a new type of service."
 msgstr ""
@@ -295,6 +295,16 @@ msgid "Click to create a vehicle status."
 msgstr ""
 
 #. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+msgid "Close Contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_color
 msgid "Color"
 msgstr ""
@@ -355,6 +365,12 @@ msgid "Contract Start Date"
 msgstr ""
 
 #. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_contract_types_action
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_contract_types_menu
+msgid "Contract Types"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_contract_id
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_contract_id
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_contract_id
@@ -379,6 +395,11 @@ msgid "Contract logs"
 msgstr ""
 
 #. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
+msgid "Contract(s)"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_purchaser_id
 msgid "Contractor"
 msgstr ""
@@ -590,7 +611,7 @@ msgid "Driver of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:214
+#: code:addons/fleet/models/fleet_vehicle.py:216
 #, python-format
 msgid "Driver: from '%s' to '%s'"
 msgstr ""
@@ -663,6 +684,18 @@ msgid "Exhaust Manifold Replacement"
 msgstr ""
 
 #. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+msgid "Expired"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+msgid "Expiring Soon"
+msgstr ""
+
+#. module: fleet
 #: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_root
 msgid "Fleet"
@@ -754,6 +787,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
@@ -837,10 +871,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_id
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_3193
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_3182
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_3068
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_3057
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_id
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3038
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_2903
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_tag_id
 msgid "ID"
 msgstr ""
@@ -872,6 +906,11 @@ msgid "Included Services"
 msgstr ""
 
 #. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Incoming"
+msgstr ""
+
+#. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
 msgid "Indicative Cost"
@@ -926,6 +965,11 @@ msgid "Kilometers"
 msgstr ""
 
 #. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_kanban
+msgid "Km"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_service_type___last_update
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle___last_update
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost___last_update
@@ -986,7 +1030,7 @@ msgid "License Plate"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:221
+#: code:addons/fleet/models/fleet_vehicle.py:223
 #, python-format
 msgid "License Plate: from '%s' to '%s'"
 msgstr ""
@@ -998,6 +1042,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_liter
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_kanban
 msgid "Liter"
 msgstr ""
 
@@ -1095,6 +1140,11 @@ msgid "Model Make"
 msgstr ""
 
 #. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_year
+msgid "Model Year"
+msgstr ""
+
+#. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_action
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
 msgid "Model make of Vehicle"
@@ -1116,7 +1166,7 @@ msgid "Model of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:210
+#: code:addons/fleet/models/fleet_vehicle.py:212
 #, python-format
 msgid "Model: from '%s' to '%s'"
 msgstr ""
@@ -1160,10 +1210,10 @@ msgid "No"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:209
-#: code:addons/fleet/models/fleet_vehicle.py:213
-#: code:addons/fleet/models/fleet_vehicle.py:217
-#: code:addons/fleet/models/fleet_vehicle.py:220
+#: code:addons/fleet/models/fleet_vehicle.py:211
+#: code:addons/fleet/models/fleet_vehicle.py:215
+#: code:addons/fleet/models/fleet_vehicle.py:219
+#: code:addons/fleet/models/fleet_vehicle.py:222
 #, python-format
 msgid "None"
 msgstr ""
@@ -1416,7 +1466,7 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle_cost.py:192
+#: code:addons/fleet/models/fleet_vehicle_cost.py:200
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 #, python-format
@@ -1595,7 +1645,7 @@ msgid "State name already exists"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:218
+#: code:addons/fleet/models/fleet_vehicle.py:220
 #, python-format
 msgid "State: from '%s' to '%s'"
 msgstr ""
@@ -1628,16 +1678,6 @@ msgid "Tax roll"
 msgstr ""
 
 #. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
-msgid "Terminate Contract"
-msgstr ""
-
-#. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "Terminated"
-msgstr ""
-
-#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_notes
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 msgid "Terms and Conditions"
@@ -1678,11 +1718,6 @@ msgid "Tire Service"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr ""
-
-#. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_tree
 msgid "Total"
 msgstr ""
@@ -1758,7 +1793,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer_unit
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer_unit
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer_unit
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3029
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_2892
 msgid "Unit"
 msgstr ""
 
@@ -1768,7 +1803,7 @@ msgstr ""
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_unit
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_services_odometer_unit
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3029
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_2892
 msgid "Unit of the odometer "
 msgstr ""
 
@@ -1794,6 +1829,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_vehicle_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_vehicle_id
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -1968,6 +2004,11 @@ msgid "Year"
 msgstr ""
 
 #. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_year
+msgid "Year of the model"
+msgstr ""
+
+#. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Yearly"
 msgstr ""
@@ -1996,11 +2037,6 @@ msgid "amount"
 msgstr ""
 
 #. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
-msgid "and"
-msgstr ""
-
-#. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
 msgid "e.g. Model S"
@@ -2027,11 +2063,6 @@ msgid "fleet.vehicle.tag"
 msgstr ""
 
 #. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
-msgid "other(s)"
-msgstr ""
-
-#. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
 msgid "show all the costs for this vehicle"
 msgstr ""
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
index 2db8c357f54..97f1ba2d352 100644
--- a/addons/gamification/i18n/gamification.pot
+++ b/addons/gamification/i18n/gamification.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgid "\n"
 "                            </table>                   \n"
 "                        % else: \n"
 "                            <span style=\"color:#A8A8A8;font-size:13px;\">\n"
-"                                The following message contains the current progress for the challenge <strong>${object.name}</strong>.\n"
+"                                Challenge: <strong>${object.name}</strong>.\n"
 "                            </span> \n"
 "                            % for line in challenge_lines:\n"
 "                                <!-- Header + Button table -->\n"
@@ -110,7 +110,7 @@ msgid "\n"
 "                                % if len(line['goals'])>2:\n"
 "                                    <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\">\n"
 "                                        <tr><td style=\"padding:0 30px;\">\n"
-"                                            <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n"
+"                                            <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"table-layout: fixed;\">\n"
 "                                                <tr>\n"
 "                                                    % set top_goals = [line['goals'][1], line['goals'][0], line['goals'][2]]\n"
 "                                                    % for goal in top_goals:\n"
@@ -141,9 +141,10 @@ msgid "\n"
 "                                                                <div style=\"height:${heightA}px;\">\n"
 "                                                                    ${extra_div | safe}   \n"
 "                                                                    <div style=\"height:55px;\">\n"
-"                                                                        <img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"/web/image?model=res.users&amp;field=image_small&amp;id=${goal['user_id']}\" alt=\"\"/>\n"
+"                                                                        % set path = object.env['res.users'].browse(goal['user_id']).partner_id.image_small\n"
+"                                                                        <img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"data:image/jpeg;base64,${path}\" alt=\"${goal['name']}\"/>\n"
 "                                                                    </div> \n"
-"                                                                    <div align=\"center\" style =\"color:${bgColor};\">\n"
+"                                                                    <div align=\"center\" style =\"color:${bgColor};height:20px\">\n"
 "                                                                        ${goal['name']}\n"
 "                                                                    </div \n"
 "                                                                </div>\n"
@@ -174,8 +175,8 @@ msgid "\n"
 "                                            <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\">\n"
 "                                                <thead>\n"
 "                                                    <tr style=\"color:#9A6C8E; font-size:12px;\">\n"
-"                                                        <th style=\"width:10%;text-align:center;\">Rank</th>\n"
-"                                                        <th style=\"width:15%;text-align:left;\">Name</th>\n"
+"                                                        <th style=\"width:15%;text-align:center;\">Rank</th>\n"
+"                                                        <th style=\"width:25%;text-align:left;\">Name</th>\n"
 "                                                        <th style=\"width:30%;text-align:right;\">Performance \n"
 "                                                            % if line['suffix']:\n"
 "                                                                (${line['suffix']})\n"
@@ -196,12 +197,12 @@ msgid "\n"
 "                                                            % set tdColor = 'gray'\n"
 "                                                            % set mutedColor = '#AAAAAA'\n"
 "                                                            % set tdPercentageColor = '#9A6C8E'\n"
-"                                                            <td width=\"10%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\">${goal['rank']+1}\n"
+"                                                            <td width=\"15%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\">${goal['rank']+1}\n"
 "                                                            </td>\n"
-"                                                            <td width=\"15%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\">${goal['name']}</td>\n"
-"                                                            <td width=\"20%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\">${\"%.2f\" % goal['current']}<br/><span style=\"font-size:13px;color:${mutedColor};\">on ${\"%.2f\" % line['target']}</span>\n"
+"                                                            <td width=\"25%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\">${goal['name']}</td>\n"
+"                                                            <td width=\"30%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\">${\"%.2f\" % goal['current']}<br/><span style=\"font-size:13px;color:${mutedColor};\">on ${\"%.2f\" % line['target']}</span>\n"
 "                                                            </td>\n"
-"                                                            <td width=\"20%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong>${goal['completeness'] | int}%</strong></td>\n"
+"                                                            <td width=\"30%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong>${goal['completeness'] | int}%</strong></td>\n"
 "                                                        </tr>\n"
 "                                                        <tr>\n"
 "                                                            <td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td>\n"
@@ -267,73 +268,37 @@ msgid "\n"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:587
+#: code:addons/gamification/models/challenge.py:589
 #, python-format
 msgid "%s has joined the challenge"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:596
+#: code:addons/gamification/models/challenge.py:598
 #, python-format
 msgid "%s has refused the challenge"
 msgstr ""
 
 #. module: gamification
-#: model:mail.template,body_html:gamification.email_template_badge_received
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><div>\n"
-"    <p>Congratulations ${object.user_id.name} !</p>\n"
-"    <p>You just received badge <strong>${object.badge_id.name}</strong> !</p>\n"
-"</div>\n"
-"<div>\n"
-"% if object.badge_id.description\n"
-"<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; margin-top: 5px;\">\n"
-"<tbody><tr>\n"
-"    <td valign=\"center\">\n"
-"        <img src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-"    </td>\n"
-"    <td valign=\"center\">\n"
-"        <cite>${object.badge_id.description}</cite>\n"
-"    </td>\n"
-"</tr></tbody>\n"
-"</table>\n"
-"% endif\n"
-"</div>\n"
-"<div>\n"
-"    <p>\n"
-"% if object.sender_id\n"
-"        This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
-"% endif\n"
-"    </p>\n"
-"    <p>\n"
-"% if object.comment\n"
-"        <em>${object.comment}</em>\n"
-"% endif\n"
-"    </p>\n"
-"</div>\n"
-"</data>"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:653
+#: code:addons/gamification/models/challenge.py:655
 #, python-format
 msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:650
+#: code:addons/gamification/models/challenge.py:652
 #, python-format
 msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this challenge."
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:648
+#: code:addons/gamification/models/challenge.py:650
 #, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:658
+#: code:addons/gamification/models/challenge.py:660
 #, python-format
 msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
 msgstr ""
@@ -360,7 +325,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
-#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3233
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3116
 msgid "A goal is considered as completed when the current value is compared to the value to reach"
 msgstr ""
 
@@ -494,7 +459,7 @@ msgid "Can not grant"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:410
+#: code:addons/gamification/models/goal.py:412
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr ""
@@ -691,7 +656,7 @@ msgid "Defined how will be computed the goals. The result of the operation will
 msgstr ""
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3242
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3115
 msgid "Definition Description"
 msgstr ""
 
@@ -890,7 +855,7 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3244
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3100
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -921,7 +886,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3233
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3116
 msgid "Goal Performance"
 msgstr ""
 
@@ -1256,7 +1221,7 @@ msgid "No one, assigned through challenges"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:665
+#: code:addons/gamification/models/challenge.py:667
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
 msgstr ""
@@ -1587,7 +1552,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3238
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3117
 msgid "Suffix"
 msgstr ""
 
@@ -1612,7 +1577,7 @@ msgid "The action that will be called to update the goal value."
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:644
+#: code:addons/gamification/models/challenge.py:646
 #, python-format
 msgid "The challenge %s is finished."
 msgstr ""
@@ -1620,7 +1585,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
-#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3238
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3117
 msgid "The currency and suffix field"
 msgstr ""
 
@@ -1640,7 +1605,7 @@ msgid "The day a new challenge will be automatically started. If no periodicity
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:91
+#: code:addons/gamification/models/goal.py:93
 #, python-format
 msgid "The domain for the definition %s seems incorrect, please check it.\n"
 "\n"
@@ -1683,7 +1648,7 @@ msgid "The maximum number of time this badge can be sent per month per person."
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:108
+#: code:addons/gamification/models/goal.py:110
 #, python-format
 msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
@@ -1691,7 +1656,7 @@ msgid "The model configuration for the definition %s seems incorrect, please che
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:105
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
@@ -1828,7 +1793,7 @@ msgid "Update"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:445
+#: code:addons/gamification/models/goal.py:447
 #, python-format
 msgid "Update %s"
 msgstr ""
@@ -1934,6 +1899,11 @@ msgid "You have found the hidden badge"
 msgstr ""
 
 #. module: gamification
+#: model:mail.template,body_html:gamification.email_template_badge_received
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c6469763e0a202020203c703e436f6e67726174756c6174696f6e7320247b6f626a6563742e757365725f69642e6e616d657d20213c2f703e0a202020203c703e596f75206a757374207265636569766564206261646765203c7374726f6e673e247b6f626a6563742e62616467655f69642e6e616d657d3c2f7374726f6e673e20213c2f703e0a3c2f6469763e0a3c6469763e0a25206966206f626a6563742e62616467655f69642e6465736372697074696f6e0a3c7461626c652063656c6c73706163696e673d2230222063656c6c70616464696e673d22302220626f726465723d223022207374796c653d2277696474683a2036303070783b206d617267696e2d746f703a203570783b223e0a3c74626f64793e3c74723e0a202020203c74642076616c69676e3d2263656e746572223e0a20202020202020203c696d67207372633d222f7765622f696d6167652f67616d696669636174696f6e2e62616467652f247b6f626a6563742e62616467655f69642e69647d2f696d6167652f383078383022207374796c653d2270616464696e673a203070783b206d617267696e3a203070783b206865696768743a206175746f3b2077696474683a20383070783b2220616c743d22247b757365722e636f6d70616e795f69642e6e616d657d222f3e0a202020203c2f74643e0a202020203c74642076616c69676e3d2263656e746572223e0a20202020202020203c636974653e247b6f626a6563742e62616467655f69642e6465736372697074696f6e7d3c2f636974653e0a202020203c2f74643e0a3c2f74723e3c2f74626f64793e0a3c2f7461626c653e0a2520656e6469660a3c2f6469763e0a3c6469763e0a202020203c703e0a25206966206f626a6563742e73656e6465725f69640a20202020202020205468697320626164676520776173206772616e746564206279203c7374726f6e673e247b6f626a6563742e73656e6465725f69642e6e616d657d3c2f7374726f6e673e2e0a2520656e6469660a202020203c2f703e0a202020203c703e0a25206966206f626a6563742e636f6d6d656e740a20202020202020203c656d3e247b6f626a6563742e636f6d6d656e747d3c2f656d3e0a2520656e6469660a202020203c2f703e0a3c2f6469763e0a3c2f646174613e"
+msgstr ""
+
+#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_form_view
 msgid "badges this month"
 msgstr ""
diff --git a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
index 307df49a14a..3c14e208f9c 100644
--- a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
+++ b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/google_account/i18n/google_account.pot b/addons/google_account/i18n/google_account.pot
index 121bc767449..02cef63be6b 100644
--- a/addons/google_account/i18n/google_account.pot
+++ b/addons/google_account/i18n/google_account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,36 +51,42 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: google_account
-#: code:addons/google_account/models/google_service.py:169
+#: code:addons/google_account/models/google_service.py:171
 #, python-format
 msgid "Method not supported [%s] not in [GET, POST, PUT, PATCH or DELETE]!"
 msgstr ""
 
 #. module: google_account
-#: code:addons/google_account/models/google_service.py:117
+#: code:addons/google_account/models/google_service.py:119
 #, python-format
 msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid"
 msgstr ""
 
 #. module: google_account
-#: code:addons/google_account/models/google_service.py:52
+#: code:addons/google_account/models/google_service.py:55
 #, python-format
 msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"
 msgstr ""
 
 #. module: google_account
-#: code:addons/google_account/models/google_service.py:144
+#: code:addons/google_account/models/google_service.py:149
 #, python-format
 msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired [%s]"
 msgstr ""
 
 #. module: google_account
-#: code:addons/google_account/models/google_service.py:193
+#: code:addons/google_account/models/google_service.py:192
 #, python-format
 msgid "Something went wrong with your request to google"
 msgstr ""
 
 #. module: google_account
+#: code:addons/google_account/models/google_service.py:130
+#, python-format
+msgid "The account for the Google service '%s' is not configured"
+msgstr ""
+
+#. module: google_account
 #: model:ir.model,name:google_account.model_google_service
 msgid "google.service"
 msgstr ""
diff --git a/addons/google_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot
index 8ad93638d72..e5e331e983d 100644
--- a/addons/google_calendar/i18n/google_calendar.pot
+++ b/addons/google_calendar/i18n/google_calendar.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: google_calendar
-#: model:ir.ui.view,arch_db:google_calendar.base_config_settings_view_form_inherit_google_calendar
+#: model:ir.ui.view,arch_db:google_calendar.res_config_settings_view_form
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Tutorial"
 msgstr ""
 
@@ -27,28 +27,28 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:79
+#: code:addons/google_calendar/static/src/js/google_calendar.js:89
 #, python-format
 msgid "Accounts"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:69
+#: code:addons/google_calendar/static/src/js/google_calendar.js:79
 #, python-format
 msgid "All events have been disconnected from your previous account. You can now restart the synchronization"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:51
+#: code:addons/google_calendar/static/src/js/google_calendar.js:57
 #, python-format
 msgid "An administrator needs to configure Google Synchronization before you can use it!"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:73
+#: code:addons/google_calendar/static/src/js/google_calendar.js:83
 #, python-format
 msgid "An error occured while disconnecting events from your previous account. Please retry or contact your administrator."
 msgstr ""
@@ -69,31 +69,29 @@ msgid "Calendar ID"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.ui.view,arch_db:google_calendar.base_config_settings_view_form_inherit_google_calendar
+#: model:ir.ui.view,arch_db:google_calendar.res_config_settings_view_form
 msgid "Client ID"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.ui.view,arch_db:google_calendar.base_config_settings_view_form_inherit_google_calendar
+#: model:ir.ui.view,arch_db:google_calendar.res_config_settings_view_form
 msgid "Client Secret"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_cal_client_id
-#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_cal_client_id
+#: model:ir.model.fields,field_description:google_calendar.field_res_config_settings_cal_client_id
 msgid "Client_id"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_cal_client_secret
-#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_cal_client_secret
+#: model:ir.model.fields,field_description:google_calendar.field_res_config_settings_cal_client_secret
 msgid "Client_key"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:48
-#: code:addons/google_calendar/static/src/js/google_calendar.js:52
+#: code:addons/google_calendar/static/src/js/google_calendar.js:54
+#: code:addons/google_calendar/static/src/js/google_calendar.js:58
 #, python-format
 msgid "Configuration"
 msgstr ""
@@ -105,7 +103,7 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:60
+#: code:addons/google_calendar/static/src/js/google_calendar.js:66
 #, python-format
 msgid "Do you want to do this now?"
 msgstr ""
@@ -117,14 +115,14 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:74
+#: code:addons/google_calendar/static/src/js/google_calendar.js:84
 #, python-format
 msgid "Event disconnection error"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:70
+#: code:addons/google_calendar/static/src/js/google_calendar.js:80
 #, python-format
 msgid "Event disconnection success"
 msgstr ""
@@ -166,7 +164,7 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:59
+#: code:addons/google_calendar/static/src/js/google_calendar.js:65
 #, python-format
 msgid "In order to do this, you first need to disconnect all existing events from the old account."
 msgstr ""
@@ -198,7 +196,7 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:40
+#: code:addons/google_calendar/static/src/js/google_calendar.js:46
 #, python-format
 msgid "Redirection"
 msgstr ""
@@ -210,21 +208,21 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:90
+#: code:addons/google_calendar/static/src/js/google_calendar.js:117
 #, python-format
 msgid "Sync with <b>Google</b>"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:44
+#: code:addons/google_calendar/static/src/js/google_calendar.js:50
 #, python-format
 msgid "The Google Synchronization needs to be configured before you can use it, do you want to do it now?"
 msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:58
+#: code:addons/google_calendar/static/src/js/google_calendar.js:64
 #, python-format
 msgid "The account you are trying to synchronize (%s) is not the same as the last one used (%s)!"
 msgstr ""
@@ -235,8 +233,7 @@ msgid "Token Validity"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_server_uri
-#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_server_uri
+#: model:ir.model.fields,field_description:google_calendar.field_res_config_settings_server_uri
 msgid "URI for tuto"
 msgstr ""
 
@@ -252,24 +249,24 @@ msgstr ""
 
 #. module: google_calendar
 #. openerp-web
-#: code:addons/google_calendar/static/src/js/google_calendar.js:36
+#: code:addons/google_calendar/static/src/js/google_calendar.js:42
 #, python-format
 msgid "You will be redirected to Google to authorize access to your calendar!"
 msgstr ""
 
 #. module: google_calendar
-#: code:addons/google_calendar/models/google_calendar.py:296
+#: code:addons/google_calendar/models/google_calendar.py:295
 #, python-format
 msgid "Your token is invalid or has been revoked !"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.model,name:google_calendar.model_base_config_settings
-msgid "base.config.settings"
+#: model:ir.model,name:google_calendar.model_google_calendar
+msgid "google.calendar"
 msgstr ""
 
 #. module: google_calendar
-#: model:ir.model,name:google_calendar.model_google_calendar
-msgid "google.calendar"
+#: model:ir.model,name:google_calendar.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index 5db21e92f8b..1215e0c8f76 100644
--- a/addons/google_drive/i18n/google_drive.pot
+++ b/addons/google_drive/i18n/google_drive.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,18 +26,33 @@ msgid "<b>To create a new filter:</b><br/>\n"
 msgstr ""
 
 #. module: google_drive
+#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
+msgid "<strong>Active</strong>"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
+msgid "<strong>Model</strong>"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
+msgid "<strong>Template</strong>"
+msgstr ""
+
+#. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_active
 msgid "Active"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:40
+#: code:addons/google_drive/models/google_drive.py:41
 #, python-format
 msgid "At least one key cannot be found in your Google Drive name pattern"
 msgstr ""
 
 #. module: google_drive
-#: model:ir.model.fields,field_description:google_drive.field_base_config_settings_google_drive_authorization_code
+#: model:ir.model.fields,field_description:google_drive.field_res_config_settings_google_drive_authorization_code
 msgid "Authorization Code"
 msgstr ""
 
@@ -62,7 +77,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:159
+#: code:addons/google_drive/models/google_drive.py:157
 #, python-format
 msgid "Creating google drive may only be done by one at a time."
 msgstr ""
@@ -78,8 +93,8 @@ msgid "Filter"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:59
-#: code:addons/google_drive/models/google_drive.py:80
+#: code:addons/google_drive/models/google_drive.py:60
+#: code:addons/google_drive/models/google_drive.py:81
 #, python-format
 msgid "Go to the configuration panel"
 msgstr ""
@@ -90,11 +105,6 @@ msgid "Google Client"
 msgstr ""
 
 #. module: google_drive
-#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
-msgid "Google Drive"
-msgstr ""
-
-#. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_form
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_tree
 msgid "Google Drive Configuration"
@@ -106,13 +116,13 @@ msgid "Google Drive Name Pattern"
 msgstr ""
 
 #. module: google_drive
-#: model:ir.ui.view,arch_db:google_drive.base_config_settings_view_form_inherit_google_drive
+#: model:ir.ui.view,arch_db:google_drive.res_config_settings_view_form
 msgid "Google Drive Templates"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:61
-#: code:addons/google_drive/models/google_drive.py:82
+#: code:addons/google_drive/models/google_drive.py:62
+#: code:addons/google_drive/models/google_drive.py:83
 #, python-format
 msgid "Google Drive is not yet configured. Please contact your administrator."
 msgstr ""
@@ -153,7 +163,7 @@ msgid "Model"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:201
+#: code:addons/google_drive/models/google_drive.py:199
 #, python-format
 msgid "Please enter a valid Google Document URL."
 msgstr ""
@@ -169,7 +179,7 @@ msgid "Resource Id"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:79
+#: code:addons/google_drive/models/google_drive.py:80
 #, python-format
 msgid "Something went wrong during the token generation. Please request again an authorization code ."
 msgstr ""
@@ -186,18 +196,17 @@ msgstr ""
 
 #. module: google_drive
 #: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
-#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
 msgid "Templates"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:97
+#: code:addons/google_drive/models/google_drive.py:98
 #, python-format
 msgid "The Google Template cannot be found. Maybe it has been deleted."
 msgstr ""
 
 #. module: google_drive
-#: model:ir.model.fields,help:google_drive.field_base_config_settings_google_drive_uri
+#: model:ir.model.fields,help:google_drive.field_res_config_settings_google_drive_uri
 msgid "The URL to generate the authorization code from Google"
 msgstr ""
 
@@ -210,29 +219,29 @@ msgid "The name of the attached document can use fixed or variable data. To dist
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:135
+#: code:addons/google_drive/models/google_drive.py:134
 #, python-format
 msgid "The permission 'reader' for 'anyone with the link' has not been written on the document"
 msgstr ""
 
 #. module: google_drive
-#: model:ir.model.fields,field_description:google_drive.field_base_config_settings_google_drive_uri
+#: model:ir.model.fields,field_description:google_drive.field_res_config_settings_google_drive_uri
 msgid "URI"
 msgstr ""
 
 #. module: google_drive
-#: code:addons/google_drive/models/google_drive.py:58
+#: code:addons/google_drive/models/google_drive.py:59
 #, python-format
 msgid "You haven't configured 'Authorization Code' generated from google, Please generate and configure it ."
 msgstr ""
 
 #. module: google_drive
-#: model:ir.model,name:google_drive.model_base_config_settings
-msgid "base.config.settings"
+#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_form
+msgid "https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit"
 msgstr ""
 
 #. module: google_drive
-#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_form
-msgid "https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit"
+#: model:ir.model,name:google_drive.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
index 822c08c7416..ad832effdce 100644
--- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -43,25 +43,23 @@ msgid "Name"
 msgstr ""
 
 #. module: google_spreadsheet
-#: model:ir.ui.view,arch_db:google_spreadsheet.base_config_settings_view_form_inherit_spreadsheet
+#: model:ir.ui.view,arch_db:google_spreadsheet.res_config_settings_view_form
 msgid "Please use the settings of Google Drive\n"
 "                            on the left or above."
 msgstr ""
 
 #. module: google_spreadsheet
-#: model:ir.model.fields,help:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
-#: model:ir.model.fields,help:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
+#: model:ir.model.fields,help:google_spreadsheet.field_res_config_settings_google_drive_uri_copy
 msgid "The URL to generate the authorization code from Google"
 msgstr ""
 
 #. module: google_spreadsheet
-#: model:ir.model.fields,field_description:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
-#: model:ir.model.fields,field_description:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
+#: model:ir.model.fields,field_description:google_spreadsheet.field_res_config_settings_google_drive_uri_copy
 msgid "URI"
 msgstr ""
 
 #. module: google_spreadsheet
-#: model:ir.model,name:google_spreadsheet.model_base_config_settings
-msgid "base.config.settings"
+#: model:ir.model,name:google_spreadsheet.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index a5822f6bd65..bd8b5815534 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: hr
-#: code:addons/hr/models/hr.py:76
+#: code:addons/hr/models/hr.py:75
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -65,11 +65,6 @@ msgid "Birth"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
-msgid "Cancel"
-msgstr ""
-
-#. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_department_child_ids
 msgid "Child Departments"
 msgstr ""
@@ -114,7 +109,6 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_company_id
 #: model:ir.model.fields,field_description:hr.field_hr_department_company_id
 #: model:ir.model.fields,field_description:hr.field_hr_job_company_id
 #: model:ir.ui.view,arch_db:hr.view_employee_filter
@@ -123,7 +117,7 @@ msgid "Company"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_resource_calendar_id
+#: model:ir.model.fields,field_description:hr.field_res_config_settings_resource_calendar_id
 msgid "Company Working Hours"
 msgstr ""
 
@@ -153,7 +147,6 @@ msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_create_uid
 #: model:ir.model.fields,field_description:hr.field_hr_department_create_uid
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_create_uid
 #: model:ir.model.fields,field_description:hr.field_hr_employee_create_uid
@@ -162,7 +155,6 @@ msgid "Created by"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_create_date
 #: model:ir.model.fields,field_description:hr.field_hr_department_create_date
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_create_date
 #: model:ir.model.fields,field_description:hr.field_hr_employee_create_date
@@ -202,7 +194,6 @@ msgid "Departments"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_display_name
 #: model:ir.model.fields,field_description:hr.field_hr_department_display_name
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_display_name
 #: model:ir.model.fields,field_description:hr.field_hr_employee_display_name
@@ -284,13 +275,13 @@ msgid "Enter here the private address of the employee, not the one linked to you
 msgstr ""
 
 #. module: hr
-#: code:addons/hr/models/hr.py:294
+#: code:addons/hr/models/hr.py:303
 #, python-format
 msgid "Error! You cannot create recursive departments."
 msgstr ""
 
 #. module: hr
-#: code:addons/hr/models/hr.py:181
+#: code:addons/hr/models/hr.py:184
 #, python-format
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
 msgstr ""
@@ -352,7 +343,6 @@ msgid "Human Resources"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_id
 #: model:ir.model.fields,field_description:hr.field_hr_department_id
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_id
 #: model:ir.model.fields,field_description:hr.field_hr_employee_id
@@ -420,7 +410,6 @@ msgid "Jobs"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings___last_update
 #: model:ir.model.fields,field_description:hr.field_hr_department___last_update
 #: model:ir.model.fields,field_description:hr.field_hr_employee___last_update
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category___last_update
@@ -429,7 +418,6 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_write_uid
 #: model:ir.model.fields,field_description:hr.field_hr_department_write_uid
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_write_uid
 #: model:ir.model.fields,field_description:hr.field_hr_employee_write_uid
@@ -438,7 +426,6 @@ msgid "Last Updated by"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_write_date
 #: model:ir.model.fields,field_description:hr.field_hr_department_write_date
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_write_date
 #: model:ir.model.fields,field_description:hr.field_hr_employee_write_date
@@ -538,7 +525,7 @@ msgstr ""
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
 msgid "Odoo's department structure is used to manage all documents\n"
 "                related to employees by departments: expenses, timesheets,\n"
-"                leaves and holidays, recruitments, etc."
+"                leaves, recruitments, etc."
 msgstr ""
 
 #. module: hr
@@ -587,7 +574,7 @@ msgid "Private Information"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Prout prout prout"
 msgstr ""
 
@@ -637,12 +624,7 @@ msgid "SSN No"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Set default calendar used to compute time allocation for leaves, timesheets, ..."
 msgstr ""
 
@@ -658,17 +640,17 @@ msgid "Settings"
 msgstr ""
 
 #. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_config_settings_module_hr_org_chart
+#: model:ir.model.fields,field_description:hr.field_res_config_settings_module_hr_org_chart
 msgid "Show Organizational Chart"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form."
 msgstr ""
 
@@ -730,6 +712,11 @@ msgid "Tags"
 msgstr ""
 
 #. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee_is_address_home_a_company
+msgid "The employee adress has a company linked"
+msgstr ""
+
+#. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per department in company!"
 msgstr ""
@@ -753,6 +740,13 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: hr
+#: model:ir.ui.view,arch_db:hr.view_employee_form
+msgid "Use here the home address of the employee.\n"
+"                                            This private address is used in the expense report reimbursement document.\n"
+"                                            It should be different from the work address."
+msgstr ""
+
+#. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_user_id
 msgid "User"
 msgstr ""
@@ -763,6 +757,11 @@ msgid "Users"
 msgstr ""
 
 #. module: hr
+#: model:ir.ui.view,arch_db:hr.hr_job_view_kanban
+msgid "Vacancies :"
+msgstr ""
+
+#. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire
 msgid "Visa Expire Date"
 msgstr ""
@@ -811,7 +810,7 @@ msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Work Organization"
 msgstr ""
 
@@ -863,13 +862,13 @@ msgid "e.g. Sales Manager"
 msgstr ""
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_config_settings
-msgid "hr.config.settings"
+#: model:ir.model,name:hr.model_mail_alias_mixin
+msgid "mail.alias.mixin"
 msgstr ""
 
 #. module: hr
-#: model:ir.model,name:hr.model_mail_alias_mixin
-msgid "mail.alias.mixin"
+#: model:ir.model,name:hr.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index fb503278773..b16d3c17343 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -90,11 +90,6 @@ msgid "Badge ID"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Cancel"
-msgstr ""
-
-#. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_attendance.py:85
 #, python-format
 msgid "Cannot create new attendance record for %(empl_name)s, the employee hasn't checked out since %(datetime)s"
@@ -149,7 +144,7 @@ msgid "Check out"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Check-In/Out"
 msgstr ""
 
@@ -201,7 +196,6 @@ msgstr ""
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_settings
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
 msgid "Configuration"
 msgstr ""
 
@@ -211,13 +205,11 @@ msgid "Create a few employees to be able to select an employee here and perform
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_create_uid
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_create_date
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_date
 msgid "Created on"
 msgstr ""
@@ -233,7 +225,6 @@ msgid "Department"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_display_name
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_display_name
 msgid "Display Name"
 msgstr ""
@@ -265,8 +256,8 @@ msgid "Employee Image"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_group_attendance_use_pin
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+#: model:ir.model.fields,field_description:hr_attendance.field_res_config_settings_group_attendance_use_pin
+#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Employee PIN"
 msgstr ""
 
@@ -402,7 +393,6 @@ msgid "Hr Attendance Search"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_id
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_id
 msgid "ID"
 msgstr ""
@@ -437,40 +427,26 @@ msgid "Last Attendance"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings___last_update
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_write_uid
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_write_date
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_module_hr_holidays
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Leave Management"
-msgstr ""
-
-#. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_manage_attendances
 msgid "Manage Attendances"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Manage leave allocations and requests"
-msgstr ""
-
-#. module: hr_attendance
 #: model:res.groups,name:hr_attendance.group_hr_attendance_manager
 msgid "Manager"
 msgstr ""
@@ -554,26 +530,16 @@ msgid "Please return to the main menu."
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.actions.report.xml,name:hr_attendance.hr_employee_print_badge
+#: model:ir.actions.report,name:hr_attendance.hr_employee_print_badge
 msgid "Print Badge"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_report
 msgid "Reporting"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Save"
-msgstr ""
-
-#. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/xml/attendance.xml:13
 #, python-format
@@ -588,7 +554,7 @@ msgid "Select Employee"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Set PIN codes in the employee detail form (in HR Settings tab)."
 msgstr ""
 
@@ -631,12 +597,6 @@ msgid "The user will have to enter his PIN to check in and out manually at the c
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_module_hr_timesheet
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Timesheets"
-msgstr ""
-
-#. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban
 msgid "To create employees go to the Employees menu."
 msgstr ""
@@ -647,12 +607,7 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
-msgid "Track time spent by employees and compare with attendances"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Use PIN codes to check in in Kiosk Mode"
 msgstr ""
 
@@ -697,18 +652,6 @@ msgid "You cannot duplicate an attendance."
 msgstr ""
 
 #. module: hr_attendance
-#: model:ir.model,name:hr_attendance.model_attendance_config_settings
-msgid "attendance.config.settings"
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/js/presence_widgets.js:20
-#, python-format
-msgid "employee presence<br/>green: checked in<br/>red: checked out"
-msgstr ""
-
-#. module: hr_attendance
 #: model:ir.model.fields,help:hr_attendance.field_hr_employee_attendance_ids
 msgid "list of attendances for the employee"
 msgstr ""
@@ -727,3 +670,8 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 803fdcc1873..c298cf2e05f 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_contract_type
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6256
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_5898
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_name
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_form
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_search
@@ -226,17 +226,10 @@ msgid "Group By"
 msgstr ""
 
 #. module: hr_contract
-#: model:ir.actions.server,name:hr_contract.ir_cron_data_contract_update_to_close_ir_actions_server
-#: model:ir.cron,cron_name:hr_contract.ir_cron_data_contract_update_to_close
-#: model:ir.cron,name:hr_contract.ir_cron_data_contract_update_to_close
-msgid "HR Contract: update to closed"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.actions.server,name:hr_contract.ir_cron_data_contract_update_to_pending_ir_actions_server
-#: model:ir.cron,cron_name:hr_contract.ir_cron_data_contract_update_to_pending
-#: model:ir.cron,name:hr_contract.ir_cron_data_contract_update_to_pending
-msgid "HR Contract: update to pending"
+#: model:ir.actions.server,name:hr_contract.ir_cron_data_contract_update_state_ir_actions_server
+#: model:ir.cron,cron_name:hr_contract.ir_cron_data_contract_update_state
+#: model:ir.cron,name:hr_contract.ir_cron_data_contract_update_state
+msgid "HR Contract: update state"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 8368d2aa9d1..32fc001011d 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,21 +52,42 @@ msgstr ""
 
 #. module: hr_expense
 #. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:29
+#: code:addons/hr_expense/static/src/js/tour.js:48
 #, python-format
-msgid "<p>Managers can validate or refuse expense reports.</p><p>If you refuse a report, explain the reason using the <i>New Message</i> button in the bottom.</p>"
+msgid "<p>Approve the sheet here.</p><p>Tip: if you refuse, don’t forget to give the reason thanks to the hereunder message tool</p>"
 msgstr ""
 
 #. module: hr_expense
 #. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:19
+#: code:addons/hr_expense/static/src/js/tour.js:21
 #, python-format
-msgid "<p>Once completed, you can <b>submit the expense</b> for approval.</p><p><i>Tip: from the list view, select all expenses to submit them all at once, in a single report.</i></p>"
+msgid "<p>Click here to create your first expense and add it to below.</p>"
 msgstr ""
 
 #. module: hr_expense
 #. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:33
+#: code:addons/hr_expense/static/src/js/tour.js:44
+#, python-format
+msgid "<p>Click on <b> Action Submit To Manager </b> to submit selected expenses to your manager</p>"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:31
+#, python-format
+msgid "<p>Once your Expense is ready, you can save it.</p>"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:39
+#, python-format
+msgid "<p>Select expenses to submit them to your manager</p>"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:52
 #, python-format
 msgid "<p>The accountant receive approved expense reports.</p><p>He can post journal entries in one click if taxes and accounts are right.</p>"
 msgstr ""
@@ -189,7 +210,7 @@ msgid "<strong>Validated By:</strong>"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:83
+#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:83
 #, python-format
 msgid "A payment of %s %s with the reference <a href='/mail/view?%s'>%s</a> related to your expense %s has been made."
 msgstr ""
@@ -210,16 +231,6 @@ msgid "Accounting"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_accounting_date
-msgid "Accounting Date"
-msgstr ""
-
-#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
-msgid "Accounting Entries"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "Accounting: Accountant or Adviser"
 msgstr ""
@@ -235,19 +246,12 @@ msgid "Agree in advance with the customer:"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_domain
-msgid "Alias Domain"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_all
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
 msgid "All Expense Reports"
 msgstr ""
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_all
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_all_expenses
 msgid "All Expenses"
 msgstr ""
 
@@ -263,11 +267,6 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_group_analytic_accounting
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
 msgid "Approve"
 msgstr ""
@@ -294,6 +293,13 @@ msgid "Ask your expert accountant what tax must be claimed to your customer"
 msgstr ""
 
 #. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:35
+#, python-format
+msgid "Attach your receipt here."
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
 msgid "Bank Journal"
 msgstr ""
@@ -304,7 +310,7 @@ msgid "Bill Reference"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Billing"
 msgstr ""
 
@@ -320,9 +326,8 @@ msgid "Can be Expensed"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
 msgid "Cancel"
 msgstr ""
 
@@ -348,7 +353,7 @@ msgid "Click here to create new expenses."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:319
+#: code:addons/hr_expense/models/hr_expense.py:342
 #, python-format
 msgid "Click to add a new expense,"
 msgstr ""
@@ -359,24 +364,17 @@ msgid "Click to create a new expense category."
 msgstr ""
 
 #. module: hr_expense
-#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:15
-#, python-format
-msgid "Click to try <b>submitting an expense by email</b>. You can attach a photo of the receipt to the mail."
-msgstr ""
-
-#. module: hr_expense
 #: selection:hr.expense,payment_mode:0
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_company_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_company_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_company_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_company_id
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
 msgid "Company"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_register_payment_wizard_company_id
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_register_payment_wizard_company_id
 msgid "Company related to this journal"
 msgstr ""
 
@@ -417,43 +415,41 @@ msgid "Create employees with a Work Email"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_create_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_create_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_create_uid
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_create_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_create_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_create_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_create_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_create_date
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_create_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_create_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_currency_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_currency_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_currency_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_currency_id
 msgid "Currency"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_module_sale
+#: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_module_sale_management
 msgid "Customer Billing"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_accounting_date
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
 msgid "Date"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_prefix
+#: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_expense_alias_prefix
 msgid "Default Alias Name for Expenses"
 msgstr ""
 
@@ -474,11 +470,10 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_display_name
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_display_name
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_display_name
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_display_name
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_display_name
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -494,17 +489,17 @@ msgid "Don't hesitate to"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
 msgid "Draft Payment"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Email Alias"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Emails"
 msgstr ""
 
@@ -538,12 +533,18 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_account_move_line_expense_id
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
 msgid "Expense"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_date
+msgid "Expense Date"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_name
 msgid "Expense Description"
 msgstr ""
@@ -560,6 +561,7 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_expense_line_ids
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
 msgid "Expense Lines"
 msgstr ""
 
@@ -577,6 +579,11 @@ msgid "Expense Report"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_sheet_register_payment_wizard
+msgid "Expense Report Register Payment wizard"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_state
 msgid "Expense Report State"
 msgstr ""
@@ -633,6 +640,11 @@ msgid "Expense Types"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
+msgid "Expense refuse Reason wizard"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
 msgid "Expense refuse reason"
 msgstr ""
@@ -658,6 +670,11 @@ msgid "Expense report submitted, waiting approval"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_account_move_line_expense_id
+msgid "Expense where the move line come from"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
 msgid "Expense: Submit To Manager"
 msgstr ""
@@ -676,6 +693,7 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_action
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_all_expenses
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_graph
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_pivot
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_graph
@@ -690,12 +708,17 @@ msgid "Expenses Month"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.report.xml,name:hr_expense.action_report_hr_expense_sheet
+#: model:ir.actions.report,name:hr_expense.action_report_hr_expense_sheet
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
 msgid "Expenses Report"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
+msgid "Expenses Reports Analysis"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_sheets_to_approve_count
 msgid "Expenses Reports to Approve"
 msgstr ""
@@ -717,19 +740,19 @@ msgid "Expenses follow this flow:"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:414
+#: code:addons/hr_expense/models/hr_expense.py:437
 #, python-format
 msgid "Expenses must belong to the same Employee."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:538
+#: code:addons/hr_expense/models/hr_expense.py:562
 #, python-format
 msgid "Expenses must have an expense journal specified to generate accounting entries."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:418
+#: code:addons/hr_expense/models/hr_expense.py:441
 #, python-format
 msgid "Expenses must have been paid by the same entity (Company or employee)"
 msgstr ""
@@ -761,6 +784,11 @@ msgid "Expenses: Manager"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_is_refused
+msgid "Explicitely Refused by manager or acccountant"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "For the Odoo Team,<br/>\n"
 "                            Fabien Pinckaers, Founder"
@@ -783,6 +811,13 @@ msgid "General Information"
 msgstr ""
 
 #. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:16
+#, python-format
+msgid "Go to the expense to attach a receipt."
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "Grant such accountants with following access rights:"
 msgstr ""
@@ -814,26 +849,25 @@ msgid "Have a wonderful day,<br/>- The Odoo Team"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_hide_payment_method
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_hide_payment_method
 msgid "Hide Payment Method"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model,name:hr_expense.model_hr_expense_register_payment_wizard
-msgid "Hr Expense Register Payment wizard"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_ids
+msgid "Hr Expense"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
-msgid "Hr Expense refuse Reason wizard"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_sheet_id
+msgid "Hr Expense Sheet"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9585
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_7632
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_id
 msgid "ID"
 msgstr ""
 
@@ -874,34 +908,31 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense___last_update
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings___last_update
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard___last_update
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard___last_update
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet___last_update
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_write_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_write_uid
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_write_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_write_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_write_uid
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_write_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_write_date
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_write_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_write_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_write_date
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_default_alias_email
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_use_mailgateway
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Let your employees record expenses by email"
 msgstr ""
 
@@ -912,13 +943,13 @@ msgstr ""
 
 #. module: hr_expense
 #. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:41
+#: code:addons/hr_expense/static/src/js/tour.js:60
 #, python-format
 msgid "Managers can get all reports to approve from this menu."
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_communication
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_communication
 msgid "Memo"
 msgstr ""
 
@@ -934,6 +965,11 @@ msgid "My Expenses to Submit"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_refused
+msgid "My Refused Reports"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
 msgid "My Reports"
@@ -966,24 +1002,29 @@ msgid "New Mail"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:259
+#: code:addons/hr_expense/models/hr_expense.py:265
 #, python-format
 msgid "No Expense account found for the product %s (or for its category), please configure one."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:225
+#: code:addons/hr_expense/models/hr_expense.py:230
 #, python-format
 msgid "No Home Address found for the employee %s, please configure one."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:204
+#: code:addons/hr_expense/models/hr_expense.py:209
 #, python-format
 msgid "No credit account found for the %s journal, please configure one."
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_refused
+msgid "No refused reports to display."
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 msgid "Not Refused"
 msgstr ""
@@ -1010,7 +1051,6 @@ msgid "Once a month"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "Once approved, your expense report, goes to the accounting,"
 msgstr ""
@@ -1048,18 +1088,23 @@ msgid "Optionally, <strong>expenses are invoiced to the customer afterwards.</st
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "Other Info"
+msgstr ""
+
+#. module: hr_expense
 #: selection:hr.expense.sheet,state:0
 #: model:mail.message.subtype,name:hr_expense.mt_expense_paid
 msgid "Paid"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_partner_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_amount
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_amount
 msgid "Payment Amount"
 msgstr ""
 
@@ -1070,22 +1115,21 @@ msgid "Payment By"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_payment_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_payment_date
 msgid "Payment Date"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_journal_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_journal_id
 msgid "Payment Method"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_payment_method_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_payment_method_id
 msgid "Payment Type"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "Periodically, you submit expenses report to your manager,"
@@ -1097,7 +1141,7 @@ msgid "Planner"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:264
+#: code:addons/hr_expense/models/hr_expense.py:270
 #, python-format
 msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
 msgstr ""
@@ -1140,11 +1184,6 @@ msgid "Product Template"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_module_project
-msgid "Project"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "Provide your customer with detailed reports (along with copies of receipts)"
 msgstr ""
@@ -1165,18 +1204,18 @@ msgid "Quicker to get reimbursed"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_description
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_reason
 msgid "Reason"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
-msgid "Reason to refuse expense."
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
+msgid "Reason :"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Recommended Apps"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
+msgid "Reason to refuse Expense"
 msgstr ""
 
 #. module: hr_expense
@@ -1185,7 +1224,7 @@ msgid "Record a first expense"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Recording"
 msgstr ""
 
@@ -1219,15 +1258,18 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_refused_expenses
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_refused
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 msgid "Refused Expenses"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.hr_expense_register_payment_wizard_action
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports_refused
+msgid "Refused Reports"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_sheet_register_payment_wizard_action
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
 msgid "Register Payment"
 msgstr ""
@@ -1238,6 +1280,7 @@ msgid "Reimbursement"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 msgid "Report"
 msgstr ""
@@ -1279,23 +1322,6 @@ msgid "Review expenses to approve"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Save"
-msgstr ""
-
-#. module: hr_expense
-#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:25
-#, python-format
-msgid "Save the report, your manager will receive a notification by email to approve it."
-msgstr ""
-
-#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Schedule the tasks of your employees"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "See how to invoice expenses"
 msgstr ""
@@ -1306,13 +1332,13 @@ msgid "See how to manage payables"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:89
+#: code:addons/hr_expense/models/hr_expense.py:93
 #, python-format
 msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Sell services and invoice expenses to customer"
 msgstr ""
 
@@ -1347,17 +1373,12 @@ msgid "Set invoicing method on expense products"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Set units of measure on expense types (unit, distance, etc.)"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_global_settings
 msgid "Settings"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Setup your domain alias"
 msgstr ""
 
@@ -1412,19 +1433,18 @@ msgid "Taxes"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_register_payment_wizard_hide_payment_method
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_register_payment_wizard_hide_payment_method
 msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'"
 msgstr ""
 
 #. module: hr_expense
 #. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:37
+#: code:addons/hr_expense/static/src/js/tour.js:56
 #, python-format
 msgid "The accountant can register a payment to reimburse the employee directly."
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "The accountant validates entries and reimburse you."
 msgstr ""
@@ -1450,7 +1470,7 @@ msgid "The next step is to settle an internal policy to"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:35
+#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:35
 #, python-format
 msgid "The payment amount must be strictly positive."
 msgstr ""
@@ -1461,7 +1481,6 @@ msgid "The payment method used when the expense is paid by the company."
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "The steps to process expenses are:"
 msgstr ""
@@ -1472,7 +1491,7 @@ msgid "This guide helps you start with Odoo Expenses."
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "This installs the Sales Management app.                             Expenses can be invoiced to customers from sales orders."
 msgstr ""
 
@@ -1517,11 +1536,6 @@ msgid "Total Amount"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Track costs &amp; revenues by project, department, etc."
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_unit_amount
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
 msgid "Unit Price"
@@ -1533,12 +1547,6 @@ msgid "Unit of Measure"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_group_uom
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
-msgid "Units of Measure"
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_approved_expense
 msgid "Unreported Expenses"
 msgstr ""
@@ -1549,7 +1557,7 @@ msgid "Use this app to track expenses done by employees and reimbursed by the co
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
 msgid "Validate"
 msgstr ""
 
@@ -1574,13 +1582,6 @@ msgid "View Report"
 msgstr ""
 
 #. module: hr_expense
-#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:11
-#, python-format
-msgid "Want to manage your employee expenses and receipts? <i>Start here</i>."
-msgstr ""
-
-#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "We hope this feature helped you manage your expenses efficiently."
 msgstr ""
@@ -1601,36 +1602,49 @@ msgid "When you charge"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:535
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:26
+#, python-format
+msgid "Write the name of the product, or select an existing one."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:559
 #, python-format
 msgid "You can only generate accounting entry for approved expense(s)."
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form
+#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:573
+#: code:addons/hr_expense/models/hr_expense.py:589
 #, python-format
 msgid "You cannot add expense lines of another employee."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:445
+#: code:addons/hr_expense/models/hr_expense.py:314
 #, python-format
 msgid "You cannot delete a posted expense."
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:107
+#: code:addons/hr_expense/models/hr_expense.py:468
+#, python-format
+msgid "You cannot delete a posted or paid expense."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:111
 #, python-format
 msgid "You cannot report expenses for different employees in the same report!"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:105
+#: code:addons/hr_expense/models/hr_expense.py:109
 #, python-format
 msgid "You cannot report twice the same line!"
 msgstr ""
@@ -1641,15 +1655,13 @@ msgid "You record expenses"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "You record expenses,"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:517
-#, python-format
-msgid "Your Expense %s has been refused.<br/><ul class=o_timeline_tracking_value_list><li>Reason<span> : </span><span class=o_timeline_tracking_value>%s</span></li></ul>"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
+msgid "Your Expense"
 msgstr ""
 
 #. module: hr_expense
@@ -1693,12 +1705,12 @@ msgid "e.g. Trip to NY"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.model,name:hr_expense.model_hr_expense_config_settings
-msgid "hr.expense.config.settings"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
+msgid "has been refused"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:320
+#: code:addons/hr_expense/models/hr_expense.py:343
 #, python-format
 msgid "or send receipts by email to %s."
 msgstr ""
@@ -1714,6 +1726,11 @@ msgid "proceed with the employee reimbursement"
 msgstr ""
 
 #. module: hr_expense
+#: model:ir.model,name:hr_expense.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "send us an email"
 msgstr ""
diff --git a/addons/hr_expense_check/i18n/hr_expense_check.pot b/addons/hr_expense_check/i18n/hr_expense_check.pot
index 27089aeafc5..748eb40df1e 100644
--- a/addons/hr_expense_check/i18n/hr_expense_check.pot
+++ b/addons/hr_expense_check/i18n/hr_expense_check.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,42 +16,42 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: hr_expense_check
-#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_amount_in_words
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_amount_in_words
 msgid "Amount in Words"
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_number
 msgid "Check Number"
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_manual_sequencing
 msgid "Check this option if your pre-printed checks are not numbered."
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_payment_method_code_2
 msgid "Code"
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model,name:hr_expense_check.model_hr_expense_register_payment_wizard
-msgid "Hr Expense Register Payment wizard"
+#: model:ir.model,name:hr_expense_check.model_hr_expense_sheet_register_payment_wizard
+msgid "Expense Report Register Payment wizard"
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_manual_sequencing
 msgid "Manual Numbering"
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_number
 msgid "Number of the check corresponding to this payment. If your pre-printed check are not already numbered, you can manage the numbering in the journal configuration page."
 msgstr ""
 
 #. module: hr_expense_check
-#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_payment_method_code_2
 msgid "Technical field used to adapt the interface to the payment type selected."
 msgstr ""
 
diff --git a/addons/hr_gamification/i18n/hr_gamification.pot b/addons/hr_gamification/i18n/hr_gamification.pot
index 787396b915c..4fbbe6e93a3 100644
--- a/addons/hr_gamification/i18n/hr_gamification.pot
+++ b/addons/hr_gamification/i18n/hr_gamification.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index d4c731d558d..fbb854b82f1 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -84,6 +84,16 @@ msgid "&lt;th class=\"text-center\" colspan="
 msgstr ""
 
 #. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
+msgid "<small class=\"text-muted\">from</small>"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
+msgid "<small class=\"text-muted\">to</small>"
+msgstr ""
+
+#. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
 msgid "<strong>Departments and Employees</strong>"
 msgstr ""
@@ -229,7 +239,7 @@ msgid "Appraisal Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:568
+#: code:addons/hr_holidays/models/hr_holidays.py:580
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
 #, python-format
 msgid "Approve"
@@ -496,7 +506,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-msgid "Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"
+msgid "Filters only on allocations and requests that belong to an leave type that is 'active' (active field is True)"
 msgstr ""
 
 #. module: hr_holidays
@@ -505,7 +515,7 @@ msgid "First Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/report/holidays_summary_report.py:107
+#: code:addons/hr_holidays/report/holidays_summary_report.py:112
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
 msgstr ""
@@ -664,19 +674,19 @@ msgid "Leave Types"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:435
+#: code:addons/hr_holidays/models/hr_holidays.py:439
 #, python-format
 msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:467
+#: code:addons/hr_holidays/models/hr_holidays.py:475
 #, python-format
 msgid "Leave request must be confirmed in order to approve it."
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:528
+#: code:addons/hr_holidays/models/hr_holidays.py:535
 #, python-format
 msgid "Leave request must be confirmed or validated in order to refuse it."
 msgstr ""
@@ -740,7 +750,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
-#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+#: model:ir.actions.report,name:hr_holidays.action_report_holidayssummary
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
 #: model:ir.ui.view,arch_db:hr_holidays.view_holiday_graph
@@ -751,8 +761,13 @@ msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
+msgid "Leaves Taken:"
+msgstr ""
+
+#. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
-#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_summary_dept
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_summary_dept
 msgid "Leaves by Department"
 msgstr ""
@@ -861,6 +876,11 @@ msgid "Manager"
 msgstr ""
 
 #. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
+msgid "Max Leaves:"
+msgstr ""
+
+#. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_max_leaves
 msgid "Maximum Allowed"
 msgstr ""
@@ -953,12 +973,12 @@ msgstr ""
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
 msgid "Once you have recorded your leave request, it will be sent\n"
 "                to a manager for validation. Be sure to set the right leave\n"
-"                type (recuperation, legal holidays, sickness) and the exact\n"
+"                type (recuperation, legal leaves, sickness) and the exact\n"
 "                number of open days related to your leave."
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:469
+#: code:addons/hr_holidays/models/hr_holidays.py:477
 #, python-format
 msgid "Only an HR Manager can apply the second approval on leave requests."
 msgstr ""
@@ -970,14 +990,14 @@ msgid "Only an HR Manager or the concerned employee can reset to draft."
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:430
-#: code:addons/hr_holidays/models/hr_holidays.py:462
+#: code:addons/hr_holidays/models/hr_holidays.py:428
+#: code:addons/hr_holidays/models/hr_holidays.py:466
 #, python-format
 msgid "Only an HR Officer or Manager can approve leave requests."
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:523
+#: code:addons/hr_holidays/models/hr_holidays.py:552
 #, python-format
 msgid "Only an HR Officer or Manager can refuse leave requests."
 msgstr ""
@@ -1009,7 +1029,7 @@ msgid "Red"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:571
+#: code:addons/hr_holidays/models/hr_holidays.py:583
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
 #, python-format
 msgid "Refuse"
@@ -1115,13 +1135,13 @@ msgid "Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:584
+#: code:addons/hr_holidays/models/hr_holidays.py:596
 #, python-format
 msgid "See Allocation"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:584
+#: code:addons/hr_holidays/models/hr_holidays.py:596
 #, python-format
 msgid "See Leave"
 msgstr ""
@@ -1187,10 +1207,10 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_state
-msgid "The status is set to 'To Submit', when a holiday request is created.\n"
-"The status is 'To Approve', when holiday request is confirmed by user.\n"
-"The status is 'Refused', when holiday request is refused by manager.\n"
-"The status is 'Approved', when holiday request is approved by manager."
+msgid "The status is set to 'To Submit', when a leave request is created.\n"
+"The status is 'To Approve', when leave request is confirmed by user.\n"
+"The status is 'Refused', when leave request is refused by manager.\n"
+"The status is 'Approved', when leave request is approved by manager."
 msgstr ""
 
 #. module: hr_holidays
@@ -1210,12 +1230,12 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_leaves_taken
-msgid "This value is given by the sum of all holidays requests with a negative value."
+msgid "This value is given by the sum of all leaves requests with a negative value."
 msgstr ""
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_max_leaves
-msgid "This value is given by the sum of all holidays requests with a positive value."
+msgid "This value is given by the sum of all leaves requests with a positive value."
 msgstr ""
 
 #. module: hr_holidays
@@ -1366,6 +1386,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
 #: model:ir.ui.view,arch_db:hr_holidays.view_employee_form_leave_inherit
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
 msgid "days"
 msgstr ""
 
diff --git a/addons/hr_maintenance/i18n/hr_maintenance.pot b/addons/hr_maintenance/i18n/hr_maintenance.pot
index da8a4f1a394..5ff34d6b36d 100644
--- a/addons/hr_maintenance/i18n/hr_maintenance.pot
+++ b/addons/hr_maintenance/i18n/hr_maintenance.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,7 @@ msgstr ""
 #. module: hr_maintenance
 #: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request_department_id
 #: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_form_inherit_hr
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_search_inherit_hr
 #: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_tree_inherit_hr
 #: selection:maintenance.equipment,equipment_assign_to:0
 msgid "Department"
@@ -42,6 +43,7 @@ msgstr ""
 #. module: hr_maintenance
 #: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request_employee_id
 #: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_form_inherit_hr
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_search_inherit_hr
 #: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_tree_inherit_hr
 #: selection:maintenance.equipment,equipment_assign_to:0
 msgid "Employee"
diff --git a/addons/hr_org_chart/i18n/hr_org_chart.pot b/addons/hr_org_chart/i18n/hr_org_chart.pot
index 2a917c1a857..69da654ecc2 100644
--- a/addons/hr_org_chart/i18n/hr_org_chart.pot
+++ b/addons/hr_org_chart/i18n/hr_org_chart.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index cae9c116394..1a97610170c 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -120,12 +120,7 @@ msgid "A contribution register is a third party involved in the salary\n"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_account_accountant
-msgid "Account Accountant"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form
 msgid "Accounting"
 msgstr ""
@@ -196,12 +191,7 @@ msgid "Applied this rule for calculation if condition is true. You can specify c
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_be_hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_be_hr_payroll
 msgid "Belgium Payroll"
 msgstr ""
 
@@ -221,7 +211,6 @@ msgid "Calculations"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
 #: model:ir.ui.view,arch_db:hr_payroll.view_payslip_lines_contribution_register
 msgid "Cancel"
 msgstr ""
@@ -232,14 +221,14 @@ msgid "Cancel Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:99
+#: code:addons/hr_payroll/models/hr_payslip.py:98
 #, python-format
 msgid "Cannot cancel a payslip that is done."
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7559
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7732
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter
 msgid "Category"
 msgstr ""
@@ -267,7 +256,7 @@ msgid "Children Definition"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Choose a Payroll Localization"
 msgstr ""
 
@@ -297,6 +286,12 @@ msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
+#: model:ir.ui.view,arch_db:hr_payroll.hr_payroll_structure_view_kanban
+#: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_view_kanban
+msgid "Code:"
+msgstr ""
+
+#. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
 msgid "Companies"
 msgstr ""
@@ -344,7 +339,6 @@ msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_configuration
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
 msgid "Configure Payroll"
 msgstr ""
 
@@ -396,7 +390,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_uid
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_create_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_create_uid
@@ -414,7 +407,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_date
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_create_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_create_date
@@ -492,7 +484,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_display_name
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_display_name
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_display_name
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_display_name
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_display_name
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_display_name
@@ -615,7 +606,7 @@ msgid "Form content is missing, this report cannot be printed."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_fr_hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_fr_hr_payroll
 msgid "French Payroll"
 msgstr ""
 
@@ -650,7 +641,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_id
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_id
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_id
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_id
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_id
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_id
@@ -679,7 +669,7 @@ msgid "If the active field is set to false, it will allow you to hide the salary
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_in_hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_in_hr_payroll
 msgid "Indian Payroll"
 msgstr ""
 
@@ -707,6 +697,11 @@ msgid "Internal Note"
 msgstr ""
 
 #. module: hr_payroll
+#: model:ir.ui.view,arch_db:hr_payroll.hr_payslip_run_view_kanban
+msgid "Is a Blocking Reason?"
+msgstr ""
+
+#. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_quantity
 msgid "It is used in computation for percentage and fixed amount. For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
@@ -719,7 +714,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template___last_update
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register___last_update
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings___last_update
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure___last_update
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip___last_update
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees___last_update
@@ -739,7 +733,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_uid
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_write_uid
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_input_write_uid
@@ -757,7 +750,6 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_date
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_write_date
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_input_write_date
@@ -834,7 +826,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:198
+#: code:addons/hr_payroll/models/hr_payslip.py:197
 #, python-format
 msgid "Normal Working Days paid at 100%"
 msgstr ""
@@ -860,11 +852,6 @@ msgid "Officer"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_website_sign
-msgid "Online Signatures"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form
 msgid "Other Inputs"
 msgstr ""
@@ -902,7 +889,7 @@ msgid "PaySlip Batch"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+#: model:ir.actions.report,name:hr_payroll.payslip_details_report
 msgid "PaySlip Details"
 msgstr ""
 
@@ -912,7 +899,7 @@ msgid "PaySlip Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.action_contribution_register
+#: model:ir.actions.report,name:hr_payroll.action_contribution_register
 msgid "PaySlip Lines By Conribution Register"
 msgstr ""
 
@@ -934,17 +921,17 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.open_payroll_modules
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_root
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Entries"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Rules"
 msgstr ""
 
@@ -954,18 +941,18 @@ msgid "Payroll Structures"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll rules that apply to your country"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.action_report_payslip
+#: model:ir.actions.report,name:hr_payroll.action_report_payslip
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form
 msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:85
+#: code:addons/hr_payroll/models/hr_payslip.py:84
 #, python-format
 msgid "Payslip 'Date From' must be before 'Date To'."
 msgstr ""
@@ -1075,7 +1062,7 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Post payroll slips in accounting"
 msgstr ""
 
@@ -1144,11 +1131,6 @@ msgid "Rate (%)"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_code
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_number
 msgid "Reference"
@@ -1160,7 +1142,7 @@ msgid "Refund"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:105
+#: code:addons/hr_payroll/models/hr_payslip.py:104
 #, python-format
 msgid "Refund: "
 msgstr ""
@@ -1308,11 +1290,6 @@ msgid "Settings"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
-msgid "Sign documents and contracts online"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
 msgid "States"
 msgstr ""
@@ -1377,11 +1354,6 @@ msgid "This wizard will generate payslips for all selected employee(s) based on
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_hr_timesheet
-msgid "Timesheets"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_total
 #: model:ir.ui.view,arch_db:hr_payroll.report_contributionregister
 #: model:ir.ui.view,arch_db:hr_payroll.report_payslip
@@ -1395,11 +1367,6 @@ msgid "Total Working Days"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration
-msgid "Track time spent by employees"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper Bound"
 msgstr ""
@@ -1477,7 +1444,7 @@ msgid "Wrong range condition defined for salary rule %s (%s)."
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:129
+#: code:addons/hr_payroll/models/hr_payslip.py:128
 #, python-format
 msgid "You cannot delete a payslip which is not draft or cancelled!"
 msgstr ""
@@ -1495,11 +1462,6 @@ msgid "You must set a contract to create a payslip line."
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_config_settings
-msgid "hr.payroll.config.settings"
-msgstr ""
-
-#. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule
 msgid "hr.salary.rule"
 msgstr ""
@@ -1515,6 +1477,11 @@ msgid "report.hr_payroll.report_payslipdetails"
 msgstr ""
 
 #. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_amount_percentage_base
 #: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_amount_percentage_base
 msgid "result will be affected to a variable"
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 96517b3dccb..d5bf536c52e 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index c2236b0ac16..42913d6fd20 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,22 +18,359 @@ msgstr ""
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_refuse
 msgid "\n"
-"<p>Dear ${object.partner_name or 'applicant'},</p>\n"
-"<p>Thank you for your enquiry.<br />\n"
-"Unfortunately, your profile does not match with our needs</p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
+"          <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+"            <table style=\"width:600px;margin:10px auto;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td>\n"
+"                            <a href=\"/\">\n"
+"                                <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
+"                            </a>\n"
+"                        </td>\n"
+"                        <td style=\"text-align:right;vertical-align:middle;\">\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                                <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"            <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px; border:1px solid #e1e1e1;\">\n"
+"            <tr>\n"
+"                <td style=\"font-size:16px; font-weight:300;\">\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        Hi,\n"
+"                    </p><p style=\"font-size:16px;\">\n"
+"                        Thank you for your interest in joining the\n"
+"                        <b>${object.company_id.name}</b> team.  We wanted to\n"
+"                        let you know that, although your resume is competitive,\n"
+"                        our hiring team reviewed your application and <b>did not\n"
+"                        select it for further consideration</b>.\n"
+"                    </p><p style=\"font-size:16px;\">\n"
+"                        Please note that recruiting is hard, and we can do\n"
+"                        mistake. Do not hesitate to reply to this email if you\n"
+"                        think we did a mistake, or if you want more information\n"
+"                        about our decision.\n"
+"                    </p><p style=\"font-size:16px;\">\n"
+"                        We will, however, keep your resume on record and get in\n"
+"                        touch with you about future opportunities that may be a\n"
+"                        better fit for your skills and experience.\n"
+"                    </p>\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        We wish you all the best in your job search and hope we\n"
+"                        will have the chance to consider you for another role\n"
+"                        in the future.\n"
+"                    </p>\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        Regards,\n"
+"                    </p>\n"
+"\n"
+"                    <p style=\"color:grey;\">-- <br/>\n"
+"                    % if object.user_id:\n"
+"                        <strong>${object.user_id.name}</strong><br/>\n"
+"                        Email: ${object.user_id.email or ''}<br/>\n"
+"                        Phone: ${object.user_id.phone or ''}\n"
+"                    % else:\n"
+"                        ${object.company_id.name}<br/>\n"
+"                        The HR Team\n"
+"                    % endif\n"
+"                    </p>\n"
+"\n"
+"                </td>\n"
+"            </tr>\n"
+"            </table>\n"
+"            <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td style=\"padding-top:10px;font-size: 12px;\">\n"
+"                            <div>Sent by ${object.company_id.name}</div>\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                            <div>\n"
+"                                Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">our others jobs</a>.\n"
+"                            </div>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"\n"
+"          </div>\n"
+"        "
 msgstr ""
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
 msgid "\n"
-"<p>Dear ${object.partner_name or 'applicant'},</p>\n"
-"<p>Thank you for your enquiry.<br />\n"
-"Your resume got our interest. I will contact you as soon as possible to plan\n"
-"next steps of the recruitment process.</p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
+"          <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+"            <table style=\"width:600px;margin:10px auto;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td>\n"
+"                            <a href=\"/\">\n"
+"                                <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
+"                            </a>\n"
+"                        </td>\n"
+"                        <td style=\"text-align:right;vertical-align:middle;\">\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                                <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"            <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px;border:1px solid #e1e1e1;\">\n"
+"            <tr>\n"
+"                <td style=\"font-size:16px; font-weight:300;\">\n"
+"                    <div style=\"text-align: center\">\n"
+"                        <h2>Congratulations!</h2>\n"
+"                        <div style=\"color:grey;\">Your resume has been positively reviewed.</div>\n"
+"                        <img src=\"/hr_recruitment/static/src/img/congratulations.png\" alt=\"Congratulations!\" style=\"width:175px;margin:20px 0;\"/>\n"
+"                    </div>\n"
+"\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        We just reviewed your resume, and it caught our\n"
+"                        attention. As we think you might be great for the\n"
+"                        position, your application has been short listed for a\n"
+"                        call or an interview.\n"
+"                    </p>\n"
+"\n"
+"                    % if object.user_id:\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        You will soon be contacted by:\n"
+"                    </p>\n"
+"                    <table style=\"width:100%; border:0px solid white;\">\n"
+"                    <tr>\n"
+"                        <td width=\"75\">\n"
+"                            <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\" />\n"
+"                        </td><td style=\"font-size:15px;\">\n"
+"                            <strong>${object.user_id.name}</strong><br/>\n"
+"                            <span>Email: ${object.user_id.email or ''}</span><br/>\n"
+"                            <span>Phone: ${object.user_id.phone or ''}</span>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                    </table>\n"
+"                    % endif\n"
+"                    <p style=\"font-size:16px;margin:24px 0;\">\n"
+"                        See you soon,\n"
+"                    </p><p style=\"font-size:16px;color: grey;\">\n"
+"                        -- <br/>\n"
+"                        Odoo HR Team\n"
+"                    </p>\n"
+"\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"                    <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        We usually <strong>answer applications within 3 days</strong>.\n"
+"                        The next step is either a call or a meeting in our offices.\n"
+"                    </p><p style=\"font-size:16px;\">\n"
+"                        Feel free to <strong>contact us if you want a faster\n"
+"                        feedback</strong> or if you don't get news from us\n"
+"                        quickly enough (just reply to this email).\n"
+"                    </p>\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"\n"
+"                    <h3 style=\"color:#9A6C8E;\"><strong>Want to learn about us?</strong></h3>\n"
+"                    <ol>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\">Founders' story</a></li>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.slideshare.net/openobject/the-odoo-culture\">The Odoo Culture</a></li>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/page/about-us\">About us</a></li>\n"
+"                    </ol>\n"
+"\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"\n"
+"                    % set location = ''\n"
+"                    % if object.job_id.address_id.name:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\"><strong>${object.job_id.address_id.name}</strong></p>\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.street:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street}</p>\n"
+"                        % set location = object.job_id.address_id.street\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.street2:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street2}</p>\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
+"                    % endif\n"
+"                    <p style=\"margin:0px 0px 0px 0px;\">\n"
+"                    % if object.job_id.address_id.city:\n"
+"                        ${object.job_id.address_id.city},\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.state_id.name:\n"
+"                        ${object.job_id.address_id.state_id.name},\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.zip:\n"
+"                        ${object.job_id.address_id.zip}\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
+"                    % endif\n"
+"                    </p>\n"
+"                    % if object.job_id.address_id.country_id.name:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.country_id.name}</p>\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
+"                    % endif\n"
+"\n"
+"                </td>\n"
+"            </tr>\n"
+"            </table>\n"
+"\n"
+"            % if object.job_id.address_id:\n"
+"            <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
+"                <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+"                    <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
+"                </a>\n"
+"            </div>\n"
+"            % endif\n"
+"            <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td style=\"padding-top:10px;font-size: 12px;\">\n"
+"                            <div>Sent by ${object.company_id.name}</div>\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                            <div>\n"
+"                                Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">all our jobs</a>.\n"
+"                            </div>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"\n"
+"\n"
+"          </div>\n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
+msgid "\n"
+"          <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+"            <table style=\"width:600px;margin:10px auto;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td>\n"
+"                            <a href=\"/\">\n"
+"                                <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
+"                            </a>\n"
+"                        </td>\n"
+"                        <td style=\"text-align:right;vertical-align:middle;\">\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                                <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"            <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px;border:1px solid #e1e1e1;\">\n"
+"            <tr>\n"
+"                <td style=\"font-size:16px; font-weight:300;\">\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        Hi,\n"
+"                    </p><p style=\"font-size:16px;\">\n"
+"                        We confirm we successfully received your application to the job\n"
+"\n"
+"                        \"<a href=\"${object.job_id.website_url or ''}\" style=\"color:#9A6C8E;\"><strong>${object.job_id.name}</strong></a>\"\n"
+"                        at <strong>${object.company_id.name}</strong>.\n"
+"                    </p>\n"
+"                    <p style=\"font-size:16px;\">\n"
+"                        We will come back to you shortly.\n"
+"                    </p>\n"
+"\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"                    % if object.user_id:\n"
+"                    <h3 style=\"color:#9A6C8E;\"><strong>Your Contact:</strong></h3>\n"
+"                    <table style=\"width:100%; border:0px solid white;\">\n"
+"                    <tr>\n"
+"                        <td width=\"75\">\n"
+"                            <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\" />\n"
+"                        </td><td style=\"font-size:15px;\">\n"
+"                            <strong>${object.user_id.name}</strong><br/>\n"
+"                            <span>Email: ${object.user_id.email or ''}</span><br/>\n"
+"                            <span>Phone: ${object.user_id.phone or ''}</span>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                    </table>\n"
+"                    % endif\n"
+"\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"\n"
+"                    <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
+"                    <p>We usually <strong>answer applications within 3 days.</strong></p>\n"
+"                    <p>\n"
+"                        Feel free to <strong>contact us if you want a faster\n"
+"                        feedback</strong> or if you don't get news from us\n"
+"                        quickly enough (just reply to this email).\n"
+"                    </p>\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"\n"
+"                    <h3 style=\"color:#9A6C8E;\"><strong>Want to learn more?</strong></h3>\n"
+"                    <ol>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\">Founders' story</a></li>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.slideshare.net/openobject/the-odoo-culture\">The Odoo Culture</a></li>\n"
+"                        <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/page/about-us\">About us</a></li>\n"
+"                    </ol>\n"
+"\n"
+"                    <hr style=\"margin: 30px 0\"/>\n"
+"\n"
+"                    % set location = ''\n"
+"                    % if object.job_id.address_id.name:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\"><strong>${object.job_id.address_id.name}</strong></p>\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.street:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street}</p>\n"
+"                        % set location = object.job_id.address_id.street\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.street2:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street2}</p>\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
+"                    % endif\n"
+"                    <p style=\"margin:0px 0px 0px 0px;\">\n"
+"                    % if object.job_id.address_id.city:\n"
+"                        ${object.job_id.address_id.city},\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.state_id.name:\n"
+"                        ${object.job_id.address_id.state_id.name},\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
+"                    % endif\n"
+"                    % if object.job_id.address_id.zip:\n"
+"                        ${object.job_id.address_id.zip}\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
+"                    % endif\n"
+"                    </p>\n"
+"                    % if object.job_id.address_id.country_id.name:\n"
+"                        <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.country_id.name}</p>\n"
+"                        % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
+"                    % endif\n"
+"\n"
+"                </td>\n"
+"            </tr>\n"
+"            </table>\n"
+"\n"
+"            % if object.job_id.address_id:\n"
+"            <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
+"                <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+"                    <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
+"                </a>\n"
+"            </div>\n"
+"            % endif\n"
+"            <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td style=\"padding-top:10px;font-size: 12px;\">\n"
+"                            <div>Sent by ${object.company_id.name}</div>\n"
+"                            % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+"                            <div>\n"
+"                                Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">all our jobs</a>.\n"
+"                            </div>\n"
+"                            % endif\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"\n"
+"\n"
+"          </div>\n"
+"        "
 msgstr ""
 
 #. module: hr_recruitment
@@ -75,6 +412,11 @@ msgid "<span class=\"o_stat_text\">Trackers</span>"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
+msgid "<span>Folded in Recruitment Pipe: </span>"
+msgstr ""
+
+#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
 msgid "<span>New</span>"
 msgstr ""
@@ -96,7 +438,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_active
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_active
 msgid "Active"
 msgstr ""
 
@@ -180,10 +521,8 @@ msgid "Applicant's Name"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:92
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_tree_view_job
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_calendar_view
-#, python-format
 msgid "Applicants"
 msgstr ""
 
@@ -212,16 +551,6 @@ msgid "Application Summary"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest
-msgid "Application approved"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse
-msgid "Application refused"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
 msgid "Application(s)"
 msgstr ""
@@ -240,19 +569,11 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_job_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_job_id
 msgid "Applied Job"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_hr_appraisal
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Appraisals"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_priority
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_priority
 msgid "Appreciation"
 msgstr ""
 
@@ -273,23 +594,13 @@ msgid "Attachments"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_availability
-msgid "Availability"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_delay_close
-msgid "Avg. Delay to Close"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_salary_exp_avg
-msgid "Avg. Expected Salary"
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_template_id
+msgid "Automated Email"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_salary_prop_avg
-msgid "Avg. Proposed Salary"
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_availability
+msgid "Availability"
 msgstr ""
 
 #. module: hr_recruitment
@@ -298,26 +609,21 @@ msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.filters,name:hr_recruitment.filter_recruitment_report_departmnet
+#: model:ir.filters,name:hr_recruitment.hr_applicant_filter_department
 msgid "By Department"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.filters,name:hr_recruitment.filter_recruitment_report_job
+#: model:ir.filters,name:hr_recruitment.hr_applicant_filter_job
 msgid "By Job"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.filters,name:hr_recruitment.filter_recruitment_report_recruiter
+#: model:ir.filters,name:hr_recruitment.hr_applicant_filter_recruiter
 msgid "By Recruiter"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Cancel"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_graph_view_job
 msgid "Cases By Stage and Estimates"
 msgstr ""
@@ -351,7 +657,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_date_closed
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_date_closed
 msgid "Closed"
 msgstr ""
 
@@ -364,8 +669,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_company_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_company_id
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Company"
 msgstr ""
 
@@ -375,24 +679,19 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Configure HR Recruitment"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_configuration
 msgid "Configure Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:349
+#: code:addons/hr_recruitment/models/hr_recruitment.py:350
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_id
 #, python-format
 msgid "Contact"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:351
+#: code:addons/hr_recruitment/models/hr_recruitment.py:352
 #, python-format
 msgid "Contact Email"
 msgstr ""
@@ -413,8 +712,8 @@ msgid "Create"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_date_create
-msgid "Create Date"
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Create & Edit"
 msgstr ""
 
 #. module: hr_recruitment
@@ -441,7 +740,6 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_create_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_create_uid
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_create_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_create_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_create_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_create_uid
@@ -450,7 +748,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_create_date
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_create_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_create_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_create_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_create_date
@@ -464,7 +761,7 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Creation Week"
 msgstr ""
 
@@ -505,7 +802,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_type_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_name
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_type_id
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_degree_form
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_degree_tree
@@ -524,14 +820,18 @@ msgid "Degrees"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_delay_close
+msgid "Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
 msgid "Delete"
 msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_department_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_department_id
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Department"
 msgstr ""
 
@@ -559,9 +859,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_display_name
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_display_name
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_display_name
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_display_name
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_display_name
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_display_name
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_display_name
 msgid "Display Name"
@@ -639,7 +937,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
-#: selection:hr.recruitment.report,priority:0
 msgid "Excellent"
 msgstr ""
 
@@ -659,7 +956,7 @@ msgid "Expected Salary Extra"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Extended Filters"
 msgstr ""
 
@@ -679,6 +976,11 @@ msgid "Folded in Recruitment Pipe"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_degree_sequence
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
@@ -690,7 +992,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
-#: selection:hr.recruitment.report,priority:0
 msgid "Good"
 msgstr ""
 
@@ -700,8 +1001,8 @@ msgid "Graduate"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
 msgid "Group By"
 msgstr ""
 
@@ -723,9 +1024,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_id
 msgid "ID"
@@ -747,18 +1046,25 @@ msgid "If the active field is set to false, it will allow you to hide the case w
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_hr_recruitment_survey
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Interview Forms"
 msgstr ""
 
 #. module: hr_recruitment
+#: code:addons/hr_recruitment/models/hr_job.py:94
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+#, python-format
 msgid "Job"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations
+msgid "Job Application Confirmation: ${object.job_id.name | safe}"
+msgstr ""
+
+#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_pivot_view_job
 msgid "Job Applications"
 msgstr ""
@@ -807,7 +1113,7 @@ msgid "Job Positions"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Job Posting"
 msgstr ""
 
@@ -817,7 +1123,7 @@ msgid "Job Specific"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Jobs"
 msgstr ""
 
@@ -834,9 +1140,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant___last_update
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category___last_update
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings___last_update
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree___last_update
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report___last_update
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source___last_update
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage___last_update
 msgid "Last Modified on"
@@ -844,13 +1148,11 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_last_stage_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_last_stage_id
 msgid "Last Stage"
 msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_date_last_stage_update
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_date_last_stage_update
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
 msgid "Last Stage Update"
 msgstr ""
@@ -858,7 +1160,6 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_write_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_write_uid
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_write_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_write_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_write_uid
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_write_uid
@@ -867,7 +1168,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_write_date
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_write_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_write_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_write_date
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_write_date
@@ -875,6 +1175,11 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: hr_recruitment
 #. openerp-web
 #: code:addons/hr_recruitment/static/src/js/tour.js:16
 #, python-format
@@ -892,11 +1197,6 @@ msgid "Master Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_medium_id
-msgid "Medium"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_mobile
 msgid "Mobile"
 msgstr ""
@@ -922,7 +1222,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "New"
 msgstr ""
 
@@ -948,7 +1248,7 @@ msgid "New Applications"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:412
+#: code:addons/hr_recruitment/models/hr_recruitment.py:426
 #, python-format
 msgid "New Employee %s Hired"
 msgstr ""
@@ -980,7 +1280,7 @@ msgid "Next Activities"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:367
+#: code:addons/hr_recruitment/models/hr_recruitment.py:368
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -992,7 +1292,6 @@ msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
-#: selection:hr.recruitment.report,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1002,8 +1301,8 @@ msgid "Number of Attachments"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_report_delay_close
-msgid "Number of Days to close the project issue"
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_delay_close
+msgid "Number of Delay to close"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1031,7 +1330,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
 msgid "Once a job position is created, you can track related applications\n"
-"                  and manage the recruitment process."
+"              and manage the recruitment process."
 msgstr ""
 
 #. module: hr_recruitment
@@ -1042,13 +1341,13 @@ msgid "Once a job position is created, you can track the applicants\n"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Ongoing"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_website_hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_website_hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Online Posting"
 msgstr ""
 
@@ -1058,16 +1357,6 @@ msgid "Optional ID of a thread (record) to which all incoming messages will be a
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Organise appraisals for your employees"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_alias_user_id
 msgid "Owner"
 msgstr ""
@@ -1088,11 +1377,6 @@ msgid "Parent model holding the alias. The model holding the alias reference is
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_partner_id
-msgid "Partner"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id
 msgid "Person responsible of validating the employee's contracts."
 msgstr ""
@@ -1127,16 +1411,11 @@ msgid "Proposed Salary Extra"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Publish available jobs on your website"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_alias_force_thread_id
 msgid "Record Thread ID"
 msgstr ""
@@ -1153,12 +1432,12 @@ msgid "Recruitment / Applicants Stages"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_filtered_department
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_filtered_job
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_graph
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_pivot
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_action_analysis
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_graph
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_pivot
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Recruitment Analysis"
 msgstr ""
 
@@ -1168,7 +1447,7 @@ msgid "Recruitment Done"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Recruitment Process"
 msgstr ""
 
@@ -1183,11 +1462,6 @@ msgid "Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
-msgid "Recruitments Statistics"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_reference
 msgid "Referred By"
 msgstr ""
@@ -1198,7 +1472,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Refused"
 msgstr ""
 
@@ -1209,7 +1483,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.report_hr_recruitment
-msgid "Reporting"
+msgid "Reports"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1220,8 +1494,8 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_user_id
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
 msgid "Responsible"
 msgstr ""
 
@@ -1232,11 +1506,6 @@ msgid "Resumes and Letters"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_salary_exp
-msgid "Salary Expected"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_salary_expected
 msgid "Salary Expected by Applicant"
 msgstr ""
@@ -1247,11 +1516,6 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_salary_prop
-msgid "Salary Proposed"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_salary_proposed
 msgid "Salary Proposed by the Organisation"
 msgstr ""
@@ -1262,16 +1526,6 @@ msgid "Salary Proposed by the Organisation, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
 msgid "Schedule Interview"
 msgstr ""
@@ -1287,11 +1541,6 @@ msgid "Search Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "Send, sign and approve documents online"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_sequence
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_sequence
 msgid "Sequence"
@@ -1309,7 +1558,6 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_source_id
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_source_id
 msgid "Source"
 msgstr ""
@@ -1338,10 +1586,9 @@ msgstr ""
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_stage_id
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_stage_id
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_stage_form
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
 msgid "Stage"
 msgstr ""
 
@@ -1451,21 +1698,11 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "This Year"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_report_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_report_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
 msgid "This menu helps you search through resumes and motivation\n"
 "                letters. Odoo automatically indexes .PDF, .DOC, DOCX, .TXT\n"
@@ -1491,8 +1728,8 @@ msgid "Try to send an email to this address, it will create an application autom
 msgstr ""
 
 #. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
 msgid "Unassigned"
 msgstr ""
 
@@ -1504,31 +1741,21 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_write_date
 msgid "Update Date"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Use interview forms during recruitment process"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Use interview forms tailored to each job position during the recruitment process. Select the form to use in the job position detail form. This relies on Survey app."
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_template_id
-msgid "Use template"
-msgstr ""
-
-#. module: hr_recruitment
 #. openerp-web
 #: code:addons/hr_recruitment/static/src/js/tour.js:25
 #, python-format
@@ -1536,18 +1763,12 @@ msgid "Use the breadcrumbs to <b>go back to the dashboard</b>."
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_user_id
-msgid "User"
-msgstr ""
-
-#. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_user_email
 msgid "User Email"
 msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
-#: selection:hr.recruitment.report,priority:0
 msgid "Very Good"
 msgstr ""
 
@@ -1576,30 +1797,34 @@ msgid "With just a quick glance on the Odoo employee screen, you\n"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:416
+#: code:addons/hr_recruitment/models/hr_recruitment.py:430
 #, python-format
 msgid "You must define an Applied Job and a Contact Name for this applicant."
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
-msgid "e.g. Sales Manager"
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest
+msgid "Your Application: ${object.job_id.name | safe}"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_website_sign
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_config_settings_view_form
-msgid "eSign"
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse
+msgid "Your Job Application: ${object.job_id.name | safe}"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_config_settings
-msgid "hr.recruitment.config.settings"
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "e.g. Sales Manager"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:280
+#: code:addons/hr_recruitment/models/hr_recruitment.py:281
 #, python-format
 msgid "job applicants"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot b/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
index ddadc191ccd..484e2846c89 100644
--- a/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
+++ b/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -188,7 +188,7 @@ msgid "Interview Form"
 msgstr ""
 
 #. module: hr_recruitment_survey
-#: model:ir.ui.view,arch_db:hr_recruitment_survey.hr_recruitment_config_settings_view_form_inherit_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.res_config_settings_view_form
 msgid "Interview Forms"
 msgstr ""
 
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index bb4df9552d5..225ca2f33bc 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,22 +31,21 @@ msgid "<span>Timesheet Entries</span>"
 msgstr ""
 
 #. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.view_kanban_account_analytic_line
+msgid "<strong>Duration: </strong>"
+msgstr ""
+
+#. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "<strong>Total</strong>"
 msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_by_project
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_report
 msgid "Activities"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_activity_analysis
-msgid "Activity Analysis"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
 #: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
 msgid "All Timesheets"
@@ -69,39 +68,41 @@ msgid "Analytic Line"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Apple App Store"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_timesheet_attendance
-msgid "Attendances"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_delay
 msgid "Avg. Plan.-Eff."
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_timesheet_synchro
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_project_timesheet_synchro
 msgid "Awesome Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Cancel"
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_report
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_activity_analysis
+msgid "By Employee"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_report_by_project
+#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_report_timesheet_by_project
+msgid "By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,help:hr_timesheet.field_project_project_subtask_project_id
-#: model:ir.model.fields,help:hr_timesheet.field_project_task_subtask_project_id
-msgid "Choosing a sub-tasks project will both enable sub-tasks and set their default project (possibly the project itself)"
+#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_report_by_task
+#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_report_timesheet_by_task
+msgid "By Task"
 msgstr ""
 
 #. module: hr_timesheet
@@ -113,6 +114,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_by_project
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_report
+#: model:ir.actions.act_window,help:hr_timesheet.timesheet_action_report_by_project
+#: model:ir.actions.act_window,help:hr_timesheet.timesheet_action_report_by_task
 msgid "Click to record activities."
 msgstr ""
 
@@ -142,26 +145,12 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
-msgid "Define your Analytic Structure"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_project_task_delay_hours
 msgid "Delay Hours"
 msgstr ""
@@ -172,16 +161,13 @@ msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
 #: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
 msgid "Duration"
 msgstr ""
@@ -198,22 +184,12 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_expense
-msgid "Expenses"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_forecast
-msgid "Forecasts"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Google Chrome Store"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Google Play Store"
 msgstr ""
 
@@ -228,42 +204,12 @@ msgid "Hours Spent"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_id
-msgid "ID"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_holidays
-msgid "Leave Management"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_timesheet_holidays
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_project_timesheet_holidays
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Leaves"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Manage your resources with Gantt charts"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:res.groups,name:hr_timesheet.group_timesheet_manager
 msgid "Manager"
 msgstr ""
@@ -276,16 +222,12 @@ msgid "My Timesheets"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_parent_id
-msgid "Parent Task"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_planned
 msgid "Planned Hours"
 msgstr ""
 
 #. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_progress
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_progress
 msgid "Progress"
 msgstr ""
@@ -303,16 +245,6 @@ msgid "Project -"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Reimburse employee expenses and invoice customers"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_remaining_hours
 #: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
 msgid "Remaining Hours"
@@ -329,27 +261,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "Responsible"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Sell services and invoice time spent"
 msgstr ""
 
@@ -365,24 +288,6 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_subtask_project_id
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_subtask_project_id
-msgid "Sub-task Project"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_subtask_count
-msgid "Sub-task count"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_project_task_sub_task
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_child_ids
-#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
-msgid "Sub-tasks"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_project_task_children_hours
 msgid "Sub-tasks Hours"
 msgstr ""
@@ -393,7 +298,7 @@ msgid "Sum of the planned hours of all sub-tasks (when a sub-task is closed or i
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Synchronize time spent with web/mobile app"
 msgstr ""
 
@@ -431,12 +336,13 @@ msgid "Time (Hours)"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_sale_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_sale_timesheet
 msgid "Time Billing"
 msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
+#: model:ir.ui.menu,name:hr_timesheet.menu_timesheets_reports_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
 #: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
 msgid "Timesheet"
@@ -449,13 +355,13 @@ msgid "Timesheet Activities"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Timesheet Apps"
 msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
-#: model:ir.actions.report.xml,name:hr_timesheet.timesheet_report
+#: model:ir.actions.report,name:hr_timesheet.timesheet_report
 msgid "Timesheet Entries"
 msgstr ""
 
@@ -499,52 +405,28 @@ msgid "Total time"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Track attendances and compare with timesheets"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
-msgid "Track leaves to optimize your scheduling"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
 msgid "User"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Validated leaves create timesheets automatically."
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_progress
-msgid "Working Time Recorded"
-msgstr ""
-
-#. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_by_project
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_report
+#: model:ir.actions.act_window,help:hr_timesheet.timesheet_action_report_by_project
+#: model:ir.actions.act_window,help:hr_timesheet.timesheet_action_report_by_task
 msgid "You can register and track your workings hours by project every\n"
 "                day. Every time spent on a project will become a cost and can be re-invoiced to\n"
 "                customers if required."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/project_timesheet.py:69
-#, python-format
-msgid "You can't define a parent task if its project is not correctly configured. The sub-task's project of the parent task's project should be this task's project"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
-msgid "You should create an analytic account structure depending on your needs to analyse costs and revenues. In Odoo, analytic accounts are also used to track customer contracts."
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_timesheet_config_settings
-msgid "hr.timesheet.config.settings"
+#: model:ir.model,name:hr_timesheet.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
index a29b7061412..8678b94c196 100644
--- a/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
+++ b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,55 +16,12 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: hr_timesheet_attendance
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
-msgid "<span class=\"o_stat_text\">Timesheet</span>"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model.fields,help:hr_timesheet_attendance.field_project_config_settings_timesheet_max_difference
-#: model:ir.model.fields,help:hr_timesheet_attendance.field_res_company_timesheet_max_difference
-msgid "Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model,name:hr_timesheet_attendance.model_hr_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_attendance
-msgid "Attendance"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_2_hr_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_attendance_count
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_attendances_ids
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
-msgid "Attendances"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model,name:hr_timesheet_attendance.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_date
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_name
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_difference
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_difference
-msgid "Difference"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
-msgid "Differences"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_display_name
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -75,37 +32,21 @@ msgstr ""
 
 #. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_id
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_id
 msgid "ID"
 msgstr ""
 
 #. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report___last_update
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_period_ids
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
-msgid "Period"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:76
 #, python-format
 msgid "Please verify that the total difference of the sheet is lower than %.2f."
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_attendance_sheet_id
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_attendance_sheet_id_computed
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_sheet_id
-msgid "Sheet"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:85
 #, python-format
 msgid "The timesheet cannot be validated as it contains an attendance record with no Check Out."
@@ -122,72 +63,22 @@ msgid "This Week"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_sheet_sheet
-msgid "Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.ui.menu,name:hr_timesheet_attendance.menu_hr_timesheet_attendance_report
 msgid "Timesheet / Attendance"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
-msgid "Timesheet Activities"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_res_company_timesheet_max_difference
-msgid "Timesheet allowed difference(Hours)"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_project_config_settings_timesheet_max_difference
-msgid "Timesheet allowed difference(Hours) *"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Account"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_by_day
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
-msgid "Timesheets"
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by Period"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_attendance
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
-msgid "Total Attendances"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_difference
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
 msgid "Total Difference"
 msgstr ""
 
 #. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
 msgid "Total Timesheet"
 msgstr ""
 
@@ -197,46 +88,17 @@ msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:98
-#, python-format
-msgid "You can not enter an attendance date outside the current timesheet dates."
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:96
-#, python-format
-msgid "You can not enter an attendance in a submitted timesheet. Ask your manager to reset it before adding attendance."
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:53
 #, python-format
 msgid "You cannot delete a timesheet that has attendance entries."
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:113
-#, python-format
-msgid "You cannot enter an attendance date outside the current timesheet dates."
-msgstr ""
-
-#. module: hr_timesheet_attendance
-#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:119
-#, python-format
-msgid "You cannot modify an entry in a confirmed timesheet"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_attendance_report
 msgid "hr.timesheet.attendance.report"
 msgstr ""
 
 #. module: hr_timesheet_attendance
-#: model:ir.model,name:hr_timesheet_attendance.model_project_config_settings
-msgid "project.config.settings"
-msgstr ""
-
-#. module: hr_timesheet_attendance
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_pivot
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
 msgid "timesheet attendance"
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index 4d92d03e025..f89053d0a9e 100644
--- a/addons/im_livechat/i18n/im_livechat.pot
+++ b/addons/im_livechat/i18n/im_livechat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -190,6 +190,21 @@ msgid "Conversation"
 msgstr ""
 
 #. module: im_livechat
+#. openerp-web
+#: code:addons/im_livechat/static/src/js/copy_clipboard.js:32
+#, python-format
+msgid "Copied !"
+msgstr ""
+
+#. module: im_livechat
+#. openerp-web
+#: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:6
+#: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:12
+#, python-format
+msgid "Copy Text"
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
 msgid "Copy and paste this code into your website, within the &lt;head&gt; tag:"
 msgstr ""
@@ -246,6 +261,17 @@ msgid "Creation date (year)"
 msgstr ""
 
 #. module: im_livechat
+#: model:ir.actions.act_window,name:im_livechat.rating_rating_action_livechat_report
+#: model:ir.ui.menu,name:im_livechat.rating_rating_menu_livechat
+msgid "Customer Ratings"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.actions.act_window,help:im_livechat.rating_rating_action_livechat_report
+msgid "Customer ratings on livechat session."
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_button_text
 msgid "Default text displayed on the Livechat Support Button"
 msgstr ""
@@ -389,6 +415,11 @@ msgid "Last 24h"
 msgstr ""
 
 #. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.rating_rating_view_search_livechat
+msgid "Last 7 days"
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel___last_update
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule___last_update
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel___last_update
@@ -442,12 +473,14 @@ msgstr ""
 #. module: im_livechat
 #. openerp-web
 #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:9
+#: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:21
 #, python-format
 msgid "Livechat"
 msgstr ""
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_im_livechat_channel
+#: model:ir.ui.view,arch_db:im_livechat.rating_rating_view_search_livechat
 msgid "Livechat Channel"
 msgstr ""
 
@@ -508,7 +541,7 @@ msgid "Name"
 msgstr ""
 
 #. module: im_livechat
-#: code:addons/im_livechat/models/mail_channel.py:126
+#: code:addons/im_livechat/models/mail_channel.py:125
 #, python-format
 msgid "No history found"
 msgstr ""
@@ -599,6 +632,26 @@ msgid "Rating: :rating_%d"
 msgstr ""
 
 #. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Rating: Bad"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Rating: Great"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Rating: Okay"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.actions.act_window,name:im_livechat.rating_rating_action_view_livechat_rating
+msgid "Ratings for livechat channel"
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
 msgid "Regular expression specifying the web pages this rule will be applied on."
 msgstr ""
@@ -631,7 +684,7 @@ msgid "Search report"
 msgstr ""
 
 #. module: im_livechat
-#: code:addons/im_livechat/models/mail_channel.py:114
+#: code:addons/im_livechat/models/mail_channel.py:113
 #, python-format
 msgid "See 15 last visited pages"
 msgstr ""
@@ -713,6 +766,11 @@ msgid "The user will be able to join support channels."
 msgstr ""
 
 #. module: im_livechat
+#: model:ir.actions.act_window,help:im_livechat.rating_rating_action_view_livechat_rating
+msgid "There is no rating for this channel at the moment."
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image
 msgid "This field holds the image used as photo for the group, limited to 1024x1024px."
 msgstr ""
@@ -803,6 +861,13 @@ msgid "e.g. YourWebsite.com"
 msgstr ""
 
 #. module: im_livechat
+#. openerp-web
+#: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:10
+#, python-format
+msgid "fa-comments"
+msgstr ""
+
+#. module: im_livechat
 #: model:ir.model,name:im_livechat.model_ir_autovacuum
 msgid "ir.autovacuum"
 msgstr ""
diff --git a/addons/link_tracker/i18n/link_tracker.pot b/addons/link_tracker/i18n/link_tracker.pot
index cfdbcf1c989..efc1285b23a 100644
--- a/addons/link_tracker/i18n/link_tracker.pot
+++ b/addons/link_tracker/i18n/link_tracker.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index c726903514e..d42c50a5e3e 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgid "Add"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:290
+#: code:addons/lunch/models/lunch.py:294
 #, python-format
 msgid "Alert"
 msgstr ""
@@ -110,6 +110,11 @@ msgid "Between"
 msgstr ""
 
 #. module: lunch
+#: model:ir.ui.view,arch_db:lunch.view_lunch_alert_kanban
+msgid "Between:"
+msgstr ""
+
+#. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search_2
 msgid "By Employee"
 msgstr ""
@@ -140,6 +145,7 @@ msgid "Can be positive (payment) or negative (order or payment if user wants to
 msgstr ""
 
 #. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban
 #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
 #: model:ir.ui.view,arch_db:lunch.view_lunch_order_line_lucky
 msgid "Cancel"
@@ -378,7 +384,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_id
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_id
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_id
-#: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id_1690
+#: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id_1781
 #: model:ir.model.fields,field_description:lunch.field_lunch_product_id
 msgid "ID"
 msgstr ""
@@ -438,14 +444,14 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:261
+#: code:addons/lunch/models/lunch.py:265
 #, python-format
 msgid "Lunch Cashmove"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:64
-#: model:ir.actions.report.xml,name:lunch.action_report_lunch_order
+#: code:addons/lunch/models/lunch.py:66
+#: model:ir.actions.report,name:lunch.action_report_lunch_order
 #: model:ir.model,name:lunch.model_lunch_order
 #: model:ir.ui.view,arch_db:lunch.report_lunch_order
 #, python-format
@@ -543,19 +549,19 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:221
+#: code:addons/lunch/models/lunch.py:225
 #, python-format
 msgid "Only your lunch manager cancels the orders."
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:190
+#: code:addons/lunch/models/lunch.py:194
 #, python-format
 msgid "Only your lunch manager processes the orders."
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:210
+#: code:addons/lunch/models/lunch.py:214
 #, python-format
 msgid "Only your lunch manager sets the orders as received."
 msgstr ""
@@ -563,6 +569,7 @@ msgstr ""
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_order_id
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_order_id
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban
 #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
 #: model:ir.ui.view,arch_db:lunch.report_lunch_order
 #: selection:lunch.cashmove,state:0
@@ -629,6 +636,11 @@ msgid "Price"
 msgstr ""
 
 #. module: lunch
+#: model:ir.ui.view,arch_db:lunch.view_lunch_product_kanban
+msgid "Price:"
+msgstr ""
+
+#. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_product_id
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_product_id
 #: model:ir.model.fields,field_description:lunch.field_lunch_product_name
@@ -681,6 +693,7 @@ msgid "Products Tree"
 msgstr ""
 
 #. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban
 #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
 msgid "Receive"
 msgstr ""
@@ -767,7 +780,7 @@ msgid "The company this user is currently working for."
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/models/lunch.py:126
+#: code:addons/lunch/models/lunch.py:129
 #, python-format
 msgid "The date of your order is in the past."
 msgstr ""
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 887f4f45271..3b47d579da3 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgid "\n"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:665
+#: code:addons/mail/models/mail_channel.py:672
 #, python-format
 msgid " This channel is private. People must be invited to join it."
 msgstr ""
@@ -122,26 +122,26 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:62
+#: code:addons/mail/static/src/js/chat_manager.js:63
 #, python-format
 msgid "%d Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:32
 #, python-format
 msgid "%d days overdue"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:253
+#: code:addons/mail/models/mail_template.py:248
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:236
 #, python-format
 msgid "%s created"
 msgstr ""
@@ -154,7 +154,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:94
+#: code:addons/mail/static/src/xml/client_action.xml:211
+#, python-format
+msgid "&nbsp;("
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:179
 #, python-format
 msgid "(from"
 msgstr ""
@@ -166,13 +173,48 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:195
+#: code:addons/mail/static/src/xml/activity.xml:51
+#, python-format
+msgid ", due to"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:45
+#, python-format
+msgid ", on"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:331
 #, python-format
 msgid "-------- Show older messages --------"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:669
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:78
+#, python-format
+msgid "0 Future"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:74
+#, python-format
+msgid "0 Late"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:76
+#, python-format
+msgid "0 Today"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:676
 #, python-format
 msgid "<br><br>\n"
 "            You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
@@ -182,14 +224,14 @@ msgid "<br><br>\n"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:576
+#: code:addons/mail/models/mail_channel.py:582
 #, python-format
 msgid "<div class=\"o_mail_notification\">created <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:499
-#: code:addons/mail/models/mail_channel.py:552
+#: code:addons/mail/models/mail_channel.py:506
+#: code:addons/mail/models/mail_channel.py:559
 #, python-format
 msgid "<div class=\"o_mail_notification\">joined <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
 msgstr ""
@@ -314,7 +356,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_move_message_needaction
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
@@ -326,6 +367,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
 #: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
@@ -340,10 +382,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
@@ -354,10 +396,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
 #: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_needaction
 #: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
 #: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_needaction
 #: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
 #: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
@@ -368,8 +408,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_needaction
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
 msgid "Action Needed"
@@ -392,6 +432,8 @@ msgid "Active domain"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:87
 #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids
 #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids
 #: model:ir.model.fields,field_description:mail.field_event_track_activity_ids
@@ -403,7 +445,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_ids
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_ids
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_ids
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_ids
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_ids
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_ids
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_ids
@@ -411,10 +453,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_sale_order_activity_ids
 #: model:ir.model.fields,field_description:mail.field_stock_picking_activity_ids
 #: model:ir.model.fields,field_description:mail.field_survey_survey_activity_ids
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
 #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 #: model:mail.message.subtype,name:mail.mt_activities
+#, python-format
 msgid "Activities"
 msgstr ""
 
@@ -441,20 +484,27 @@ msgstr ""
 #. module: mail
 #: model:ir.actions.act_window,name:mail.mail_activity_type_action
 #: model:ir.ui.menu,name:mail.menu_mail_activity_type
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Activity Types"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:80
+#: code:addons/mail/static/src/xml/activity.xml:37
+#, python-format
+msgid "Activity type"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:87
 #, python-format
 msgid "Add"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:65
+#: code:addons/mail/static/src/xml/followers.xml:64
 #: model:ir.model.fields,field_description:mail.field_ir_act_server_channel_ids
 #, python-format
 msgid "Add Channels"
@@ -462,7 +512,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:62
+#: code:addons/mail/static/src/xml/followers.xml:61
 #: model:ir.model.fields,field_description:mail.field_ir_act_server_partner_ids
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #, python-format
@@ -477,13 +527,20 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:39
-#: code:addons/mail/static/src/xml/client_action.xml:56
+#: code:addons/mail/static/src/xml/client_action.xml:41
+#: code:addons/mail/static/src/xml/client_action.xml:186
 #, python-format
 msgid "Add a channel"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:60
+#, python-format
+msgid "Add a private channel"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 msgid "Add channels to notify..."
 msgstr ""
@@ -529,8 +586,7 @@ msgid "Alias Contact Security"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_base_config_settings_alias_domain
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_config_settings_alias_domain
+#: model:ir.model.fields,field_description:mail.field_res_config_settings_alias_domain
 msgid "Alias Domain"
 msgstr ""
 
@@ -566,7 +622,8 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
+#: code:addons/mail/static/src/xml/systray.xml:17
+#: code:addons/mail/static/src/xml/systray.xml:28
 #, python-format
 msgid "All"
 msgstr ""
@@ -578,7 +635,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:191
+#: code:addons/mail/static/src/js/chat_manager.js:198
 #, python-format
 msgid "Anonymous"
 msgstr ""
@@ -599,13 +656,16 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:330
+#: code:addons/mail/static/src/js/followers.js:333
 #, python-format
 msgid "Apply"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:47
 #: model:ir.model.fields,field_description:mail.field_mail_activity_user_id
+#, python-format
 msgid "Assigned to"
 msgstr ""
 
@@ -700,7 +760,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:87
+#: code:addons/mail/static/src/xml/followers.xml:89
 #, python-format
 msgid "Be careful with channels following internal notifications"
 msgstr ""
@@ -731,7 +791,8 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:338
+#: code:addons/mail/static/src/js/followers.js:341
+#: code:addons/mail/static/src/xml/activity.xml:67
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
 #: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -771,6 +832,18 @@ msgid "Carbon copy recipients (placeholders may be used here)"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_activity_category
+#: model:ir.model.fields,help:mail.field_mail_activity_type_category
+msgid "Categories may trigger specific behavior like opening calendar view"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_category
+msgid "Category"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
 #: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
 #: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
@@ -806,9 +879,10 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:35
-#: code:addons/mail/static/src/xml/client_action.xml:126
-#: code:addons/mail/static/src/xml/systray.xml:22
+#: code:addons/mail/static/src/xml/client_action.xml:36
+#: code:addons/mail/static/src/xml/client_action.xml:172
+#: code:addons/mail/static/src/xml/systray.xml:19
+#: code:addons/mail/static/src/xml/systray.xml:36
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
@@ -830,7 +904,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/xml/client_action.xml:168
+#: code:addons/mail/static/src/xml/systray.xml:18
+#: code:addons/mail/static/src/xml/systray.xml:32
 #: model:ir.actions.client,name:mail.mail_channel_action_client_chat
 #, python-format
 msgid "Chat"
@@ -860,13 +936,13 @@ msgid "Choose an example"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:340
+#: code:addons/mail/models/mail_thread.py:342
 #, python-format
 msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:356
+#: code:addons/mail/models/mail_thread.py:358
 #, python-format
 msgid "Click here to add new %s"
 msgstr ""
@@ -929,18 +1005,25 @@ msgid "Composition mode"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Configure your activity types"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:24
+#: code:addons/mail/static/src/xml/thread.xml:109
 #, python-format
 msgid "Congratulations, your inbox is empty"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:645
+#, python-format
+msgid "Congratulations, your inbox is empty!"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_partner
 msgid "Contact"
 msgstr ""
@@ -971,7 +1054,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:14
+#: code:addons/mail/static/src/xml/systray.xml:6
 #, python-format
 msgid "Conversations"
 msgstr ""
@@ -984,7 +1067,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:322
+#: code:addons/mail/static/src/js/client_action.js:305
 #, python-format
 msgid "Create %s"
 msgstr ""
@@ -995,7 +1078,10 @@ msgid "Create Date"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:41
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#, python-format
 msgid "Created By"
 msgstr ""
 
@@ -1014,6 +1100,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_template_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_test_create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid
 msgid "Created by"
@@ -1033,6 +1120,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_template_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_test_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date
 msgid "Created on"
@@ -1052,12 +1140,6 @@ msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_partner.py:21
-#, python-format
-msgid "Customers"
-msgstr ""
-
-#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
 #: model:ir.model.fields,field_description:mail.field_mail_mail_date
 #: model:ir.model.fields,field_description:mail.field_mail_message_date
@@ -1070,7 +1152,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_last_post
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_last_post
 #: model:ir.model.fields,help:mail.field_account_invoice_message_last_post
-#: model:ir.model.fields,help:mail.field_account_move_message_last_post
 #: model:ir.model.fields,help:mail.field_account_payment_message_last_post
 #: model:ir.model.fields,help:mail.field_account_voucher_message_last_post
 #: model:ir.model.fields,help:mail.field_blog_blog_message_last_post
@@ -1082,6 +1163,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_event_event_message_last_post
 #: model:ir.model.fields,help:mail.field_event_registration_message_last_post
 #: model:ir.model.fields,help:mail.field_event_track_message_last_post
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_last_post
 #: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
 #: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
 #: model:ir.model.fields,help:mail.field_forum_post_message_last_post
@@ -1096,10 +1178,10 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
 #: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
 #: model:ir.model.fields,help:mail.field_hr_job_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_channel_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_test_message_last_post
+#: model:ir.model.fields,help:mail.field_mail_test_simple_message_last_post
 #: model:ir.model.fields,help:mail.field_mail_thread_message_last_post
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_last_post
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_last_post
@@ -1110,10 +1192,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
 #: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
 #: model:ir.model.fields,help:mail.field_note_note_message_last_post
-#: model:ir.model.fields,help:mail.field_procurement_order_message_last_post
 #: model:ir.model.fields,help:mail.field_product_product_message_last_post
 #: model:ir.model.fields,help:mail.field_product_template_message_last_post
-#: model:ir.model.fields,help:mail.field_project_issue_message_last_post
 #: model:ir.model.fields,help:mail.field_project_project_message_last_post
 #: model:ir.model.fields,help:mail.field_project_task_message_last_post
 #: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
@@ -1124,8 +1204,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
 #: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
 #: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
+#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_last_post
 #: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_last_post
 #: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
 #: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
 msgid "Date of the last message posted on the record."
@@ -1194,7 +1274,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:184
+#: code:addons/mail/static/src/xml/thread.xml:320
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
@@ -1209,6 +1289,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_description
 #: model:ir.model.fields,field_description:mail.field_mail_test_description
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_description
 #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
 msgid "Description"
 msgstr ""
@@ -1220,14 +1301,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:44
+#: code:addons/mail/static/src/xml/client_action.xml:46
 #, python-format
 msgid "Direct Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:52
+#: code:addons/mail/static/src/xml/activity.xml:83
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 #, python-format
 msgid "Discard"
@@ -1235,7 +1316,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Discuss"
 msgstr ""
 
@@ -1267,6 +1348,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_template_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_test_display_name
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_thread_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_display_name
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_display_name
@@ -1302,26 +1384,42 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:50
+#: code:addons/mail/static/src/xml/activity.xml:81
 #, python-format
 msgid "Done"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:48
+#: code:addons/mail/static/src/xml/activity.xml:79
 #, python-format
 msgid "Done & Schedule Next"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:296
+#, python-format
+msgid "Download this PDF"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:272
+#: code:addons/mail/static/src/xml/thread.xml:285
+#: code:addons/mail/static/src/xml/thread.xml:308
+#, python-format
+msgid "Download this attachment"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
 msgid "Due Date"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:38
 #, python-format
 msgid "Due in %d days"
 msgstr ""
@@ -1333,21 +1431,21 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:30
+#: code:addons/mail/static/src/xml/activity.xml:64
 #, python-format
 msgid "Edit"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/followers.js:327
+#: code:addons/mail/static/src/js/followers.js:330
 #, python-format
 msgid "Edit Subscription of "
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:50
+#: code:addons/mail/static/src/xml/followers.xml:49
 #, python-format
 msgid "Edit subscription"
 msgstr ""
@@ -1378,6 +1476,11 @@ msgid "Email Configuration"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_email_from
+msgid "Email From"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_preview_form
 msgid "Email Preview"
 msgstr ""
@@ -1449,13 +1552,13 @@ msgid "Emails"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/update.py:101
+#: code:addons/mail/models/update.py:98
 #, python-format
 msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:304
+#: code:addons/mail/models/mail_mail.py:302
 #, python-format
 msgid "Error without exception. Probably due do sending an email without computed recipients."
 msgstr ""
@@ -1492,8 +1595,7 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_base_config_settings_fail_counter
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_config_settings_fail_counter
+#: model:ir.model.fields,field_description:mail.field_res_config_settings_fail_counter
 msgid "Fail Mail"
 msgstr ""
 
@@ -1503,7 +1605,7 @@ msgid "Failed"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:392
+#: code:addons/mail/models/mail_template.py:374
 #, python-format
 msgid "Failed to render template %r using values %r"
 msgstr ""
@@ -1529,7 +1631,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:192
+#: code:addons/mail/static/src/js/activity.js:209
 #: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
 #, python-format
 msgid "Feedback"
@@ -1542,7 +1644,7 @@ msgid "Field"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:23
+#: code:addons/mail/models/ir_model.py:24
 #, python-format
 msgid "Field \"Mail Thread\" cannot be changed to \"False\"."
 msgstr ""
@@ -1580,8 +1682,8 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:694
-#: code:addons/mail/static/src/xml/followers.xml:21
+#: code:addons/mail/models/mail_thread.py:696
+#: code:addons/mail/static/src/xml/followers.xml:20
 #, python-format
 msgid "Follow"
 msgstr ""
@@ -1592,7 +1694,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_move_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
@@ -1604,6 +1705,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
@@ -1618,10 +1720,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
@@ -1632,10 +1734,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
@@ -1646,8 +1746,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
 #: model:ir.ui.menu,name:mail.menu_email_followers
@@ -1660,7 +1760,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_move_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
@@ -1672,6 +1771,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
@@ -1686,10 +1786,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
@@ -1700,10 +1800,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
@@ -1714,8 +1812,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
 msgid "Followers (Channels)"
@@ -1726,7 +1824,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_move_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
@@ -1738,6 +1835,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
@@ -1752,10 +1850,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
@@ -1766,10 +1864,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
@@ -1780,8 +1876,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
 msgid "Followers (Partners)"
@@ -1793,13 +1889,20 @@ msgid "Followers Form"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:15
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
 #: selection:mail.alias,alias_contact:0
 msgid "Followers only"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:25
+#: code:addons/mail/static/src/xml/followers.xml:24
 #, python-format
 msgid "Following"
 msgstr ""
@@ -1821,6 +1924,19 @@ msgid "From"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:77
+#, python-format
+msgid "Future"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+msgid "Future Activities"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_message_form
 msgid "Gateway"
 msgstr ""
@@ -1902,6 +2018,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_id
 #: model:ir.model.fields,field_description:mail.field_mail_template_id
 #: model:ir.model.fields,field_description:mail.field_mail_test_id
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_id
 #: model:ir.model.fields,field_description:mail.field_mail_thread_id
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_id
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_id
@@ -1931,7 +2048,8 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:112
+#: code:addons/mail/static/src/xml/client_action.xml:119
+#: code:addons/mail/static/src/xml/client_action.xml:203
 #, python-format
 msgid "Idle"
 msgstr ""
@@ -1941,7 +2059,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
 #: model:ir.model.fields,help:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,help:mail.field_account_move_message_unread
 #: model:ir.model.fields,help:mail.field_account_payment_message_unread
 #: model:ir.model.fields,help:mail.field_account_voucher_message_unread
 #: model:ir.model.fields,help:mail.field_blog_blog_message_unread
@@ -1953,6 +2070,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_event_event_message_unread
 #: model:ir.model.fields,help:mail.field_event_registration_message_unread
 #: model:ir.model.fields,help:mail.field_event_track_message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread
 #: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
 #: model:ir.model.fields,help:mail.field_forum_forum_message_unread
 #: model:ir.model.fields,help:mail.field_forum_post_message_unread
@@ -1967,10 +2085,10 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
 #: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
 #: model:ir.model.fields,help:mail.field_hr_job_message_unread
-#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread
 #: model:ir.model.fields,help:mail.field_mail_channel_message_unread
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread
 #: model:ir.model.fields,help:mail.field_mail_test_message_unread
+#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread
 #: model:ir.model.fields,help:mail.field_mail_thread_message_unread
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
@@ -1981,10 +2099,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
 #: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
 #: model:ir.model.fields,help:mail.field_note_note_message_unread
-#: model:ir.model.fields,help:mail.field_procurement_order_message_unread
 #: model:ir.model.fields,help:mail.field_product_product_message_unread
 #: model:ir.model.fields,help:mail.field_product_template_message_unread
-#: model:ir.model.fields,help:mail.field_project_issue_message_unread
 #: model:ir.model.fields,help:mail.field_project_project_message_unread
 #: model:ir.model.fields,help:mail.field_project_task_message_unread
 #: model:ir.model.fields,help:mail.field_purchase_order_message_unread
@@ -1995,8 +2111,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_slide_channel_message_unread
 #: model:ir.model.fields,help:mail.field_slide_slide_message_unread
 #: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread
 #: model:ir.model.fields,help:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_unread
 #: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
 #: model:ir.model.fields,help:mail.field_survey_survey_message_unread
 msgid "If checked new messages require your attention."
@@ -2007,7 +2123,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
 #: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
-#: model:ir.model.fields,help:mail.field_account_move_message_needaction
 #: model:ir.model.fields,help:mail.field_account_payment_message_needaction
 #: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
 #: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
@@ -2019,6 +2134,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_event_event_message_needaction
 #: model:ir.model.fields,help:mail.field_event_registration_message_needaction
 #: model:ir.model.fields,help:mail.field_event_track_message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction
 #: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
 #: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
 #: model:ir.model.fields,help:mail.field_forum_post_message_needaction
@@ -2033,10 +2149,10 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
 #: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
 #: model:ir.model.fields,help:mail.field_hr_job_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction
 #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction
 #: model:ir.model.fields,help:mail.field_mail_test_message_needaction
+#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction
 #: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
@@ -2047,10 +2163,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
 #: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
 #: model:ir.model.fields,help:mail.field_note_note_message_needaction
-#: model:ir.model.fields,help:mail.field_procurement_order_message_needaction
 #: model:ir.model.fields,help:mail.field_product_product_message_needaction
 #: model:ir.model.fields,help:mail.field_product_template_message_needaction
-#: model:ir.model.fields,help:mail.field_project_issue_message_needaction
 #: model:ir.model.fields,help:mail.field_project_project_message_needaction
 #: model:ir.model.fields,help:mail.field_project_task_message_needaction
 #: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
@@ -2061,8 +2175,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
 #: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
 #: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction
 #: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_needaction
 #: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
 #: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
 msgid "If checked, new messages require your attention."
@@ -2097,8 +2211,7 @@ msgid "If set, the queue manager will send the email after the date. If not set,
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_base_config_settings_alias_domain
-#: model:ir.model.fields,help:mail.field_hr_timesheet_config_settings_alias_domain
+#: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain
 msgid "If you have setup a catch-all email domain redirected to the Odoo server, enter the domain name here."
 msgstr ""
 
@@ -2110,9 +2223,10 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:639
+#: code:addons/mail/static/src/js/chat_manager.js:655
 #: code:addons/mail/static/src/xml/client_action.xml:22
-#: code:addons/mail/static/src/xml/systray.xml:6
+#: code:addons/mail/static/src/xml/client_action.xml:154
+#: code:addons/mail/static/src/xml/client_action.xml:164
 #, python-format
 msgid "Inbox"
 msgstr ""
@@ -2143,20 +2257,20 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:1782
+#: code:addons/mail/models/mail_thread.py:1790
 #, python-format
 msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/controllers/main.py:43
+#: code:addons/mail/controllers/main.py:41
 #, python-format
 msgid "Invalid token in route %s"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:567
+#: code:addons/mail/static/src/js/chat_manager.js:579
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -2169,8 +2283,8 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:39
-#: code:addons/mail/static/src/xml/client_action.xml:127
+#: code:addons/mail/static/src/js/client_action.js:44
+#: code:addons/mail/static/src/xml/client_action.xml:133
 #, python-format
 msgid "Invite"
 msgstr ""
@@ -2184,15 +2298,15 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:127
+#: code:addons/mail/static/src/js/client_action.js:31
+#: code:addons/mail/static/src/xml/client_action.xml:133
 #, python-format
 msgid "Invite people"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:646
+#: code:addons/mail/static/src/js/client_action.js:865
 #, python-format
 msgid "Invite people to #%s"
 msgstr ""
@@ -2212,7 +2326,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_move_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
@@ -2224,6 +2337,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
@@ -2238,10 +2352,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
@@ -2252,10 +2366,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
@@ -2266,8 +2378,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
 msgid "Is Follower"
@@ -2319,7 +2431,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_last_post
-#: model:ir.model.fields,field_description:mail.field_account_move_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_last_post
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_last_post
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_last_post
@@ -2331,6 +2442,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
 #: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_last_post
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
@@ -2345,10 +2457,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_last_post
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_last_post
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_last_post
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_last_post
@@ -2359,10 +2471,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
 #: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_last_post
 #: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
 #: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_last_post
 #: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
 #: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
@@ -2373,8 +2483,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_last_post
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_last_post
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
 msgid "Last Message Date"
@@ -2398,6 +2508,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_template___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_test___last_update
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_thread___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value___last_update
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite___last_update
@@ -2430,6 +2541,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_message_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_template_write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_test_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_uid
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid
@@ -2450,6 +2562,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_message_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_shortcode_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_template_write_date
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_test_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_date
 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date
@@ -2457,14 +2570,27 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:73
+#, python-format
+msgid "Late"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+msgid "Late Activities"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
 msgid "Leave"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_channel.py:678
-#: code:addons/mail/static/src/xml/client_action.xml:105
+#: code:addons/mail/models/mail_channel.py:685
+#: code:addons/mail/static/src/xml/client_action.xml:112
 #, python-format
 msgid "Leave this channel"
 msgstr ""
@@ -2480,7 +2606,7 @@ msgid "List of partners that will be added as follower of the current document."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:689
+#: code:addons/mail/models/mail_channel.py:696
 #, python-format
 msgid "List users in the current channel"
 msgstr ""
@@ -2503,13 +2629,14 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/chatter_composer.js:31
+#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Log"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:57
+#: code:addons/mail/static/src/xml/chatter.xml:53
 #, python-format
 msgid "Log a note. Followers will not be notified."
 msgstr ""
@@ -2532,34 +2659,19 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:57
+#: code:addons/mail/static/src/xml/chatter.xml:53
 #, python-format
-msgid "Log an internal note"
+msgid "Log note"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:12
-#, python-format
-msgid "Log an internal note which will not be sent to followers, but which can be read\n"
-"                    by users accessing this document."
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/xml/chatter.xml:56
 #, python-format
 msgid "Log or schedule an activity"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
-#, python-format
-msgid "Lor or schedule an activity"
-msgstr ""
-
-#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mail_message_mail_activity_type_id
@@ -2573,7 +2685,7 @@ msgid "Mail Channel Form"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:371
+#: code:addons/mail/models/mail_mail.py:369
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr ""
@@ -2607,20 +2719,22 @@ msgid "Mailing Opt-Out"
 msgstr ""
 
 #. module: mail
-#: model:mail.activity.type,summary:mail.mail_activity_data_call
-msgid "Make a Call"
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:61
+#, python-format
+msgid "Mark Done"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:128
+#: code:addons/mail/static/src/xml/client_action.xml:134
 #, python-format
 msgid "Mark all as read"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:128
+#: code:addons/mail/static/src/xml/client_action.xml:134
 #, python-format
 msgid "Mark all read"
 msgstr ""
@@ -2632,15 +2746,15 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:121
+#: code:addons/mail/static/src/xml/thread.xml:206
 #, python-format
 msgid "Mark as Read"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:68
-#: code:addons/mail/static/src/xml/thread.xml:115
+#: code:addons/mail/static/src/xml/thread.xml:153
+#: code:addons/mail/static/src/xml/thread.xml:200
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
@@ -2663,6 +2777,7 @@ msgid "Medium-sized photo of the group. It is automatically resized as a 128x128
 msgstr ""
 
 #. module: mail
+#: selection:mail.activity.type,category:0
 #: model:mail.activity.type,name:mail.mail_activity_data_meeting
 msgid "Meeting"
 msgstr ""
@@ -2721,7 +2836,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:117
+#: code:addons/mail/static/src/xml/client_action.xml:124
 #, python-format
 msgid "Message sent in \""
 msgstr ""
@@ -2771,7 +2886,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
-#: model:ir.model.fields,field_description:mail.field_account_move_message_ids
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_ids
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
@@ -2783,6 +2897,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_ids
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
 #: model:ir.model.fields,field_description:mail.field_event_track_message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_ids
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
@@ -2797,10 +2912,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_ids
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_ids
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
@@ -2811,10 +2926,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
 #: model:ir.model.fields,field_description:mail.field_note_note_message_ids
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_ids
 #: model:ir.model.fields,field_description:mail.field_product_product_message_ids
 #: model:ir.model.fields,field_description:mail.field_product_template_message_ids
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_ids
 #: model:ir.model.fields,field_description:mail.field_project_project_message_ids
 #: model:ir.model.fields,field_description:mail.field_project_task_message_ids
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
@@ -2825,8 +2938,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_ids
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_ids
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
 #: model:ir.ui.menu,name:mail.menu_mail_message
@@ -2876,6 +2989,11 @@ msgid "Models"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_base_module_uninstall
+msgid "Module Uninstallation"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 msgid "Month"
 msgstr ""
@@ -2892,6 +3010,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_channel_name
 #: model:ir.model.fields,field_description:mail.field_mail_template_name
 #: model:ir.model.fields,field_description:mail.field_mail_test_name
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_name
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
 msgid "Name"
 msgstr ""
@@ -2930,6 +3049,20 @@ msgid "Needaction Recipient"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:138
+#, python-format
+msgid "New Channel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:137
+#, python-format
+msgid "New Message"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
 msgid "New Value Char"
 msgstr ""
@@ -2961,31 +3094,31 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:54
+#: code:addons/mail/static/src/js/chat_manager.js:55
 #: code:addons/mail/static/src/js/window_manager.js:139
-#: code:addons/mail/static/src/xml/chatter.xml:54
-#: code:addons/mail/static/src/xml/systray.xml:24
+#: code:addons/mail/static/src/xml/systray.xml:12
+#: code:addons/mail/static/src/xml/systray.xml:21
 #, python-format
 msgid "New message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:146
+#: code:addons/mail/static/src/xml/thread.xml:233
 #, python-format
 msgid "New messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:25
+#: code:addons/mail/static/src/xml/thread.xml:110
 #, python-format
 msgid "New messages appear here."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:81
+#: code:addons/mail/static/src/js/client_action.js:97
 #, python-format
 msgid "New people"
 msgstr ""
@@ -3007,7 +3140,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_date_deadline
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_date_deadline
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_date_deadline
@@ -3030,7 +3163,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_summary
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_summary
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_summary
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_summary
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_summary
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_summary
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_summary
@@ -3053,7 +3186,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_type_id
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_type_id
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_type_id
@@ -3071,6 +3204,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:58
 #: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
 #, python-format
 msgid "No activities planned."
@@ -3078,6 +3212,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:47
+#, python-format
+msgid "No discussion yet..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/js/followers.js:185
 #, python-format
 msgid "No follower"
@@ -3099,7 +3240,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:28
+#: code:addons/mail/static/src/xml/thread.xml:113
 #, python-format
 msgid "No starred message"
 msgstr ""
@@ -3120,7 +3261,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:72
+#: code:addons/mail/static/src/xml/thread.xml:157
 #, python-format
 msgid "Note by"
 msgstr ""
@@ -3160,7 +3301,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_move_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
@@ -3172,6 +3312,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
@@ -3186,10 +3327,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
@@ -3200,10 +3341,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
@@ -3214,8 +3353,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
 msgid "Number of Actions"
@@ -3231,7 +3370,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_move_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
@@ -3243,6 +3381,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
@@ -3257,10 +3396,10 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_hr_job_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
@@ -3271,10 +3410,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_procurement_order_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_issue_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
@@ -3285,8 +3422,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
 #: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
 msgid "Number of messages which requires an action"
@@ -3297,7 +3434,6 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
 #: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
 #: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_move_message_unread_counter
 #: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter
 #: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
 #: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
@@ -3309,6 +3445,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
 #: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
 #: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract_message_unread_counter
 #: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
 #: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
 #: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
@@ -3323,10 +3460,10 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
 #: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
 #: model:ir.model.fields,help:mail.field_hr_job_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread_counter
 #: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter
 #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread_counter
 #: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter
+#: model:ir.model.fields,help:mail.field_mail_test_simple_message_unread_counter
 #: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
 #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
@@ -3337,10 +3474,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
 #: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
 #: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,help:mail.field_procurement_order_message_unread_counter
 #: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
 #: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_issue_message_unread_counter
 #: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
 #: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
 #: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
@@ -3351,8 +3486,8 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
 #: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
 #: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_batch_message_unread_counter
 #: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_unread_counter
 #: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
 #: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
 msgid "Number of unread messages"
@@ -3365,7 +3500,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:131
+#: code:addons/mail/static/src/js/client_action.js:893
 #, python-format
 msgid "Odoo has now the permission to send you native notifications on this device."
 msgstr ""
@@ -3379,14 +3514,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:129
+#: code:addons/mail/static/src/js/client_action.js:890
 #, python-format
 msgid "Odoo will not have the permission to send native notifications on this device."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:113
+#: code:addons/mail/static/src/xml/client_action.xml:120
 #, python-format
 msgid "Offline"
 msgstr ""
@@ -3442,13 +3577,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:111
+#: code:addons/mail/static/src/xml/client_action.xml:118
+#: code:addons/mail/static/src/xml/client_action.xml:202
 #, python-format
 msgid "Online"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/ir_model.py:21
+#: code:addons/mail/models/ir_model.py:22
 #, python-format
 msgid "Only custom models can be modified."
 msgstr ""
@@ -3470,21 +3606,21 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:131
+#: code:addons/mail/static/src/xml/client_action.xml:139
 #, python-format
 msgid "Open channel settings"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:48
+#: code:addons/mail/static/src/xml/client_action.xml:187
 #, python-format
 msgid "Open chat"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:16
+#: code:addons/mail/static/src/xml/extended_chat_window.xml:15
 #, python-format
 msgid "Open in Discuss"
 msgstr ""
@@ -3528,6 +3664,11 @@ msgid "Optional value to use if the target field is empty"
 msgstr ""
 
 #. module: mail
+#: selection:mail.activity.type,category:0
+msgid "Other"
+msgstr ""
+
+#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
 #: selection:mail.mail,state:0
 msgid "Outgoing"
@@ -3565,7 +3706,7 @@ msgstr ""
 #: selection:mrp.repair,activity_state:0
 #: selection:mrp.unbuild,activity_state:0
 #: selection:note.note,activity_state:0
-#: selection:project.issue,activity_state:0
+#: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
@@ -3576,12 +3717,6 @@ msgid "Overdue"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Override author's email"
 msgstr ""
@@ -3642,7 +3777,7 @@ msgid "Partner Mass Mailing"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/res_partner.py:33
+#: code:addons/mail/models/res_partner.py:32
 #, python-format
 msgid "Partner Profile"
 msgstr ""
@@ -3669,14 +3804,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:129
+#: code:addons/mail/static/src/js/client_action.js:889
 #, python-format
 msgid "Permission denied"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:131
+#: code:addons/mail/static/src/js/client_action.js:892
 #, python-format
 msgid "Permission granted"
 msgstr ""
@@ -3693,9 +3828,7 @@ msgid "Placeholder Expression"
 msgstr ""
 
 #. module: mail
-#. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/xml/activity.xml:5
 #: selection:crm.lead,activity_state:0
 #: selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -3707,34 +3840,47 @@ msgstr ""
 #: selection:mrp.repair,activity_state:0
 #: selection:mrp.unbuild,activity_state:0
 #: selection:note.note,activity_state:0
-#: selection:project.issue,activity_state:0
+#: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
 #: selection:sale.order,activity_state:0
 #: selection:stock.picking,activity_state:0
 #: selection:survey.survey,activity_state:0
-#, python-format
 msgid "Planned"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:157
+#: code:addons/mail/static/src/xml/activity.xml:6
+#, python-format
+msgid "Planned activities"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:282
+#, python-format
+msgid "Play this video"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chatter_composer.js:158
 #, python-format
 msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:83
+#: code:addons/mail/static/src/js/many2many_tags_email.js:84
 #, python-format
 msgid "Please complete partner's informations and Email"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:652
+#: code:addons/mail/static/src/js/composer.js:677
 #, python-format
 msgid "Please, wait while the file is uploading."
 msgstr ""
@@ -3803,14 +3949,15 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:53
+#: code:addons/mail/static/src/xml/client_action.xml:56
+#: code:addons/mail/static/src/xml/client_action.xml:176
 #, python-format
 msgid "Private Channels"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:143
+#: code:addons/mail/static/src/js/client_action.js:846
 #, python-format
 msgid "Public Channels"
 msgstr ""
@@ -3923,32 +4070,20 @@ msgid "Relation field"
 msgstr ""
 
 #. module: mail
-#: model:mail.activity.type,summary:mail.mail_activity_data_meeting
-msgid "Reminder for meeting"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:31
-#, python-format
-msgid "Remove"
-msgstr ""
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
 msgid "Remove the contextual action to use this template on related documents"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:52
+#: code:addons/mail/static/src/xml/followers.xml:51
 #, python-format
 msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:118
+#: code:addons/mail/static/src/xml/thread.xml:203
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "Reply"
@@ -3990,7 +4125,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_user_id
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_user_id
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_user_id
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_user_id
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_user_id
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_user_id
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_user_id
@@ -4018,7 +4153,7 @@ msgid "Rich-text/HTML message"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:830
+#: code:addons/mail/models/mail_thread.py:832
 #, python-format
 msgid "Routing mail with Message-Id %s: route %s: %s"
 msgstr ""
@@ -4045,7 +4180,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:36
+#: code:addons/mail/static/src/js/chat_window.js:40
 #, python-format
 msgid "Say something"
 msgstr ""
@@ -4057,6 +4192,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:57
+#, python-format
+msgid "Schedule activity"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
 #, python-format
 msgid "Schedule an activity"
@@ -4098,7 +4240,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:371
+#: code:addons/mail/static/src/js/composer.js:375
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
 #, python-format
 msgid "Send"
@@ -4110,7 +4252,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_template.py:274
+#: code:addons/mail/models/mail_template.py:264
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -4123,14 +4265,16 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:54
+#: code:addons/mail/static/src/xml/chatter.xml:50
 #, python-format
 msgid "Send a message"
 msgstr ""
 
 #. module: mail
-#: model:mail.activity.type,summary:mail.mail_activity_data_email
-msgid "Send an Email"
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:50
+#, python-format
+msgid "Send message"
 msgstr ""
 
 #. module: mail
@@ -4153,7 +4297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:101
+#: code:addons/mail/static/src/xml/client_action.xml:108
 #, python-format
 msgid "Sends messages by email"
 msgstr ""
@@ -4178,7 +4322,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:131
+#: code:addons/mail/static/src/xml/client_action.xml:139
 #, python-format
 msgid "Settings"
 msgstr ""
@@ -4206,18 +4350,12 @@ msgid "Show all records which has next action date is before today"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:658
+#: code:addons/mail/models/mail_channel.py:665
 #, python-format
 msgid "Show an helper message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_value
-#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_value
-msgid "Sidebar Button"
-msgstr ""
-
-#. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window
 #: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_act_window
 msgid "Sidebar action"
@@ -4230,12 +4368,6 @@ msgid "Sidebar action to make this template available on records of the related
 msgstr ""
 
 #. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_ref_ir_value
-#: model:ir.model.fields,help:mail.field_mail_template_ref_ir_value
-msgid "Sidebar button to open the sidebar action"
-msgstr ""
-
-#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
 #: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
 #: model:ir.model.fields,help:mail.field_mail_message_author_avatar
@@ -4265,8 +4397,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:645
+#: code:addons/mail/static/src/js/chat_manager.js:661
 #: code:addons/mail/static/src/xml/client_action.xml:28
+#: code:addons/mail/static/src/xml/client_action.xml:156
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
 #: model:ir.model.fields,field_description:mail.field_mail_mail_starred
 #: model:ir.model.fields,field_description:mail.field_mail_message_starred
@@ -4288,7 +4421,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_repair_activity_state
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_activity_state
 #: model:ir.model.fields,field_description:mail.field_note_note_activity_state
-#: model:ir.model.fields,field_description:mail.field_project_issue_activity_state
+#: model:ir.model.fields,field_description:mail.field_product_template_activity_state
 #: model:ir.model.fields,field_description:mail.field_project_task_activity_state
 #: model:ir.model.fields,field_description:mail.field_purchase_order_activity_state
 #: model:ir.model.fields,field_description:mail.field_res_partner_activity_state
@@ -4318,7 +4451,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mrp_repair_activity_state
 #: model:ir.model.fields,help:mail.field_mrp_unbuild_activity_state
 #: model:ir.model.fields,help:mail.field_note_note_activity_state
-#: model:ir.model.fields,help:mail.field_project_issue_activity_state
+#: model:ir.model.fields,help:mail.field_product_template_activity_state
 #: model:ir.model.fields,help:mail.field_project_task_activity_state
 #: model:ir.model.fields,help:mail.field_purchase_order_activity_state
 #: model:ir.model.fields,help:mail.field_res_partner_activity_state
@@ -4371,7 +4504,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:130
+#: code:addons/mail/static/src/xml/thread.xml:216
 #, python-format
 msgid "Subject:"
 msgstr ""
@@ -4385,7 +4518,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id
 #: model:ir.model.fields,field_description:mail.field_mail_followers_subtype_ids
 #: model:ir.model.fields,field_description:mail.field_mail_mail_subtype_id
-#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_1971
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_1972
 #: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
 #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
 msgid "Subtype"
@@ -4411,11 +4544,6 @@ msgid "System notification"
 msgstr ""
 
 #. module: mail
-#: model:mail.activity.type,summary:mail.mail_activity_data_todo
-msgid "Task to perform"
-msgstr ""
-
-#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
 msgid "Technical field for UX purpose"
 msgstr ""
@@ -4440,6 +4568,11 @@ msgid "Test Mail Model"
 msgstr ""
 
 #. module: mail
+#: model:ir.model,name:mail.model_mail_test_simple
+msgid "Test Simple Chatter Record"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
 msgid "The escaped html code replacing the shortcut"
 msgstr ""
@@ -4469,8 +4602,8 @@ msgid "The owner of records created upon receiving emails on this alias. If this
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:574
-#: code:addons/mail/models/mail_message.py:669
+#: code:addons/mail/models/mail_message.py:575
+#: code:addons/mail/models/mail_message.py:670
 #, python-format
 msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
 "\n"
@@ -4483,6 +4616,11 @@ msgid "The shortcut which must be replaced in the Chat Messages"
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source
+msgid "The source is replaced by this unicode character in the Chat Messages"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,help:mail.field_email_template_preview_model_id
 #: model:ir.model.fields,help:mail.field_mail_template_model_id
 msgid "The type of document this template can be used with"
@@ -4528,6 +4666,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:14
 #: code:addons/mail/static/src/xml/extended_chat_window.xml:7
 #, python-format
 msgid "To:"
@@ -4535,16 +4674,10 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:20
-#, python-format
-msgid "To: Followers of"
-msgstr ""
-
-#. module: mail
-#. openerp-web
 #: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:25
-#: code:addons/mail/static/src/js/thread.js:231
+#: code:addons/mail/static/src/js/activity.js:26
+#: code:addons/mail/static/src/js/thread.js:240
+#: code:addons/mail/static/src/xml/systray.xml:75
 #: selection:crm.lead,activity_state:0
 #: selection:event.track,activity_state:0
 #: selection:hr.applicant,activity_state:0
@@ -4556,7 +4689,7 @@ msgstr ""
 #: selection:mrp.repair,activity_state:0
 #: selection:mrp.unbuild,activity_state:0
 #: selection:note.note,activity_state:0
-#: selection:project.issue,activity_state:0
+#: selection:product.template,activity_state:0
 #: selection:project.task,activity_state:0
 #: selection:purchase.order,activity_state:0
 #: selection:res.partner,activity_state:0
@@ -4580,14 +4713,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:126
-#, python-format
-msgid "Toggle Channels"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:35
+#: code:addons/mail/static/src/js/activity.js:36
 #, python-format
 msgid "Tomorrow"
 msgstr ""
@@ -4645,21 +4771,21 @@ msgid "UUID"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_mail.py:237
+#: code:addons/mail/models/mail_mail.py:235
 #, python-format
 msgid "Unable to connect to SMTP Server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_message.py:32
+#: code:addons/mail/models/mail_message.py:31
 #, python-format
 msgid "Unable to send email, please configure the sender's email address."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/models/mail_thread.py:698
-#: code:addons/mail/static/src/xml/followers.xml:23
+#: code:addons/mail/models/mail_thread.py:700
+#: code:addons/mail/static/src/xml/followers.xml:22
 #, python-format
 msgid "Unfollow"
 msgstr ""
@@ -4670,11 +4796,15 @@ msgid "Unfortunately this email alias is already used, please choose a unique on
 msgstr ""
 
 #. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_shortcode_unicode_source
+msgid "Unicode Character"
+msgstr ""
+
+#. module: mail
 #: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
-#: model:ir.model.fields,field_description:mail.field_account_move_message_unread
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_unread
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
@@ -4686,6 +4816,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_unread
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
 #: model:ir.model.fields,field_description:mail.field_event_track_message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
@@ -4700,10 +4831,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_unread
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
@@ -4714,10 +4845,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
 #: model:ir.model.fields,field_description:mail.field_note_note_message_unread
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_unread
 #: model:ir.model.fields,field_description:mail.field_product_product_message_unread
 #: model:ir.model.fields,field_description:mail.field_product_template_message_unread
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_unread
 #: model:ir.model.fields,field_description:mail.field_project_project_message_unread
 #: model:ir.model.fields,field_description:mail.field_project_task_message_unread
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
@@ -4728,8 +4857,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_unread
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
 msgid "Unread Messages"
@@ -4740,7 +4869,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_move_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
@@ -4752,6 +4880,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
@@ -4766,10 +4895,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_hr_job_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mail_test_simple_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
@@ -4780,10 +4909,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_procurement_order_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_issue_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
@@ -4794,8 +4921,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_batch_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
 #: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
 msgid "Unread Messages Counter"
@@ -4808,48 +4935,48 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:129
+#: code:addons/mail/static/src/xml/client_action.xml:135
 #, python-format
 msgid "Unstar all"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:129
+#: code:addons/mail/static/src/xml/client_action.xml:135
 #, python-format
 msgid "Unstar all messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:130
+#: code:addons/mail/static/src/xml/client_action.xml:136
 #, python-format
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:130
+#: code:addons/mail/static/src/xml/client_action.xml:136
 #, python-format
 msgid "Unsubscribe from channel"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Upcoming Activities (7 days)"
+#: code:addons/mail/models/mail_template.py:510
+#, python-format
+msgid "Unsupported report type %s found."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:186
+#: code:addons/mail/static/src/xml/thread.xml:322
 #, python-format
 msgid "Uploading"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/composer.js:652
+#: code:addons/mail/static/src/js/composer.js:677
 #, python-format
 msgid "Uploading error"
 msgstr ""
@@ -4867,7 +4994,7 @@ msgid "Use template"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Use your own email servers"
 msgstr ""
 
@@ -4884,24 +5011,32 @@ msgid "User"
 msgstr ""
 
 #. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/extended_chat_window.xml:8
+#, python-format
+msgid "User name"
+msgstr ""
+
+#. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:702
+#: code:addons/mail/models/mail_channel.py:709
 #, python-format
 msgid "Users in this channel: %s %s and you."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com)."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:666
 #: code:addons/mail/models/mail_thread.py:668
+#: code:addons/mail/models/mail_thread.py:670
 #: model:ir.ui.view,arch_db:mail.message_user_assigned
 #, python-format
 msgid "View"
@@ -4951,54 +5086,54 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:46
+#: code:addons/mail/static/src/xml/activity.xml:77
 #, python-format
 msgid "Write Feedback"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:18
+#: code:addons/mail/static/src/xml/composer.xml:12
 #, python-format
 msgid "Write something..."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/activity.js:29
-#: code:addons/mail/static/src/js/thread.js:233
+#: code:addons/mail/static/src/js/activity.js:30
+#: code:addons/mail/static/src/js/thread.js:242
 #, python-format
 msgid "Yesterday"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:80
+#: code:addons/mail/static/src/js/client_action.js:96
 #, python-format
 msgid "You added <b>%s</b> to the conversation."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:699
+#: code:addons/mail/models/mail_channel.py:706
 #, python-format
 msgid "You are alone in this channel."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:668
+#: code:addons/mail/models/mail_channel.py:675
 #, python-format
 msgid "You are in a private conversation with <b>@%s</b>."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_channel.py:663
+#: code:addons/mail/models/mail_channel.py:670
 #, python-format
 msgid "You are in channel <b>#%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:29
+#: code:addons/mail/static/src/xml/thread.xml:114
 #, python-format
 msgid "You can mark any message as 'starred', and it shows up in this channel."
 msgstr ""
@@ -5017,7 +5152,7 @@ msgid "You cannot delete those groups, as the Whole Company group is required by
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:347
+#: code:addons/mail/models/mail_thread.py:349
 #, python-format
 msgid "You could also add a new %(document)s by sending an email to: %(email_link)s."
 msgstr ""
@@ -5029,7 +5164,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:567
+#: code:addons/mail/static/src/js/chat_manager.js:579
 #, python-format
 msgid "You have been invited to: "
 msgstr ""
@@ -5042,20 +5177,27 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:463
+#: code:addons/mail/static/src/js/chat_manager.js:473
 #, python-format
 msgid "You unpinned your conversation with <b>%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:461
+#: code:addons/mail/static/src/js/chat_manager.js:471
 #, python-format
 msgid "You unsubscribed from <b>%s</b>."
 msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:217
+#, python-format
+msgid "You:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/js/thread_field.js:83
 #, python-format
 msgid "Your message has not been sent."
@@ -5068,17 +5210,12 @@ msgid "Your template should define email_from"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:960
+#: code:addons/mail/models/mail_thread.py:963
 #, python-format
 msgid "alias %s: %s"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
-
-#. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 msgid "by"
 msgstr ""
@@ -5089,7 +5226,7 @@ msgid "created"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:313
+#: code:addons/mail/models/mail_thread.py:315
 #, python-format
 msgid "document"
 msgstr ""
@@ -5114,6 +5251,27 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:57
+#, python-format
+msgid "fa-eye-slash"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:47
+#, python-format
+msgid "fa-user"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:37
+#, python-format
+msgid "fa-users"
+msgstr ""
+
+#. module: mail
+#. openerp-web
 #: code:addons/mail/static/src/js/followers.js:189
 #, python-format
 msgid "followers"
@@ -5121,7 +5279,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:25
+#: code:addons/mail/static/src/xml/activity.xml:30
 #, python-format
 msgid "for"
 msgstr ""
@@ -5163,19 +5321,19 @@ msgid "mail.alias.mixin"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:939
+#: code:addons/mail/models/mail_thread.py:941
 #, python-format
 msgid "model %s does not accept document creation"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:934
+#: code:addons/mail/models/mail_thread.py:936
 #, python-format
 msgid "model %s does not accept document update"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:927
+#: code:addons/mail/models/mail_thread.py:929
 #, python-format
 msgid "model %s does not accept document update, fall back on document creation"
 msgstr ""
@@ -5186,40 +5344,33 @@ msgid "modified"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
 msgid "mycompany.odoo.com"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:20
+#: code:addons/mail/static/src/js/thread.js:21
 #, python-format
 msgid "now"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:91
+#: code:addons/mail/static/src/xml/thread.xml:177
 #: model:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "on"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:21
-#, python-format
-msgid "planned by"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:909
+#: code:addons/mail/models/mail_thread.py:911
 #, python-format
 msgid "posting a message without model should be with a null res_id (private message), received %s"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:915
 #, python-format
 msgid "posting a message without model should be with a parent_id (private message)"
 msgstr ""
@@ -5231,14 +5382,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:16
+#: code:addons/mail/static/src/js/thread.js:17
 #, python-format
 msgid "read less"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/thread.js:15
+#: code:addons/mail/static/src/js/thread.js:16
 #, python-format
 msgid "read more"
 msgstr ""
@@ -5249,19 +5400,24 @@ msgid "record:"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:933
 #, python-format
 msgid "reply to missing document (%s,%s)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:924
+#: code:addons/mail/models/mail_thread.py:926
 #, python-format
 msgid "reply to missing document (%s,%s), fall back on new document creation"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:909
+#: model:ir.model,name:mail.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:911
 #, python-format
 msgid "resetting thread_id"
 msgstr ""
@@ -5285,30 +5441,30 @@ msgid "restricted to known authors"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:913
-#: code:addons/mail/models/mail_thread.py:931
-#: code:addons/mail/models/mail_thread.py:934
-#: code:addons/mail/models/mail_thread.py:939
-#: code:addons/mail/models/mail_thread.py:960
+#: code:addons/mail/models/mail_thread.py:915
+#: code:addons/mail/models/mail_thread.py:933
+#: code:addons/mail/models/mail_thread.py:936
+#: code:addons/mail/models/mail_thread.py:941
+#: code:addons/mail/models/mail_thread.py:963
 #, python-format
 msgid "skipping"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:25
+#: code:addons/mail/static/src/xml/chatter.xml:20
 #, python-format
 msgid "this document"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:960
+#: code:addons/mail/models/mail_thread.py:963
 #, python-format
 msgid "unknown error"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/models/mail_thread.py:902
+#: code:addons/mail/models/mail_thread.py:904
 #, python-format
 msgid "unknown target model %s"
 msgstr ""
diff --git a/addons/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot
index 08481c1ae90..f379337d7ae 100644
--- a/addons/maintenance/i18n/maintenance.pot
+++ b/addons/maintenance/i18n/maintenance.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,6 +51,16 @@ msgid "<span>View</span>"
 msgstr ""
 
 #. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
+msgid "<strong>Equipments:</strong>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
+msgid "<strong>Maintenance:</strong>"
+msgstr ""
+
+#. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_defaults
 msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
 msgstr ""
@@ -363,7 +373,7 @@ msgid "Equipment Categories"
 msgstr ""
 
 #. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3609
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3456
 msgid "Equipment Category"
 msgstr ""
 
@@ -401,6 +411,11 @@ msgid "Follow the process of the request and communicate with the collaborator."
 msgstr ""
 
 #. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Future Activities"
+msgstr ""
+
+#. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
@@ -472,6 +487,11 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Late Activities"
+msgstr ""
+
+#. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_location
 msgid "Location"
 msgstr ""
@@ -655,7 +675,6 @@ msgid "Overall Equipment Effectiveness (OEE)"
 msgstr ""
 
 #. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
 msgid "Overdue Activities"
 msgstr ""
@@ -726,6 +745,11 @@ msgid "Ready for next stage"
 msgstr ""
 
 #. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Record Colour"
+msgstr ""
+
+#. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_force_thread_id
 msgid "Record Thread ID"
 msgstr ""
@@ -1012,12 +1036,16 @@ msgid "Unscheduled Maintenance"
 msgstr ""
 
 #. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
 msgid "Upcoming Activities (7 days)"
 msgstr ""
 
 #. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Upcoming Activities (All)"
+msgstr ""
+
+#. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
 msgid "Used in location"
 msgstr ""
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index 1879099d67d..272eabd8b3d 100644
--- a/addons/mass_mailing/i18n/mass_mailing.pot
+++ b/addons/mass_mailing/i18n/mass_mailing.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -28,17 +28,17 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
 msgid "% <br/>\n"
-"                                            <strong>Clicks</strong>"
+"                                                <strong>Clicks</strong>"
 msgstr ""
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
 msgid "%<br/>\n"
-"                                            <strong>Replied</strong>"
+"                                                <strong>Replied</strong>"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:479
+#: code:addons/mass_mailing/models/mass_mailing.py:466
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -279,7 +279,7 @@ msgid "Bounced Ratio"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3862
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3639
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
 msgid "Campaign"
 msgstr ""
@@ -292,7 +292,7 @@ msgstr ""
 
 #. module: mass_mailing
 #: model:ir.ui.menu,name:mass_mailing.menu_view_mass_mailing_stages
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "Campaign Stages"
 msgstr ""
 
@@ -312,7 +312,6 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_test_form
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
 msgid "Cancel"
 msgstr ""
 
@@ -334,11 +333,6 @@ msgid "Choose"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
-msgid "Choose among multiple email templates and styles"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_lists
 msgid "Click here to create a new mailing list."
 msgstr ""
@@ -367,6 +361,12 @@ msgid "Click to define a new mass mailing campaign."
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_clicked
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
+msgid "Clicked"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban
@@ -381,6 +381,11 @@ msgid "Color Index"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
+msgid "Colour"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
 msgid "Column Title"
 msgstr ""
@@ -396,6 +401,11 @@ msgid "Comma-separated list of email addresses."
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_company_name
 msgid "Company Name"
 msgstr ""
@@ -408,7 +418,6 @@ msgstr ""
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.action_mass_mailing_configuration
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
 msgid "Configure Mass Mailing"
 msgstr ""
 
@@ -453,7 +462,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage_create_uid
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_create_uid
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_create_uid
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_create_uid
 msgid "Created by"
 msgstr ""
 
@@ -463,7 +471,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage_create_date
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_create_date
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_create_date
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_create_date
 msgid "Created on"
 msgstr ""
 
@@ -502,6 +509,11 @@ msgid "Date of technical error leading to the email not being sent"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_clicked
+msgid "Date when customer clicked on at least one tracked link"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_scheduled
 msgid "Date when the email has been created"
 msgstr ""
@@ -551,7 +563,6 @@ msgid "Demo Signature"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
 #: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_2
 msgid "Design"
 msgstr ""
@@ -566,7 +577,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_display_name
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_display_name
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_display_name
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -586,7 +596,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:487
+#: code:addons/mass_mailing/models/mass_mailing.py:474
 #: selection:mail.mass_mailing,state:0
 #: selection:mail.statistics.report,state:0
 #, python-format
@@ -610,6 +620,7 @@ msgstr ""
 
 #. module: mass_mailing
 #: model:ir.ui.menu,name:mass_mailing.mass_mailing_menu_root
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "Email Marketing"
 msgstr ""
 
@@ -619,11 +630,6 @@ msgid "Email Statistics"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_mass_mailing_themes
-msgid "Email Templates"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.model,name:mass_mailing.model_mail_thread
 msgid "Email Thread"
 msgstr ""
@@ -645,11 +651,6 @@ msgid "Emails Statistics"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
-msgid "Encourage to subscribe to mailing lists with a call-to-action"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "Enjoy!"
 msgstr ""
@@ -686,6 +687,11 @@ msgid "FROM YOUR NEXT ORDER!"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_facebook
+msgid "Facebook Account"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_failed
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_failed
 msgid "Failed"
@@ -708,6 +714,16 @@ msgid "Get your inside sales (CRM) fully integrated with online sales (eCommerce
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_github
+msgid "GitHub Account"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_googleplus
+msgid "Google+ Account"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
@@ -731,7 +747,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_id
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_id
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_id
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_id
 msgid "ID"
 msgstr ""
 
@@ -746,7 +761,7 @@ msgid "If checked, recipients will be mailed only once for the whole campaign. T
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:487
+#: code:addons/mass_mailing/models/mass_mailing.py:474
 #: selection:mail.mass_mailing,state:0
 #, python-format
 msgid "In Queue"
@@ -777,7 +792,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag___last_update
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test___last_update
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report___last_update
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -795,7 +809,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_write_uid
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_write_uid
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_write_uid
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -808,7 +821,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_write_date
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_write_date
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_write_date
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -818,8 +830,8 @@ msgid "Last state update of the mail"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_crm
-msgid "Leads/Opportunities"
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_linkedin
+msgid "LinkedIn Account"
 msgstr ""
 
 #. module: mass_mailing
@@ -848,12 +860,6 @@ msgid "Mail Body"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:302
-#, python-format
-msgid "Mail Contacts"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_mail_mail_id_int
 msgid "Mail ID (tech)"
 msgstr ""
@@ -877,23 +883,21 @@ msgid "Mailing"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:303
 #: model:ir.model,name:mass_mailing.model_mail_mass_mailing_list
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message_mailing_list_ids
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_name
 #: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message_mailing_list_ids
-#, python-format
 msgid "Mailing List"
 msgstr ""
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_lists
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3886
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3651
 #: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_lists
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_search
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_tree
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
 msgid "Mailing Lists"
 msgstr ""
 
@@ -928,16 +932,11 @@ msgid "Manage Mass Mailing Campaigns"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "Manage campaigns of mass emails with process stages"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
-msgid "Manage mailing campaigns with your prospects"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_name
 msgid "Mass Mail"
 msgstr ""
@@ -988,7 +987,7 @@ msgstr ""
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_campaigns
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign
+#: model:ir.model.fields,field_description:mass_mailing.field_res_config_settings_group_mass_mailing_campaign
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_tree
 msgid "Mass Mailing Campaigns"
@@ -1120,6 +1119,11 @@ msgid "Number of Contacts"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_kanban
+msgid "Number of bounced email."
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_clicks_ratio
 msgid "Number of clicks"
 msgstr ""
@@ -1204,7 +1208,7 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:668
+#: code:addons/mass_mailing/models/mass_mailing.py:656
 #, python-format
 msgid "Please select recipients."
 msgstr ""
@@ -1249,11 +1253,16 @@ msgid "Recipients"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_id
 msgid "Recipients Model"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_name
+msgid "Recipients Model Name"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_real
 msgid "Recipients Real Model"
 msgstr ""
@@ -1334,11 +1343,6 @@ msgid "Sample Mail Wizard"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
-msgid "Save"
-msgstr ""
-
-#. module: mass_mailing
 #: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_1
 msgid "Schedule"
 msgstr ""
@@ -1411,14 +1415,14 @@ msgid "Send to All"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:487
+#: code:addons/mass_mailing/models/mass_mailing.py:474
 #: selection:mail.mass_mailing,state:0
 #, python-format
 msgid "Sending"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:487
+#: code:addons/mass_mailing/models/mass_mailing.py:474
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_sent
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_sent
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_sent
@@ -1468,6 +1472,11 @@ msgid "Sincerely,<br/>"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_company_form_inherit_mass_mailing
+msgid "Social Media"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
 msgid "Source"
 msgstr ""
@@ -1536,7 +1545,7 @@ msgid "Tags"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:542
+#: code:addons/mass_mailing/models/mass_mailing.py:529
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
 #, python-format
 msgid "Test Mailing"
@@ -1574,11 +1583,6 @@ msgid "The open source model of Odoo has allowed us to leverage thousands of dev
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
-msgid "This adds a new Newsletter snippet to drag & drop on on your website pages. This call-to-action prompts visitors to enter their email address to join a mailing list."
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_medium_id
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_medium_id
 msgid "This is the delivery method, e.g. Postcard, Email, or Banner Ad"
@@ -1595,12 +1599,12 @@ msgid "This is the link source, e.g. Search Engine, another domain,or name of em
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign
+#: model:ir.model.fields,help:mass_mailing.field_res_config_settings_group_mass_mailing_campaign
 msgid "This is useful if your marketing campaigns are composed of several emails"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "This is useful if your marketing campaigns are composed of several emails."
 msgstr ""
 
@@ -1611,12 +1615,12 @@ msgstr ""
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_campaign_id
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3862
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3639
 msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "This tool is advised if your marketing campaign is composed of several emails."
 msgstr ""
 
@@ -1647,6 +1651,11 @@ msgid "Tracking"
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_twitter
+msgid "Twitter Account"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
 msgid "Unsubscribe"
@@ -1689,11 +1698,6 @@ msgid "We want to take this opportunity to welcome you to our ever-growing commu
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_website_mass_mailing
-msgid "Website Call-to-Action"
-msgstr ""
-
-#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
 msgid "With strong technical foundations, Odoo's framework is unique.\n"
 "                                It provides top notch usability that scales across all apps."
@@ -1712,7 +1716,7 @@ msgid "Write one paragraph describing your product,\n"
 msgstr ""
 
 #. module: mass_mailing
-#: code:addons/mass_mailing/controllers/main.py:32
+#: code:addons/mass_mailing/controllers/main.py:33
 #, python-format
 msgid "You have been unsubscribed successfully"
 msgstr ""
@@ -1745,6 +1749,11 @@ msgid "Your platform is ready for work. It will help you reduce the costs of dig
 msgstr ""
 
 #. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_youtube
+msgid "Youtube Account"
+msgstr ""
+
+#. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "and save $20 on your next order!"
 msgstr ""
@@ -1792,7 +1801,7 @@ msgid "lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
 msgstr ""
 
 #. module: mass_mailing
-#: model:ir.model,name:mass_mailing.model_mass_mailing_config_settings
-msgid "mass.mailing.config.settings"
+#: model:ir.model,name:mass_mailing.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/mass_mailing_event/i18n/mass_mailing_event.pot b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
index a4895366052..70f2ef8b8f4 100644
--- a/addons/mass_mailing_event/i18n/mass_mailing_event.pot
+++ b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
index 0810c9e4560..31f72f92a56 100644
--- a/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
+++ b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 654afb32f35..918a56266f3 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,18 @@ msgid "# Waiting"
 msgstr ""
 
 #. module: membership
+#: model:ir.ui.view,arch_db:membership.membership_products_kanban
+msgid "<i class=\"fa fa-clock-o\" aria-hidden=\"true\"/><strong> From: </strong>"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.view,arch_db:membership.membership_products_kanban
+msgid "<strong> To:</strong>"
+msgstr ""
+
+#. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_associate_member
+#: model:ir.model.fields,help:membership.field_res_users_associate_member
 msgid "A member with whom you want to associate your membership. It will consider the membership state of the associated member."
 msgstr ""
 
@@ -63,6 +74,7 @@ msgstr ""
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_report_membership_associate_member_id
 #: model:ir.model.fields,field_description:membership.field_res_partner_associate_member
+#: model:ir.model.fields,field_description:membership.field_res_users_associate_member
 #: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "Associate Member"
 msgstr ""
@@ -84,6 +96,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_res_partner_membership_cancel
+#: model:ir.model.fields,field_description:membership.field_res_users_membership_cancel
 msgid "Cancel Membership Date"
 msgstr ""
 
@@ -105,6 +118,7 @@ msgid "Category"
 msgstr ""
 
 #. module: membership
+#: model:ir.model.fields,help:membership.field_product_product_membership
 #: model:ir.model.fields,help:membership.field_product_template_membership
 msgid "Check if the product is eligible for membership."
 msgstr ""
@@ -156,6 +170,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_res_partner_membership_state
+#: model:ir.model.fields,field_description:membership.field_res_users_membership_state
 msgid "Current Membership Status"
 msgstr ""
 
@@ -165,8 +180,10 @@ msgid "Customers"
 msgstr ""
 
 #. module: membership
+#: model:ir.model.fields,help:membership.field_product_product_membership_date_from
 #: model:ir.model.fields,help:membership.field_product_template_membership_date_from
 #: model:ir.model.fields,help:membership.field_res_partner_membership_start
+#: model:ir.model.fields,help:membership.field_res_users_membership_start
 msgid "Date from which membership becomes active."
 msgstr ""
 
@@ -177,12 +194,15 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_membership_cancel
+#: model:ir.model.fields,help:membership.field_res_users_membership_cancel
 msgid "Date on which membership has been cancelled"
 msgstr ""
 
 #. module: membership
+#: model:ir.model.fields,help:membership.field_product_product_membership_date_to
 #: model:ir.model.fields,help:membership.field_product_template_membership_date_to
 #: model:ir.model.fields,help:membership.field_res_partner_membership_stop
+#: model:ir.model.fields,help:membership.field_res_users_membership_stop
 msgid "Date until which membership remains active."
 msgstr ""
 
@@ -241,6 +261,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_res_partner_free_member
+#: model:ir.model.fields,field_description:membership.field_res_users_free_member
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
@@ -311,6 +332,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_membership_state
+#: model:ir.model.fields,help:membership.field_res_users_membership_state
 msgid "It indicates the membership state.\n"
 "-Non Member: A partner who has not applied for any membership.\n"
 "-Cancelled Member: A member who has cancelled his membership.\n"
@@ -381,8 +403,10 @@ msgstr ""
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_invoice_product_id
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line_membership_id
+#: model:ir.model.fields,field_description:membership.field_product_product_membership
 #: model:ir.model.fields,field_description:membership.field_product_template_membership
 #: model:ir.model.fields,field_description:membership.field_res_partner_member_lines
+#: model:ir.model.fields,field_description:membership.field_res_users_member_lines
 #: model:ir.ui.view,arch_db:membership.view_partner_form
 #: model:ir.ui.view,arch_db:membership.view_report_membership_graph1
 #: model:ir.ui.view,arch_db:membership.view_report_membership_pivot
@@ -392,6 +416,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_res_partner_membership_amount
+#: model:ir.model.fields,field_description:membership.field_res_users_membership_amount
 msgid "Membership Amount"
 msgstr ""
 
@@ -406,8 +431,10 @@ msgid "Membership Duration"
 msgstr ""
 
 #. module: membership
+#: model:ir.model.fields,field_description:membership.field_product_product_membership_date_to
 #: model:ir.model.fields,field_description:membership.field_product_template_membership_date_to
 #: model:ir.model.fields,field_description:membership.field_res_partner_membership_stop
+#: model:ir.model.fields,field_description:membership.field_res_users_membership_stop
 msgid "Membership End Date"
 msgstr ""
 
@@ -443,8 +470,10 @@ msgid "Membership Products"
 msgstr ""
 
 #. module: membership
+#: model:ir.model.fields,field_description:membership.field_product_product_membership_date_from
 #: model:ir.model.fields,field_description:membership.field_product_template_membership_date_from
 #: model:ir.model.fields,field_description:membership.field_res_partner_membership_start
+#: model:ir.model.fields,field_description:membership.field_res_users_membership_start
 msgid "Membership Start Date"
 msgstr ""
 
@@ -564,6 +593,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_free_member
+#: model:ir.model.fields,help:membership.field_res_users_free_member
 msgid "Select if you want to give free membership."
 msgstr ""
 
@@ -589,6 +619,7 @@ msgstr ""
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_membership_amount
+#: model:ir.model.fields,help:membership.field_res_users_membership_amount
 msgid "The price negotiated by the partner"
 msgstr ""
 
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index a33c08ba1bb..0d2b0bfe3c8 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,12 @@ msgid "# Bill of Material"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_product_product_used_in_bom_count
+#: model:ir.model.fields,field_description:mrp.field_product_template_used_in_bom_count
+msgid "# BoM Where Used"
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_workorder_done_count
 msgid "# Done Work Orders"
 msgstr ""
@@ -113,7 +119,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
-msgid "<span>Plan Orders</span>"
+msgid "<span>PLAN ORDERS</span>"
 msgstr ""
 
 #. module: mrp
@@ -128,32 +134,38 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
-msgid "<span>Work Orders</span>"
+msgid "<span>WORK ORDERS</span>"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Barcode</strong>"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "<strong attrs=\"{'invisible': [('date_planned_finished', '=', False)]}\" class=\"mr8\">to</strong>\n"
+"                                    <strong class=\"oe_edit_only mr8\" attrs=\"{'invisible': [('date_planned_finished', '!=', False)]}\">to</strong>"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Destination Location</strong>"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "<strong class=\"mr8\">to</strong>"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Name</strong>"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
+msgid "<strong>Effectiveness Category: </strong>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
+msgid "<strong>Is a Blocking Reason? </strong>"
 msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>No. Of Minutes</strong>"
+msgid "<strong>Name</strong>"
 msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Partner Ref:</strong><br/>"
+msgid "<strong>No. Of Minutes</strong>"
 msgstr ""
 
 #. module: mrp
@@ -187,8 +199,8 @@ msgid "<strong>Quantity</strong>"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>SO Number:</strong><br/>"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
+msgid "<strong>Reason: </strong>"
 msgstr ""
 
 #. module: mrp
@@ -203,11 +215,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Source Location</strong>"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
 msgid "<strong>Work Orders</strong>"
 msgstr ""
 
@@ -217,13 +224,12 @@ msgid "<strong>WorkCenter</strong>"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:438
+#: code:addons/mrp/models/mrp_workorder.py:463
 #, python-format
 msgid "A Manufacturing Order is already done or cancelled!"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_waiting
 msgid "A manufacturing order, based on a bill of materials, will\n"
@@ -240,8 +246,8 @@ msgid "Active"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_active_move_lot_ids
-msgid "Active Move Lot"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_active_move_line_ids
+msgid "Active Move Line"
 msgstr ""
 
 #. module: mrp
@@ -250,7 +256,7 @@ msgid "Add a description..."
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Add by-products to bills of materials. This can be used to get several finished products as well. Without this option you only do: A + B = C. With the option: A + B = C + D."
 msgstr ""
 
@@ -271,12 +277,6 @@ msgid "All product quantities must be greater than 0.\n"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_unbuild
-msgid "An unbuild order will do a reverse bill of materials, unbuilding products\n"
-"            you produced, but you can also use it to unbuild products you purchased."
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
 msgid "Approve"
 msgstr ""
@@ -306,16 +306,6 @@ msgid "Attachments"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Attributes"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_product_variant
-msgid "Attributes & Variants"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
 msgid "Author"
 msgstr ""
@@ -345,7 +335,7 @@ msgid "Average delay in days to produce this product. In the case of multi-level
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.report.xml,name:mrp.action_report_bom_price
+#: model:ir.actions.report,name:mrp.action_report_bom_price
 msgid "BOM Cost"
 msgstr ""
 
@@ -365,7 +355,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.report.xml,name:mrp.action_report_bom_structure
+#: model:ir.actions.report,name:mrp.action_report_bom_structure
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
 msgid "BOM Structure"
 msgstr ""
@@ -381,6 +371,12 @@ msgid "Based on"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "Based on a Bill of Material, a Manufacturing Order will consume raw materials\n"
+"                and produce finished products."
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
 #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
 msgid "Bill Of Material"
@@ -401,12 +397,10 @@ msgid "Bill of Material line"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
 #: model:ir.actions.act_window,name:mrp.product_open_bom
 #: model:ir.actions.act_window,name:mrp.template_open_bom
 #: model:ir.model.fields,field_description:mrp.field_product_product_bom_ids
 #: model:ir.model.fields,field_description:mrp.field_product_template_bom_ids
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_line_tree_view
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_tree_view
 #: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
@@ -425,6 +419,12 @@ msgid "Bill of Materials allow you to define the list of required raw materials
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+msgid "Bills of Materials"
+msgstr ""
+
+#. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
 msgid "Bills of Materials allow you to define the list of required raw\n"
 "                materials used to make a finished product; through a manufacturing\n"
@@ -460,11 +460,6 @@ msgid "Blocked hour(s) over the last month"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_procurement_order_bom_id
-msgid "BoM"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.product_template_search_view_procurment
 msgid "BoM Components"
 msgstr ""
@@ -485,6 +480,12 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
+#: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
+#: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button
+msgid "BoM Where Used"
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form
 msgid "BoM details"
 msgstr ""
@@ -496,7 +497,7 @@ msgid "BoM line product %s should not be same as BoM product."
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_byproduct
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_byproduct
 msgid "By-Products"
 msgstr ""
 
@@ -510,7 +511,6 @@ msgstr ""
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
 #: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
 #: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
 msgid "Cancel"
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_production.py:282
+#: code:addons/mrp/models/mrp_production.py:293
 #, python-format
 msgid "Cannot delete a manufacturing order not in cancel state"
 msgstr ""
@@ -571,34 +571,43 @@ msgid "Clear"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.action_work_orders
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
-msgid "Click to add a work center."
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
+msgid "Click here"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
-msgid "Click to create a bill of material."
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "Click here to create a Manufacturing Order."
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
-msgid "Click to create a manufacturing order."
+#: model:ir.actions.act_window,help:mrp.mrp_unbuild
+msgid "Click here to create a Unbuild Order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid "Click here to create a new Routing."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid "Click here to create a new Work Center"
 msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Click to create a new message."
+msgid "Click here to create a new Work Order Message."
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Click to create a new routing."
+#: model:ir.actions.act_window,help:mrp.action_work_orders
+msgid "Click to add a work center."
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_unbuild
-msgid "Click to start a new Unbuild Order"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid "Click to create a bill of material."
 msgstr ""
 
 #. module: mrp
@@ -609,14 +618,12 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production
-#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production_specific
-#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_workcenter
-#: model:ir.actions.act_window,help:mrp.mrp_workorder_todo
 msgid "Click to start a new work order."
 msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_code
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view_kanban
 msgid "Code"
 msgstr ""
 
@@ -633,7 +640,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_company_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_company_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_company_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_company_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_company_id
@@ -661,7 +667,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_configuration
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
 msgid "Configure Manufacturing"
 msgstr ""
 
@@ -687,13 +692,13 @@ msgid "Consumed"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Consumed Materials"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_consumed_less_than_planned
+msgid "Consumed Less Than Planned"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_quant_consumed_quant_ids
-msgid "Consumed Quant"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Consumed Materials"
 msgstr ""
 
 #. module: mrp
@@ -732,13 +737,18 @@ msgid "Create Workorders"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_created_production_id
+msgid "Created Production Order"
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_create_uid
@@ -747,7 +757,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_create_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_create_uid
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_create_uid
 msgid "Created by"
 msgstr ""
 
@@ -755,10 +764,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_create_date
@@ -767,16 +776,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_create_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_create_date
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_final_lot_id
-msgid "Current Lot"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
 msgid "Current Production"
 msgstr ""
@@ -822,7 +825,7 @@ msgid "Default Duration"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_default_use_manufacturing_lead
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_use_manufacturing_lead
 msgid "Default Manufacturing Lead Time"
 msgstr ""
 
@@ -869,10 +872,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_display_name
@@ -881,15 +884,14 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_display_name
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_display_name
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost_display_name
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure_display_name
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_display_name
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report_display_name
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report_display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_qty_done
 #: model:ir.model.fields,field_description:mrp.field_stock_move_is_done
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_quantity_done
 #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
 #: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
@@ -900,7 +902,7 @@ msgid "Done"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_wo
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_done_wo
 msgid "Done for Work Order"
 msgstr ""
 
@@ -1011,7 +1013,7 @@ msgid "Finished"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_produced_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_lot_produced_id
 msgid "Finished Lot"
 msgstr ""
 
@@ -1032,6 +1034,16 @@ msgid "Fully Productive"
 msgstr ""
 
 #. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+msgid "Future Activitie"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
 msgid "General Information"
 msgstr ""
@@ -1062,11 +1074,6 @@ msgid "Gives the sequence order when displaying."
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Go through a production routing with work orders"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
 msgid "Group By"
 msgstr ""
@@ -1105,10 +1112,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_id
@@ -1117,9 +1124,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_id
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost_id
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure_id
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_id
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report_id
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report_id
 msgid "ID"
 msgstr ""
 
@@ -1166,7 +1172,7 @@ msgid "Indexed Content"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,help:mrp.field_stock_move_lots_lot_produced_qty
+#: model:ir.model.fields,help:mrp.field_stock_move_line_lot_produced_qty
 msgid "Informative, not used in matching"
 msgstr ""
 
@@ -1178,6 +1184,7 @@ msgid "Inventory Message"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_production_moves
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 msgid "Inventory Moves"
 msgstr ""
@@ -1193,7 +1200,7 @@ msgid "Inventory Unreserve Visible"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workorder_move_lot_ids
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_move_line_ids
 msgid "Inventory moves for which you must scan a lot number at this work order"
 msgstr ""
 
@@ -1213,6 +1220,11 @@ msgid "Is a Blocking Reason"
 msgstr ""
 
 #. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
+msgid "Is a Blocking Reason?"
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_public
 msgid "Is public document"
 msgstr ""
@@ -1242,10 +1254,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_document___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_message___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_production___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter___last_update
@@ -1254,9 +1266,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss___last_update
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder___last_update
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost___last_update
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure___last_update
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots___last_update
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report___last_update
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -1264,9 +1275,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_write_uid
@@ -1276,7 +1287,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_write_uid
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_write_uid
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -1284,9 +1294,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_write_date
@@ -1296,7 +1306,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_write_date
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_write_date
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -1310,7 +1319,13 @@ msgid "Late"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_production.py:393
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:404
 #, python-format
 msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
 msgstr ""
@@ -1331,21 +1346,30 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9897
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_8168
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
 msgid "Loss Reason"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_lot_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_lot_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_lot_id
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_id
 msgid "Lot"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_active_move_lot_ids
-#: model:ir.model.fields,field_description:mrp.field_stock_move_move_lot_ids
+#: model:ir.model,name:mrp.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_final_lot_id
+msgid "Lot/Serial Number"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_active_move_line_ids
 #: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
 msgid "Lots"
 msgstr ""
@@ -1356,7 +1380,7 @@ msgid "Low"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_maintenance
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_maintenance
 msgid "Maintenance"
 msgstr ""
 
@@ -1366,8 +1390,8 @@ msgid "Manage Work Order Operations"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Manage quality control points, checks and measures"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Manage quality control points, quality checks and quality alerts"
 msgstr ""
 
 #. module: mrp
@@ -1381,7 +1405,6 @@ msgid "Manual Duration"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/procurement.py:14
 #: code:addons/mrp/models/stock_warehouse.py:34
 #: model:stock.location.route,name:mrp.route_warehouse0_manufacture
 #, python-format
@@ -1414,10 +1437,10 @@ msgid "Manufacturing"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_manufacturing_lead
 #: model:ir.model.fields,field_description:mrp.field_product_product_produce_delay
 #: model:ir.model.fields,field_description:mrp.field_product_template_produce_delay
 #: model:ir.model.fields,field_description:mrp.field_res_company_manufacturing_lead
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_manufacturing_lead
 msgid "Manufacturing Lead Time"
 msgstr ""
 
@@ -1430,7 +1453,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:mrp.field_change_production_qty_mo_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_mo_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_id
-#: model:ir.model.fields,field_description:mrp.field_procurement_order_production_id
 #: model:ir.model.fields,field_description:mrp.field_stock_scrap_production_id
 #: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
 msgid "Manufacturing Order"
@@ -1455,6 +1477,12 @@ msgid "Manufacturing Orders"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "Manufacturing Orders can be generated automatically based on customer\n"
+"                requirements or reordering rules."
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
 msgid "Manufacturing Orders which are currently in production."
 msgstr ""
@@ -1476,7 +1504,20 @@ msgid "Manufacturing Reference"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid "Manufacturing operations are processed at Work Centers. A Work Center can be composed\n"
+"                of workers and/or machines, they are used for costing, scheduling, capacity planning, etc.\n"
+"                The Work Centers are defined on the Routing's operations."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
+msgid "Manufacturing operations are processed at Work Centers. A Work Center can be composed of\n"
+"                workers and/or machines, they are used for costing, scheduling, capacity planning, etc.\n"
+"                The Work Centers are defined on the Routing's operations."
+msgstr ""
+
+#. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_waiting
 msgid "Manufacturing orders are usually proposed automatically based\n"
@@ -1495,7 +1536,7 @@ msgid "Master Data"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_mps
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_mps
 msgid "Master Production Schedule"
 msgstr ""
 
@@ -1518,17 +1559,22 @@ msgid "Miscellaneous"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_move_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_move_id
 msgid "Move"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_move
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_dest_ids
+msgid "Move Dest"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_done_move
 msgid "Move Done"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Move forward deadline start dates by"
 msgstr ""
 
@@ -1539,7 +1585,7 @@ msgid "Moves"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_move_lot_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_move_line_ids
 msgid "Moves to Track"
 msgstr ""
 
@@ -1572,8 +1618,8 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/models/mrp_production.py:46
-#: code:addons/mrp/models/mrp_production.py:268
-#: code:addons/mrp/models/mrp_production.py:272
+#: code:addons/mrp/models/mrp_production.py:279
+#: code:addons/mrp/models/mrp_production.py:283
 #: code:addons/mrp/models/mrp_routing.py:18
 #: code:addons/mrp/models/mrp_routing.py:34
 #: code:addons/mrp/models/mrp_routing.py:35
@@ -1595,12 +1641,6 @@ msgid "Next Work Order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/procurement.py:100
-#, python-format
-msgid "No BoM exists for this product!"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
 msgid "No Routing"
 msgstr ""
@@ -1717,11 +1757,10 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_operation_ids
-#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 #: model:ir.ui.view,arch_db:mrp.mrp_workorder_view_gantt
 #: model:ir.ui.view,arch_db:mrp.oee_loss_search_view
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:mrp.workcenter_line_calendar
 #: model:ir.ui.view,arch_db:mrp.workcenter_line_gantt_production
 #: model:ir.ui.view,arch_db:mrp.workcenter_line_graph
@@ -1731,6 +1770,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_order_ids
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Orders"
 msgstr ""
 
@@ -1758,9 +1798,8 @@ msgid "Overall Equipment Effectiveness: no working or blocked time."
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Overdue Activities"
+#: model:ir.model,name:mrp.model_stock_move_line
+msgid "Packing Operation"
 msgstr ""
 
 #. module: mrp
@@ -1813,8 +1852,8 @@ msgid "Plan Orders"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Plan procurement orders based on forecasts"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Plan manufacturing or purchase orders based on forecasts"
 msgstr ""
 
 #. module: mrp
@@ -1831,22 +1870,17 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.mrp_planning_menu_root
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Planning"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:269
+#: code:addons/mrp/models/mrp_workorder.py:286
 #, python-format
 msgid "Please set the quantity you produced in the Current Qty field. It can not be 0!"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_plus_visible
-msgid "Plus Visible"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 msgid "Post Inventory"
 msgstr ""
@@ -1858,8 +1892,8 @@ msgid "Priority"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_procurement_order
-msgid "Procurement"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Process operations at specific work centers based on the routing defined on the bill of material of the final product"
 msgstr ""
 
 #. module: mrp
@@ -1885,7 +1919,7 @@ msgid "Produce Line"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Produce residual products (A + B -&gt; C + D)"
 msgstr ""
 
@@ -1895,20 +1929,15 @@ msgid "Produced"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_quant_produced_quant_ids
-msgid "Produced Quant"
-msgstr ""
-
-#. module: mrp
 #: model:ir.model,name:mrp.model_product_product
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_tmpl_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_message_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_product_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_product_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_id
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_product_id
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form
 #: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
 #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
@@ -1918,8 +1947,13 @@ msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_plm
-msgid "Product Lifecycle Management"
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_plm
+msgid "Product Lifecycle Management (PLM)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_product_produce_id
+msgid "Product Produce"
 msgstr ""
 
 #. module: mrp
@@ -1947,13 +1981,13 @@ msgid "Product Variant"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_consume_line_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_produce_line_ids
 msgid "Product to Track"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_has_tracking
-msgid "Product with Tracking"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_message_kanban
+msgid "Product:"
 msgstr ""
 
 #. module: mrp
@@ -1981,8 +2015,8 @@ msgid "Production Message"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.report.xml,name:mrp.action_report_production_order
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_production_id
+#: model:ir.actions.report,name:mrp.action_report_production_order
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_production_id
 #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
 msgid "Production Order"
 msgstr ""
@@ -2043,7 +2077,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_template_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_product_form
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Products"
 msgstr ""
 
@@ -2058,32 +2092,21 @@ msgid "Pushed Flow"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_quality_mrp
 #: selection:mrp.workcenter.productivity.loss,loss_type:0
 msgid "Quality"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_quality_mrp
-msgid "Quality Control"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
 msgid "Quality Losses"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_stock_move_lots
-msgid "Quantities to Process by lots"
-msgstr ""
-
-#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_qty
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_qty
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_qty
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_qty_produced
-#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_done
-#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_done_store
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form
@@ -2093,12 +2116,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_available
-msgid "Quantity Available"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_produced_qty
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_lot_produced_qty
 msgid "Quantity Finished Product"
 msgstr ""
 
@@ -2120,11 +2138,6 @@ msgid "Quantity to Process"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_stock_quant
-msgid "Quants"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
 msgid "Raw Material"
 msgstr ""
@@ -2171,6 +2184,11 @@ msgid "Record Production"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce_line
+msgid "Record Production Line"
+msgstr ""
+
+#. module: mrp
 #: code:addons/mrp/models/mrp_bom.py:160
 #, python-format
 msgid "Recursion error!  A product with a Bill of Material should not have itself in its BoM or child BoMs!"
@@ -2196,7 +2214,7 @@ msgid "Reference of the document that generated this production order request."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/stock_move.py:320
+#: code:addons/mrp/models/stock_move.py:114
 #, python-format
 msgid "Register Lots"
 msgstr ""
@@ -2207,23 +2225,18 @@ msgid "Register lots"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_procurement_ids
-msgid "Related Procurements"
-msgstr ""
-
-#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_ir_attachment_id
 msgid "Related attachment"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_repair
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_repair
 msgid "Repair"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Repair broken or damaged products"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Repair products and invoice the repair orders"
 msgstr ""
 
 #. module: mrp
@@ -2237,6 +2250,11 @@ msgid "Requires Serial"
 msgstr ""
 
 #. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Reserved"
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_document_res_field
 msgid "Resource Field"
 msgstr ""
@@ -2303,41 +2321,34 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.model,name:mrp.model_mrp_routing
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
 #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
 msgid "Routings"
 msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Routings allow you to create and manage the manufacturing\n"
-"                operations that should be followed within your work centers in\n"
-"                order to produce a product.  They are attached to bills of\n"
-"                materials that will define the required raw materials."
+msgid "Routings define the successive operations that need to be\n"
+"                done to realize a Manufacturing Order. Each operation from\n"
+"                a Routing is done at a specific Work Center and has a specific duration."
 msgstr ""
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
 #: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
 #: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
 msgid "Save"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Schedule maintenance activities"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Schedule manufacturing orders earlier to avoid delays"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Schedule manufacturing orders earlier to avoid delays"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+msgid "Schedule the maintenance of your equipment"
 msgstr ""
 
 #. module: mrp
@@ -2363,10 +2374,9 @@ msgid "Scheduled Month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_production.py:571
-#: code:addons/mrp/models/mrp_workorder.py:447
+#: code:addons/mrp/models/mrp_production.py:558
+#: code:addons/mrp/models/mrp_workorder.py:472
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
-#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
 #, python-format
@@ -2380,6 +2390,11 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
+msgid "Scrap Orders"
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_scrap_ids
 msgid "Scraps"
 msgstr ""
@@ -2416,13 +2431,13 @@ msgid "Search for mrp workcenter"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Security Lead Time"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_config_settings_manufacturing_lead
 #: model:ir.model.fields,help:mrp.field_res_company_manufacturing_lead
+#: model:ir.model.fields,help:mrp.field_res_config_settings_manufacturing_lead
 msgid "Security days for each manufacturing operation."
 msgstr ""
 
@@ -2449,11 +2464,6 @@ msgid "Set duration manually"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Set product attributes (e.g. color, size) to manage variants"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_config
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
 #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
@@ -2515,7 +2525,6 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_mrp_production_moves
 #: model:ir.actions.act_window,name:mrp.action_mrp_unbuild_moves
 msgid "Stock Moves"
 msgstr ""
@@ -2542,7 +2551,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_stock_move_is_done
-#: model:ir.model.fields,help:mrp.field_stock_move_lots_done_move
+#: model:ir.model.fields,help:mrp.field_stock_move_line_done_move
 msgid "Technical Field to order moves"
 msgstr ""
 
@@ -2552,7 +2561,7 @@ msgid "Technical Field to see if we can show 'Mark as Done' button"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,help:mrp.field_stock_move_lots_done_wo
+#: model:ir.model.fields,help:mrp.field_stock_move_line_done_wo
 msgid "Technical Field which is False when temporarily filled in in work order"
 msgstr ""
 
@@ -2572,6 +2581,11 @@ msgid "Technical field to check when we can unreserve"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_production_consumed_less_than_planned
+msgid "Technical field used to see if we have to display a warning or not when confirming an order."
+msgstr ""
+
+#. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_workorder_production_availability
 msgid "Technical: used in views and domains only."
 msgstr ""
@@ -2590,6 +2604,11 @@ msgid "Technical: used in views only."
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,help:mrp.field_stock_production_lot_use_next_on_work_order_id
+msgid "Technical: used to figure out default serial number on work orders"
+msgstr ""
+
+#. module: mrp
 #: code:addons/mrp/models/mrp_bom.py:77
 #: code:addons/mrp/models/mrp_bom.py:254
 #, python-format
@@ -2658,6 +2677,12 @@ msgid "The routing contains all the Work Centers used and for how long. This wil
 msgstr ""
 
 #. module: mrp
+#: code:addons/mrp/models/procurement.py:20
+#, python-format
+msgid "There is no Bill of Material found for the product %s. Please define a Bill of Material for this product."
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
 msgid "This Month"
@@ -2695,7 +2720,7 @@ msgid "Time Tracking"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:368
+#: code:addons/mrp/models/mrp_workorder.py:393
 #, python-format
 msgid "Time Tracking: "
 msgstr ""
@@ -2726,12 +2751,13 @@ msgid "Time in minutes. Is the time used in manual mode, or the first time suppo
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_qty_to_consume
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
 msgid "To Consume"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_quantity
 #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
 msgid "To Do"
@@ -2749,11 +2775,6 @@ msgid "To Produce"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
-msgid "To create a new work center, Go to <b><i> Master Data/Work Centers. </i></b>"
-msgstr ""
-
-#. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production
 msgid "To manufacture or assemble products, and use raw materials and\n"
 "            finished products you must also handle manufacturing operations.\n"
@@ -2806,11 +2827,6 @@ msgid "Traceability: Lots"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-msgid "Track changes on products, BoMs and routings"
-msgstr ""
-
-#. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_tracking
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_has_tracking
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_tracking
@@ -2853,6 +2869,11 @@ msgid "Unbuild Orders"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_unbuild
+msgid "Unbuild Orders are used to break down a product you manufactured or purchased into its components, based on its Bill of Material."
+msgstr ""
+
+#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
 msgid "Unit Cost"
 msgstr ""
@@ -2863,6 +2884,7 @@ msgid "Unit Factor"
 msgstr ""
 
 #. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_product_uom_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_uom_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_uom_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_uom_id
@@ -2882,12 +2904,6 @@ msgid "Unreserve"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 msgid "Update"
 msgstr ""
@@ -2917,10 +2933,8 @@ msgid "Url"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Use messages to warn users about any change in the products,\n"
-"                process, or actions to take care of. (e.g; Warning, the bill\n"
-"                of material changed, check the details in new worksheet)"
+#: model:ir.model.fields,field_description:mrp.field_stock_production_lot_use_next_on_work_order_id
+msgid "Use Next On Work Order"
 msgstr ""
 
 #. module: mrp
@@ -2931,7 +2945,7 @@ msgid "User"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts."
 msgstr ""
 
@@ -2999,7 +3013,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_bom_picking_type_id
-msgid "When a procurement has a ‘produce’ route with a operation type set, it will try to create a Manufacturing Order for that product using a BoM of the same operation type. That allows to define procurement rules which trigger different manufacturing orders with different BoMs. "
+msgid "When a procurement has a ‘produce’ route with a operation type set, it will try to create a Manufacturing Order for that product using a BoM of the same operation type. That allows to define procurement rules which trigger different manufacturing orders with different BoMs."
 msgstr ""
 
 #. module: mrp
@@ -3065,7 +3079,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Work Centers"
 msgstr ""
 
@@ -3076,8 +3090,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_work_orders
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
 msgid "Work Centers allow you to create and manage manufacturing\n"
 "                units. They consist of workers and/or machines, which are\n"
 "                considered as units for task assignation as well as capacity\n"
@@ -3093,7 +3105,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_workorder
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_workorder_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_name
-#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_workorder_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_line_workorder_id
 #: model:ir.model.fields,field_description:mrp.field_stock_scrap_workorder_id
 msgid "Work Order"
 msgstr ""
@@ -3105,7 +3117,13 @@ msgid "Work Order Messages"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
+msgid "Work Order Messages are used to warn users about any change in the product,\n"
+"                process, etc. These messages will appear on the involved Work Orders."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
 msgstr ""
 
@@ -3120,9 +3138,9 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.action_mrp_workorder_workcenter
 #: model:ir.actions.act_window,name:mrp.action_work_orders
 #: model:ir.actions.act_window,name:mrp.mrp_workorder_todo
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_mrp_routings
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_workorder_ids
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_workorder_ids
+#: model:ir.model.fields,field_description:mrp.field_res_config_settings_group_mrp_routings
 #: model:ir.ui.menu,name:mrp.menu_mrp_work_order_report
 #: model:ir.ui.menu,name:mrp.menu_mrp_workorder_todo
 #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_tree_view_inherit
@@ -3148,14 +3166,23 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production_specific
-#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_workcenter
+msgid "Work Orders are operations to be processed at a Work Center to realize a\n"
+"            Manufacturing Order. Work Orders are trigerred by Manufacturing Orders,\n"
+"            they are based on the Routing defined on these ones"
+msgstr ""
+
+#. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workorder_todo
-msgid "Work Orders is the list of operations to be performed for each\n"
-"            manufacturing order. Once you start the first work order of a\n"
-"            manufacturing order, the manufacturing order is automatically\n"
-"            marked as started. Once you finish the latest operation of a\n"
-"            manufacturing order, the MO is automatically done and the related\n"
-"            products are produced."
+msgid "Work Orders are operations to be processed at a Work Center to realize a\n"
+"            Manufacturing Order. Work Orders are trigerred by Manufacturing Orders,\n"
+"            they are based on the Routing defined on these ones."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_workcenter
+msgid "Work Orders are operations to be processed at a Work Center to realize a\n"
+"           Manufacturing Order. Work Orders are trigerred by Manufacturing Orders,\n"
+"           they are based on the Routing defined on these ones."
 msgstr ""
 
 #. module: mrp
@@ -3164,7 +3191,7 @@ msgid "Work Sheet"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_production.py:547
+#: code:addons/mrp/models/mrp_production.py:535
 #, python-format
 msgid "Work order %s is still running"
 msgstr ""
@@ -3225,13 +3252,13 @@ msgid "You can either upload a file from your computer or copy/paste an internet
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_production.py:483
+#: code:addons/mrp/models/mrp_production.py:493
 #, python-format
 msgid "You can not cancel production order, a work order is still in progress."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:231
+#: code:addons/mrp/models/mrp_workorder.py:238
 #, python-format
 msgid "You can not change the finished work order."
 msgstr ""
@@ -3244,19 +3271,19 @@ msgid "You can not delete a Bill of Material with running manufacturing orders.\
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/stock_move.py:40
+#: code:addons/mrp/models/stock_move.py:29
 #, python-format
 msgid "You can only produce 1.0 %s for products with unique serial number."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/stock_move.py:144
+#: code:addons/mrp/models/stock_move.py:89
 #, python-format
-msgid "You cannot cancel a stock move having already consumed material"
+msgid "You cannot cancel a manufacturing order if you have already consumed material.             If you want to cancel this MO, please change the consumed quantities to 0."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/stock_move.py:38
+#: code:addons/mrp/models/stock_move.py:27
 #, python-format
 msgid "You cannot use the same serial number in two different lines."
 msgstr ""
@@ -3268,62 +3295,62 @@ msgid "You have already processed %d. Please input a quantity higher than %d "
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:358
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "You have consumed less material than what was planned. Are you sure you want to close this MO?"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:383
 #, python-format
 msgid "You need to define at least one productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:354
+#: code:addons/mrp/models/mrp_workorder.py:379
 #, python-format
 msgid "You need to define at least one productivity loss in the category 'Productivity'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:412
+#: code:addons/mrp/models/mrp_workorder.py:437
 #, python-format
 msgid "You need to define at least one unactive productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:107
+#: code:addons/mrp/wizard/mrp_product_produce.py:118
 #, python-format
 msgid "You need to provide a lot for the finished product"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/stock_move.py:282
-#, python-format
-msgid "You need to supply a lot/serial number."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:80
+#: code:addons/mrp/wizard/mrp_product_produce.py:91
 #, python-format
 msgid "You should at least produce some quantity"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:288
+#: code:addons/mrp/models/mrp_workorder.py:305
 #, python-format
 msgid "You should provide a lot for a component"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:272
+#: code:addons/mrp/models/mrp_workorder.py:289
 #, python-format
 msgid "You should provide a lot for the final product"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_template_form_inherited
-msgid "days"
+#: code:addons/mrp/models/mrp_unbuild.py:94
+#, python-format
+msgid "You should specify a manufacturing order in order to find the correct tracked products."
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
-msgid "from"
+#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:mrp.view_mrp_product_template_form_inherited
+msgid "days"
 msgstr ""
 
 #. module: mrp
@@ -3354,23 +3381,23 @@ msgid "mrp.bom.line"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_config_settings
-msgid "mrp.config.settings"
+#: model:ir.model,name:mrp.model_mrp_document
+msgid "mrp.document"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_document
-msgid "mrp.document"
+#: model:ir.model,name:mrp.model_report_mrp_mrp_bom_cost_report
+msgid "report.mrp.mrp_bom_cost_report"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
-msgid "report.mrp.report_mrpbomstructure"
+#: model:ir.model,name:mrp.model_report_mrp_mrp_bom_structure_report
+msgid "report.mrp.mrp_bom_structure_report"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_bom_cost
-msgid "report.mrp_bom_cost"
+#: model:ir.model,name:mrp.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: mrp
@@ -3379,8 +3406,13 @@ msgid "stock.scrap"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
-msgid "to"
+#: model:ir.model,name:mrp.model_stock_traceability_report
+msgid "stock.traceability.report"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
+msgid "to create a new Work Center."
 msgstr ""
 
 #. module: mrp
diff --git a/addons/mrp_byproduct/i18n/mrp_byproduct.pot b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
index 27cacf16618..2ad17eac828 100644
--- a/addons/mrp_byproduct/i18n/mrp_byproduct.pot
+++ b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 2223bb21cba..faa4f93bb08 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,24 +46,6 @@ msgid "* The 'Draft' status is used when a user is encoding a new and unconfirme
 msgstr ""
 
 #. module: mrp_repair
-#: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name}</p>\n"
-"                <p>\n"
-"                Here is your repair order ${doc_name} <strong>${object.name}</strong>\n"
-"                % if object.origin:\n"
-"                (with reference: ${object.origin} )\n"
-"                % endif\n"
-"                % if object.invoice_method != 'none':\n"
-"                amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}.</strong>\n"
-"                % endif\n"
-"                </p>\n"
-"                <p>You can reply to this email if you have any questions.</p>\n"
-"                <p>Thank you,</p>\n"
-"            </data>"
-msgstr ""
-
-#. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<i>(Add)</i>"
 msgstr ""
@@ -139,7 +121,7 @@ msgid "Before Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:206
+#: code:addons/mrp_repair/models/mrp_repair.py:213
 #, python-format
 msgid "Can only confirm draft repairs."
 msgstr ""
@@ -169,7 +151,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:221
+#: code:addons/mrp_repair/models/mrp_repair.py:228
 #, python-format
 msgid "Cannot cancel completed repairs."
 msgstr ""
@@ -203,8 +185,8 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:544
-#: code:addons/mrp_repair/models/mrp_repair.py:602
+#: code:addons/mrp_repair/models/mrp_repair.py:574
+#: code:addons/mrp_repair/models/mrp_repair.py:632
 #, python-format
 msgid "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
@@ -318,6 +300,11 @@ msgstr ""
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
 msgid "Group By"
 msgstr ""
 
@@ -400,7 +387,7 @@ msgid "Invoice and shipping address:"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:361
+#: code:addons/mrp_repair/models/mrp_repair.py:368
 #, python-format
 msgid "Invoice created"
 msgstr ""
@@ -446,6 +433,11 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_lot_id
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_lot_id
 msgid "Lot/Serial"
@@ -477,34 +469,34 @@ msgid "No Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:535
-#: code:addons/mrp_repair/models/mrp_repair.py:593
+#: code:addons/mrp_repair/models/mrp_repair.py:565
+#: code:addons/mrp_repair/models/mrp_repair.py:623
 #, python-format
 msgid "No Pricelist!"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:284
+#: code:addons/mrp_repair/models/mrp_repair.py:291
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:310
-#: code:addons/mrp_repair/models/mrp_repair.py:338
+#: code:addons/mrp_repair/models/mrp_repair.py:317
+#: code:addons/mrp_repair/models/mrp_repair.py:345
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:331
+#: code:addons/mrp_repair/models/mrp_repair.py:338
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:542
-#: code:addons/mrp_repair/models/mrp_repair.py:600
+#: code:addons/mrp_repair/models/mrp_repair.py:572
+#: code:addons/mrp_repair/models/mrp_repair.py:630
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -522,11 +514,6 @@ msgstr ""
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
 msgid "Partner"
 msgstr ""
 
@@ -599,7 +586,7 @@ msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: model:ir.actions.report.xml,name:mrp_repair.action_report_mrp_repair_order
+#: model:ir.actions.report,name:mrp_repair.action_report_mrp_repair_order
 msgid "Quotation / Order"
 msgstr ""
 
@@ -629,6 +616,11 @@ msgid "Remove"
 msgstr ""
 
 #. module: mrp_repair
+#: model:ir.model.fields,field_description:mrp_repair.field_stock_move_repair_id
+msgid "Repair"
+msgstr ""
+
+#. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
 msgstr ""
@@ -673,31 +665,31 @@ msgid "Repair Reference"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:194
+#: code:addons/mrp_repair/models/mrp_repair.py:201
 #, python-format
 msgid "Repair must be canceled in order to reset it to draft."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:380
+#: code:addons/mrp_repair/models/mrp_repair.py:387
 #, python-format
 msgid "Repair must be confirmed before starting reparation."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:408
+#: code:addons/mrp_repair/models/mrp_repair.py:415
 #, python-format
 msgid "Repair must be repaired in order to make the product moves."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:391
+#: code:addons/mrp_repair/models/mrp_repair.py:398
 #, python-format
 msgid "Repair must be under repair in order to end reparation."
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:223
+#: code:addons/mrp_repair/models/mrp_repair.py:230
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
@@ -741,7 +733,7 @@ msgid "Send Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:213
+#: code:addons/mrp_repair/models/mrp_repair.py:220
 #, python-format
 msgid "Serial number is required for operation line with product '%s'"
 msgstr ""
@@ -774,6 +766,11 @@ msgid "Status"
 msgstr ""
 
 #. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_price_subtotal
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_price_subtotal
 msgid "Subtotal"
@@ -793,7 +790,7 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:166
+#: code:addons/mrp_repair/models/mrp_repair.py:173
 #, python-format
 msgid "The Product Unit of Measure you chose has a different category than in the product form."
 msgstr ""
@@ -873,17 +870,7 @@ msgid "Untaxed amount"
 msgstr ""
 
 #. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "VAT:"
-msgstr ""
-
-#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:166
+#: code:addons/mrp_repair/models/mrp_repair.py:173
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -899,16 +886,26 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:272
+#: code:addons/mrp_repair/models/mrp_repair.py:279
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form!"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:537
-#: code:addons/mrp_repair/models/mrp_repair.py:595
+#: code:addons/mrp_repair/models/mrp_repair.py:567
+#: code:addons/mrp_repair/models/mrp_repair.py:625
 #, python-format
 msgid "You have to select a pricelist in the Repair form !\n"
 " Please set one before choosing a product."
 msgstr ""
 
+#. module: mrp_repair
+#: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c703e4465617220247b6f626a6563742e706172746e65725f69642e6e616d657d3c2f703e0a202020202020202020202020202020203c703e0a202020202020202020202020202020204865726520697320796f757220726570616972206f7264657220247b646f635f6e616d657d203c7374726f6e673e247b6f626a6563742e6e616d657d3c2f7374726f6e673e0a2020202020202020202020202020202025206966206f626a6563742e6f726967696e3a0a202020202020202020202020202020202877697468207265666572656e63653a20247b6f626a6563742e6f726967696e7d20290a202020202020202020202020202020202520656e6469660a2020202020202020202020202020202025206966206f626a6563742e696e766f6963655f6d6574686f6420213d20276e6f6e65273a0a20202020202020202020202020202020616d6f756e74696e6720696e203c7374726f6e673e247b6f626a6563742e616d6f756e745f746f74616c7d20247b6f626a6563742e70726963656c6973745f69642e63757272656e63795f69642e6e616d657d2e3c2f7374726f6e673e0a202020202020202020202020202020202520656e6469660a202020202020202020202020202020203c2f703e0a202020202020202020202020202020203c703e596f752063616e207265706c7920746f207468697320656d61696c20696620796f75206861766520616e79207175657374696f6e732e3c2f703e0a202020202020202020202020202020203c703e5468616e6b20796f752c3c2f703e0a2020202020202020202020203c2f646174613e"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_stock_traceability_report
+msgid "stock.traceability.report"
+msgstr ""
+
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 79d0e863bea..38a1043fff6 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -90,6 +90,11 @@ msgstr ""
 
 #. module: note
 #: model:ir.ui.view,arch_db:note.view_note_note_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: note
+#: model:ir.ui.view,arch_db:note.view_note_note_filter
 msgid "Group By"
 msgstr ""
 
@@ -122,6 +127,11 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: note
+#: model:ir.ui.view,arch_db:note.view_note_note_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: note
 #: model:note.stage,name:note.note_stage_03
 msgid "Later"
 msgstr ""
@@ -172,11 +182,6 @@ msgid "Notes"
 msgstr ""
 
 #. module: note
-#: model:ir.ui.view,arch_db:note.view_note_note_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: note
 #: model:ir.model.fields,field_description:note.field_note_note_user_id
 #: model:ir.model.fields,field_description:note.field_note_stage_user_id
 msgid "Owner"
@@ -246,6 +251,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:note.field_note_note_tag_ids
 #: model:ir.ui.menu,name:note.notes_tag_menu
 #: model:ir.ui.view,arch_db:note.note_tag_view_form
+#: model:ir.ui.view,arch_db:note.note_tag_view_tree
 #: model:ir.ui.view,arch_db:note.view_note_note_form
 msgid "Tags"
 msgstr ""
@@ -266,11 +272,6 @@ msgid "Today Activities"
 msgstr ""
 
 #. module: note
-#: model:ir.ui.view,arch_db:note.view_note_note_filter
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: note
 #: model:ir.actions.act_window,help:note.action_note_note
 msgid "Use notes to organize personal tasks or notes. All\n"
 "            notes are private; no one else will be able to see them. However\n"
diff --git a/addons/note_pad/i18n/note_pad.pot b/addons/note_pad/i18n/note_pad.pot
index b52bda90af1..072e29155e7 100644
--- a/addons/note_pad/i18n/note_pad.pot
+++ b/addons/note_pad/i18n/note_pad.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index cc864e8b421..4a67b2e98a8 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pad
-#: model:ir.ui.view,arch_db:pad.base_config_settings_view_form_inherit_pad
+#: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
 msgid "API Key"
 msgstr ""
 
@@ -31,16 +31,14 @@ msgid "Display Name"
 msgstr ""
 
 #. module: pad
-#: model:ir.model.fields,help:pad.field_base_config_settings_pad_key
-#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_key
 #: model:ir.model.fields,help:pad.field_res_company_pad_key
+#: model:ir.model.fields,help:pad.field_res_config_settings_pad_key
 msgid "Etherpad lite api key."
 msgstr ""
 
 #. module: pad
-#: model:ir.model.fields,help:pad.field_base_config_settings_pad_server
-#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_server
 #: model:ir.model.fields,help:pad.field_res_company_pad_server
+#: model:ir.model.fields,help:pad.field_res_config_settings_pad_server
 msgid "Etherpad lite server. Example: beta.primarypad.com"
 msgstr ""
 
@@ -56,7 +54,7 @@ msgstr ""
 
 #. module: pad
 #. openerp-web
-#: code:addons/pad/static/src/js/pad.js:127
+#: code:addons/pad/static/src/js/pad.js:147
 #, python-format
 msgid "Loading"
 msgstr ""
@@ -67,8 +65,7 @@ msgid "Pad Api Key"
 msgstr ""
 
 #. module: pad
-#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_key
-#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_key
+#: model:ir.model.fields,field_description:pad.field_res_config_settings_pad_key
 msgid "Pad Api Key *"
 msgstr ""
 
@@ -78,13 +75,12 @@ msgid "Pad Server"
 msgstr ""
 
 #. module: pad
-#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_server
-#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_server
+#: model:ir.model.fields,field_description:pad.field_res_config_settings_pad_server
 msgid "Pad Server *"
 msgstr ""
 
 #. module: pad
-#: code:addons/pad/models/pad.py:57
+#: code:addons/pad/models/pad.py:58
 #, python-format
 msgid "Pad creation failed, either there is a problem with your pad server URL or with your connection."
 msgstr ""
@@ -97,31 +93,26 @@ msgid "Please enter your Etherpad credentials through the menu 'Settings > Gener
 msgstr ""
 
 #. module: pad
-#: model:ir.ui.view,arch_db:pad.base_config_settings_view_form_inherit_pad
+#: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
 msgid "Server"
 msgstr ""
 
 #. module: pad
 #. openerp-web
-#: code:addons/pad/static/src/js/pad.js:146
+#: code:addons/pad/static/src/js/pad.js:166
 #, python-format
 msgid "This pad will be initialized on first edit"
 msgstr ""
 
 #. module: pad
 #. openerp-web
-#: code:addons/pad/static/src/js/pad.js:140
+#: code:addons/pad/static/src/js/pad.js:160
 #, python-format
 msgid "Unable to load pad"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
-
-#. module: pad
-#: model:ir.ui.view,arch_db:pad.base_config_settings_view_form_inherit_pad
+#: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
 msgid "e.g. beta.primarypad.com"
 msgstr ""
 
@@ -130,3 +121,8 @@ msgstr ""
 msgid "pad.common"
 msgstr ""
 
+#. module: pad
+#: model:ir.model,name:pad.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/pad_project/i18n/pad_project.pot b/addons/pad_project/i18n/pad_project.pot
index 89e46fa15b1..5e38b357a7f 100644
--- a/addons/pad_project/i18n/pad_project.pot
+++ b/addons/pad_project/i18n/pad_project.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,37 +16,33 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pad_project
-#: model:ir.model.fields,help:pad_project.field_project_config_settings_pad_key
-msgid "Etherpad lite api key."
-msgstr ""
-
-#. module: pad_project
-#: model:ir.model.fields,help:pad_project.field_project_config_settings_pad_server
-msgid "Etherpad lite server. Example: beta.primarypad.com"
+#: model:ir.model.fields,field_description:pad_project.field_project_task_description_pad
+msgid "Pad URL"
 msgstr ""
 
 #. module: pad_project
-#: model:ir.model.fields,field_description:pad_project.field_project_config_settings_pad_key
-msgid "Pad Api Key"
+#: model:ir.model,name:pad_project.model_project_project
+msgid "Project"
 msgstr ""
 
 #. module: pad_project
-#: model:ir.model.fields,field_description:pad_project.field_project_config_settings_pad_server
-msgid "Pad Server"
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
 msgstr ""
 
 #. module: pad_project
-#: model:ir.model.fields,field_description:pad_project.field_project_task_description_pad
-msgid "Pad URL"
+#: model:ir.model.fields,field_description:pad_project.field_project_task_use_pad
+msgid "Use collaborative pad"
 msgstr ""
 
 #. module: pad_project
-#: model:ir.model,name:pad_project.model_project_task
-msgid "Task"
+#: model:ir.model.fields,help:pad_project.field_project_project_use_pads
+#: model:ir.model.fields,help:pad_project.field_project_task_use_pad
+msgid "Use collaborative pad for the tasks on this project."
 msgstr ""
 
 #. module: pad_project
-#: model:ir.model,name:pad_project.model_project_config_settings
-msgid "project.config.settings"
+#: model:ir.model.fields,field_description:pad_project.field_project_project_use_pads
+msgid "Use collaborative pads"
 msgstr ""
 
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index d37a14b67a3..05b3b94fde0 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,88 @@ msgid "3D Secure HTML"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.confirm
+msgid "<i class=\"fa fa-arrow-circle-right\"/> Back to My Account"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_tokens_list
+msgid "<i class=\"fa fa-lock\"> Pay</i>"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_tokens_list
+msgid "<i class=\"fa fa-plus-circle\"> Add new card</i>"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_tokens_list
+msgid "<i class=\"fa fa-trash\"/> Delete"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:76
+#: code:addons/payment/static/src/js/payment_form.js:219
+#, python-format
+msgid "<p>Please fill all the inputs required.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:180
+#, python-format
+msgid "<p>Please select a payment method.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:274
+#, python-format
+msgid "<p>Please select the option to add a new payment method.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:315
+#, python-format
+msgid "<p>This card is currently linked to the following records:<p/>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:108
+#: code:addons/payment/static/src/js/payment_form.js:120
+#: code:addons/payment/static/src/js/payment_form.js:254
+#: code:addons/payment/static/src/js/payment_form.js:267
+#, python-format
+msgid "<p>We are not able to add your payment method at the moment.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:298
+#: code:addons/payment/static/src/js/payment_form.js:333
+#, python-format
+msgid "<p>We are not able to delete your payment method at the moment.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:155
+#: code:addons/payment/static/src/js/payment_form.js:161
+#, python-format
+msgid "<p>We are not able to redirect you to the payment form.</p>"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:169
+#, python-format
+msgid "<p>We're unable to process your payment.</p>"
+msgstr ""
+
+#. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid "<span class=\"o_warning_text\">Test</span>\n"
 "                                    <span class=\"o_stat_text\">Environment</span>"
@@ -93,11 +175,6 @@ msgid "<span><i>Pending</i>... The order will be validated after the payment.</s
 msgstr ""
 
 #. module: payment
-#: model:ir.model.fields,help:payment.field_payment_acquirer_journal_id
-msgid "Account journal used for automatic payment reconciliation."
-msgstr ""
-
-#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_acquirer_id
 msgid "Acquirer"
 msgstr ""
@@ -118,6 +195,21 @@ msgid "Acquirer Reference"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_icon_acquirer_ids
+msgid "Acquirers"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_icon_form_view
+msgid "Acquirers list"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.acquirer_kanban
+msgid "Activate"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_active
 msgid "Active"
 msgstr ""
@@ -147,22 +239,14 @@ msgstr ""
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_amount
 #: model:ir.model.fields,help:payment.field_payment_transaction_amount
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.pay
 msgid "Amount"
 msgstr ""
 
 #. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "Authorize & capture the amount and confirm the SO on acquirer confirmation"
-msgstr ""
-
-#. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation"
-msgstr ""
-
-#. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "Authorize the amount and confirm the SO on acquirer confirmation (capture manually)"
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_authorize_implemented
+msgid "Authorize Mechanism Supported"
 msgstr ""
 
 #. module: payment
@@ -177,6 +261,12 @@ msgid "Authorized"
 msgstr ""
 
 #. module: payment
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
+msgid "Bank Account"
+msgstr ""
+
+#. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_buckaroo
 #: selection:payment.acquirer,provider:0
 msgid "Buckaroo"
@@ -203,6 +293,13 @@ msgid "Callback Method"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:323
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_cancel_msg
 msgid "Cancel Message"
 msgstr ""
@@ -213,11 +310,28 @@ msgid "Canceled"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:168
+#, python-format
+msgid "Cannot set-up the payment"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_capture_manually
+msgid "Capture Amount Manually"
+msgstr ""
+
+#. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "Capture Transaction"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer_capture_manually
+msgid "Capture the amount from Odoo, when the delivery is completed."
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_city
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "City"
@@ -229,6 +343,17 @@ msgid "Click to create a payment acquirer."
 msgstr ""
 
 #. module: payment
+#: model:ir.actions.act_window,help:payment.action_payment_icon
+msgid "Click to create a payment icon."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
+msgid "Communication"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_company_id
 msgid "Company"
 msgstr ""
@@ -244,6 +369,13 @@ msgid "Configure"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:322
+#, python-format
+msgid "Confirm Deletion"
+msgstr ""
+
+#. module: payment
 #: model:ir.model,name:payment.model_res_partner
 msgid "Contact"
 msgstr ""
@@ -272,6 +404,7 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_create_uid
+#: model:ir.model.fields,field_description:payment.field_payment_icon_create_uid
 #: model:ir.model.fields,field_description:payment.field_payment_token_create_uid
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_create_uid
 msgid "Created by"
@@ -279,6 +412,7 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_create_date
+#: model:ir.model.fields,field_description:payment.field_payment_icon_create_date
 #: model:ir.model.fields,field_description:payment.field_payment_token_create_date
 msgid "Created on"
 msgstr ""
@@ -309,8 +443,8 @@ msgid "Custom"
 msgstr ""
 
 #. module: payment
-#: model:ir.ui.view,arch_db:payment.transaction_form
-msgid "Customer Details"
+#: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_id
+msgid "Customer"
 msgstr ""
 
 #. module: payment
@@ -319,17 +453,13 @@ msgid "Description"
 msgstr ""
 
 #. module: payment
-#: model:ir.model.fields,help:payment.field_payment_acquirer_save_token
-msgid "Determine if card data is saved as a token automatically or not. Payment tokens allow your customer to reuse their cards in the e-commerce or allow you to charge an invoice directly on a credit card. If set to 'let the customer decide', ecommerce customers will have a checkbox displayed on the payment page."
-msgstr ""
-
-#. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_sequence
 msgid "Determine the display order"
 msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_display_name
+#: model:ir.model.fields,field_description:payment.field_payment_icon_display_name
 #: model:ir.model.fields,field_description:payment.field_payment_token_display_name
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_display_name
 msgid "Display Name"
@@ -382,6 +512,13 @@ msgid "Error Message"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:372
+#, python-format
+msgid "Error: "
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_fees
 msgid "Fees"
 msgstr ""
@@ -427,6 +564,11 @@ msgid "Form with tokenization"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.confirm
+msgid "From"
+msgstr ""
+
+#. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_search
 msgid "Group By"
 msgstr ""
@@ -438,17 +580,29 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_id
+#: model:ir.model.fields,field_description:payment.field_payment_icon_id
 #: model:ir.model.fields,field_description:payment.field_payment_token_id
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_id
 msgid "ID"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer_specific_countries
+msgid "If you leave it empty, the payment acquirer will be available for all the countries."
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_image
+#: model:ir.model.fields,field_description:payment.field_payment_icon_image
 msgid "Image"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_icon_image_payment_form
+msgid "Image displayed on the payment form"
+msgstr ""
+
+#. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_ogone
 msgid "Ingenico"
 msgstr ""
@@ -476,6 +630,7 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer___last_update
+#: model:ir.model.fields,field_description:payment.field_payment_icon___last_update
 #: model:ir.model.fields,field_description:payment.field_payment_token___last_update
 #: model:ir.model.fields,field_description:payment.field_payment_transaction___last_update
 msgid "Last Modified on"
@@ -483,6 +638,7 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_write_uid
+#: model:ir.model.fields,field_description:payment.field_payment_icon_write_uid
 #: model:ir.model.fields,field_description:payment.field_payment_token_write_uid
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_write_uid
 msgid "Last Updated by"
@@ -490,6 +646,7 @@ msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_write_date
+#: model:ir.model.fields,field_description:payment.field_payment_icon_write_date
 #: model:ir.model.fields,field_description:payment.field_payment_token_write_date
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_write_date
 msgid "Last Updated on"
@@ -501,11 +658,26 @@ msgid "Let the customer decide"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_icon_acquirer_ids
+msgid "List of Acquirers supporting this payment icon."
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_website_published
 msgid "Make this payment acquirer available (Customer invoices, etc.)"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.pay_methods
+msgid "Manage your Payment Methods"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.pay_meth_link
+msgid "Manage your payment methods"
+msgstr ""
+
+#. module: payment
 #: selection:payment.acquirer,provider:0
 msgid "Manual Configuration"
 msgstr ""
@@ -562,9 +734,25 @@ msgid "Messages"
 msgstr ""
 
 #. module: payment
+#: code:addons/payment/models/payment_acquirer.py:395
+#, python-format
+msgid "Missing partner reference when trying to create a new payment token"
+msgstr ""
+
+#. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:75
+#: code:addons/payment/static/src/js/payment_form.js:218
+#, python-format
+msgid "Missing values"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_name
+#: model:ir.model.fields,field_description:payment.field_payment_icon_name
 #: model:ir.model.fields,field_description:payment.field_payment_token_name
 #: model:ir.ui.view,arch_db:payment.acquirer_form
+#: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "Name"
 msgstr ""
@@ -580,8 +768,11 @@ msgid "Never"
 msgstr ""
 
 #. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "No automatic confirmation"
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:179
+#: code:addons/payment/static/src/js/payment_form.js:273
+#, python-format
+msgid "No payment method selected"
 msgstr ""
 
 #. module: payment
@@ -590,30 +781,36 @@ msgid "Note that tokens from acquirers set to only authorize transactions (inste
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer_payment_flow
+msgid "Note: Subscriptions does not take this field in account, it uses server to server by default."
+msgstr ""
+
+#. module: payment
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
 msgstr ""
 
 #. module: payment
-#: code:addons/payment/models/payment_acquirer.py:664
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:376
 #, python-format
-msgid "Only transactions in the Authorized status can be captured."
+msgid "Ok"
 msgstr ""
 
 #. module: payment
-#: code:addons/payment/models/payment_acquirer.py:671
+#: code:addons/payment/models/payment_acquirer.py:759
 #, python-format
-msgid "Only transactions in the Authorized status can be voided."
+msgid "Only transactions in the Authorized status can be captured."
 msgstr ""
 
 #. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_acquirer_auto_confirm
-msgid "Order Confirmation"
+#: code:addons/payment/models/payment_acquirer.py:766
+#, python-format
+msgid "Only transactions in the Authorized status can be voided."
 msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_partner_id
-#: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_id
 msgid "Partner"
 msgstr ""
 
@@ -623,12 +820,24 @@ msgid "Partner Name"
 msgstr ""
 
 #. module: payment
+#: code:addons/payment/controllers/portal.py:39
+#, python-format
+msgid "Pay Now"
+msgstr ""
+
+#. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_payu
 #: selection:payment.acquirer,provider:0
 msgid "PayUmoney"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.pay
+msgid "Payment"
+msgstr ""
+
+#. module: payment
 #: model:ir.model,name:payment.model_payment_acquirer
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid "Payment Acquirer"
@@ -642,11 +851,28 @@ msgid "Payment Acquirers"
 msgstr ""
 
 #. module: payment
+#: model:ir.model,name:payment.model_payment_icon
+#: model:ir.ui.view,arch_db:payment.payment_icon_form_view
+msgid "Payment Icon"
+msgstr ""
+
+#. module: payment
+#: model:ir.actions.act_window,name:payment.action_payment_icon
+#: model:ir.ui.menu,name:payment.payment_icon_menu
+msgid "Payment Icons"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
 msgid "Payment Journal"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.pay_methods
+msgid "Payment Methods"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_payment_token_id
 msgid "Payment Token"
 msgstr ""
@@ -669,7 +895,6 @@ msgstr ""
 #. module: payment
 #: model:ir.actions.act_window,name:payment.action_payment_transaction
 #: model:ir.actions.act_window,name:payment.action_payment_tx_ids
-#: model:ir.actions.act_window,name:payment.payment_transaction_action_child
 #: model:ir.model.fields,field_description:payment.field_payment_token_payment_ids
 #: model:ir.ui.menu,name:payment.payment_transaction_menu
 #: model:ir.ui.view,arch_db:payment.transaction_form
@@ -678,6 +903,11 @@ msgid "Payment Transactions"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_flow
+msgid "Payment flow"
+msgstr ""
+
+#. module: payment
 #: code:addons/payment/models/account_payment.py:59
 #, python-format
 msgid "Payment transaction failed (%s)"
@@ -686,12 +916,22 @@ msgstr ""
 #. module: payment
 #: model:ir.model,name:payment.model_account_payment
 #: model:ir.ui.menu,name:payment.root_payment_menu
-#: model:ir.ui.view,arch_db:payment.acquirer_form
 #: model:ir.ui.view,arch_db:payment.payment_token_form_view
 msgid "Payments"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer_journal_id
+msgid "Payments will be registered into this journal. If you get paid straight on your bank account,\n"
+"                select your bank account. If you get paid in batch for several transactions, create a specific\n"
+"                payment journal for this payment acquirer to easily manage the bank reconciliation. You hold\n"
+"                the amount in a temporary transfer account of your books (created automatically when you create\n"
+"                the payment journal). Then when you get paid on your bank account by the payment acquirer, you\n"
+"                reconcile the bank statement line with this temporary transfer account. Use reconciliation\n"
+"                templates to do it in one-click."
+msgstr ""
+
+#. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_paypal
 #: selection:payment.acquirer,provider:0
 msgid "Paypal"
@@ -713,18 +953,39 @@ msgid "Phone"
 msgstr ""
 
 #. module: payment
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
+msgid "Please use the following transfer details"
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
+msgid "Please use the order name as communication reference."
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.pay
+msgid "Processed by"
+msgstr ""
+
+#. module: payment
 #: selection:payment.acquirer,environment:0
 msgid "Production"
 msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_provider
+#: model:ir.model.fields,field_description:payment.field_payment_transaction_provider
 #: model:ir.ui.view,arch_db:payment.acquirer_search
 msgid "Provider"
 msgstr ""
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_reference
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.pay
 msgid "Reference"
 msgstr ""
 
@@ -734,6 +995,16 @@ msgid "Reference of the TX as stored in the acquirer database"
 msgstr ""
 
 #. module: payment
+#: selection:payment.transaction,state:0
+msgid "Refunded"
+msgstr ""
+
+#. module: payment
+#: selection:payment.transaction,state:0
+msgid "Refunding"
+msgstr ""
+
+#. module: payment
 #: constraint:payment.acquirer:0
 msgid "Required fields not filled"
 msgstr ""
@@ -744,6 +1015,16 @@ msgid "S2S Form Template"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token
+msgid "Save Cards"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_tokens_list
+msgid "Save my payment data"
+msgstr ""
+
+#. module: payment
 #: model:ir.actions.act_window,name:payment.payment_token_action
 #: model:ir.ui.menu,name:payment.payment_token_menu
 msgid "Saved Payment Data"
@@ -765,11 +1046,31 @@ msgid "Sequence"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:107
+#: code:addons/payment/static/src/js/payment_form.js:119
+#: code:addons/payment/static/src/js/payment_form.js:154
+#: code:addons/payment/static/src/js/payment_form.js:160
+#: code:addons/payment/static/src/js/payment_form.js:253
+#: code:addons/payment/static/src/js/payment_form.js:297
+#: code:addons/payment/static/src/js/payment_form.js:332
+#, python-format
+msgid "Server Error"
+msgstr ""
+
+#. module: payment
 #: selection:payment.transaction,type:0
 msgid "Server To Server"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:266
+#, python-format
+msgid "Server error"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_short_name
 msgid "Short name"
 msgstr ""
@@ -791,13 +1092,13 @@ msgid "Small-sized image of this provider. It is automatically resized as a 64x6
 msgstr ""
 
 #. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_transaction_state
-msgid "Status"
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_specific_countries
+msgid "Specific Countries"
 msgstr ""
 
 #. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token
-msgid "Store Card Data"
+#: model:ir.model.fields,field_description:payment.field_payment_transaction_state
+msgid "Status"
 msgstr ""
 
 #. module: payment
@@ -807,6 +1108,11 @@ msgid "Stripe"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_icon_ids
+msgid "Supported Payment Icons"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_registration_view_template_id
 msgid "Template for method registration"
 msgstr ""
@@ -822,7 +1128,23 @@ msgid "Thanks Message"
 msgstr ""
 
 #. module: payment
-#: code:addons/payment/models/payment_acquirer.py:480
+#: code:addons/payment/models/payment_acquirer.py:570
+#, python-format
+msgid "The %s payment acquirers are not allowed to manual capture mode!"
+msgstr ""
+
+#. module: payment
+#: selection:payment.acquirer,payment_flow:0
+msgid "The customer encode his payment details on the website."
+msgstr ""
+
+#. module: payment
+#: selection:payment.acquirer,payment_flow:0
+msgid "The customer is redirected to the website of the acquirer."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:563
 #, python-format
 msgid "The payment transaction reference must be unique!"
 msgstr ""
@@ -835,11 +1157,21 @@ msgid "This feature is not available for payment acquirers set to the \"Authoriz
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_icon_image
+msgid "This field holds the image used for this payment icon, limited to 1024x1024px"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_image
 msgid "This field holds the image used for this provider, limited to 1024x1024px"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer_save_token
+msgid "This option allows customers to save their credit card as a payment token and to reuse it for a later purchase.If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you issue an invoice."
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_country_ids
 msgid "This payment gateway is available for selected countries. If none is selected it is available for all countries."
 msgstr ""
@@ -851,14 +1183,8 @@ msgid "This template renders the acquirer button with all necessary values.\n"
 msgstr ""
 
 #. module: payment
-#: code:addons/payment/models/payment_acquirer.py:166
-#, python-format
-msgid "Transaction Authorization is not supported by this payment provider."
-msgstr ""
-
-#. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
-msgid "Transfer information will be provided after choosing the payment method."
+msgid "Transfer information will be provided after choosing the payment aquirer."
 msgstr ""
 
 #. module: payment
@@ -872,6 +1198,11 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: payment
+#: selection:payment.transaction,type:0
+msgid "Validation of the bank card"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_dom_var
 msgid "Variable domestic fees (in percents)"
 msgstr ""
@@ -882,6 +1213,11 @@ msgid "Variable international fees (in percents)"
 msgstr ""
 
 #. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_token_verified
+msgid "Verified"
+msgstr ""
+
+#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_website_published
 msgid "Visible in Portal / Website"
 msgstr ""
@@ -892,6 +1228,13 @@ msgid "Void Transaction"
 msgstr ""
 
 #. module: payment
+#. openerp-web
+#: code:addons/payment/static/src/js/payment_form.js:318
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_transfer
 #: selection:payment.acquirer,provider:0
 msgid "Wire Transfer"
@@ -958,6 +1301,11 @@ msgid "amount: the transaction amount, a float"
 msgstr ""
 
 #. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_tokens_list
+msgid "and more"
+msgstr ""
+
+#. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid "context: the current context dictionary"
 msgstr ""
diff --git a/addons/payment_adyen/i18n/payment_adyen.pot b/addons/payment_adyen/i18n/payment_adyen.pot
index da0bba6bd56..ddaea38fac7 100644
--- a/addons/payment_adyen/i18n/payment_adyen.pot
+++ b/addons/payment_adyen/i18n/payment_adyen.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,37 +16,37 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:181
+#: code:addons/payment_adyen/models/payment.py:186
 #, python-format
 msgid "; multiple order found"
 msgstr ""
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:179
+#: code:addons/payment_adyen/models/payment.py:184
 #, python-format
 msgid "; no order found"
 msgstr ""
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:229
+#: code:addons/payment_adyen/models/payment.py:234
 #, python-format
 msgid "Adyen: feedback error"
 msgstr ""
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:191
+#: code:addons/payment_adyen/models/payment.py:196
 #, python-format
 msgid "Adyen: invalid merchantSig, received %s, computed %s"
 msgstr ""
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:177
+#: code:addons/payment_adyen/models/payment.py:182
 #, python-format
 msgid "Adyen: received data for reference %s"
 msgstr ""
 
 #. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:170
+#: code:addons/payment_adyen/models/payment.py:175
 #, python-format
 msgid "Adyen: received data with missing reference (%s) or missing pspReference (%s)"
 msgstr ""
diff --git a/addons/payment_authorize/i18n/payment_authorize.pot b/addons/payment_authorize/i18n/payment_authorize.pot
index cfd53d5347d..1970c9737a7 100644
--- a/addons/payment_authorize/i18n/payment_authorize.pot
+++ b/addons/payment_authorize/i18n/payment_authorize.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "API Transaction Key"
 msgstr ""
 
 #. module: payment_authorize
-#: code:addons/payment_authorize/models/authorize_request.py:68
+#: code:addons/payment_authorize/models/authorize_request.py:67
 #, python-format
 msgid "Authorize.net Error Message(s):\n"
 " %s"
@@ -55,12 +55,12 @@ msgstr ""
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
-msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Cardholder name"
 msgstr ""
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
-msgid "Expires"
+msgid "Expires (MM / YY)"
 msgstr ""
 
 #. module: payment_authorize
@@ -69,27 +69,27 @@ msgid "How to get paid with Authorize.Net"
 msgstr ""
 
 #. module: payment_authorize
-#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
-msgid "MM / YY"
+#: model:ir.model,name:payment_authorize.model_payment_acquirer
+msgid "Payment Acquirer"
 msgstr ""
 
 #. module: payment_authorize
-#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
-msgid "Name"
+#: model:ir.model,name:payment_authorize.model_payment_transaction
+msgid "Payment Transaction"
 msgstr ""
 
 #. module: payment_authorize
-#: model:ir.model,name:payment_authorize.model_payment_acquirer
-msgid "Payment Acquirer"
+#: model:ir.model.fields,field_description:payment_authorize.field_payment_token_provider
+msgid "Provider"
 msgstr ""
 
 #. module: payment_authorize
-#: model:ir.model,name:payment_authorize.model_payment_transaction
-msgid "Payment Transaction"
+#: model:ir.model.fields,field_description:payment_authorize.field_payment_token_save_token
+msgid "Save Cards"
 msgstr ""
 
 #. module: payment_authorize
-#: code:addons/payment_authorize/models/payment.py:346
+#: code:addons/payment_authorize/models/payment.py:372
 #, python-format
 msgid "The Customer Profile creation in Authorize.NET failed."
 msgstr ""
@@ -100,6 +100,11 @@ msgid "This contains the unique reference for this partner/payment token combina
 msgstr ""
 
 #. module: payment_authorize
+#: model:ir.model.fields,help:payment_authorize.field_payment_token_save_token
+msgid "This option allows customers to save their credit card as a payment token and to reuse it for a later purchase.If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you issue an invoice."
+msgstr ""
+
+#. module: payment_authorize
 #: model:ir.model,name:payment_authorize.model_payment_token
 msgid "payment.token"
 msgstr ""
diff --git a/addons/payment_buckaroo/i18n/payment_buckaroo.pot b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
index 0957d8321f3..200b05fe9c4 100644
--- a/addons/payment_buckaroo/i18n/payment_buckaroo.pot
+++ b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,31 +16,31 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/payment.py:143
+#: code:addons/payment_buckaroo/models/payment.py:141
 #, python-format
 msgid "; multiple order found"
 msgstr ""
 
 #. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/payment.py:141
+#: code:addons/payment_buckaroo/models/payment.py:139
 #, python-format
 msgid "; no order found"
 msgstr ""
 
 #. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/payment.py:150
+#: code:addons/payment_buckaroo/models/payment.py:148
 #, python-format
 msgid "Buckaroo: invalid shasign, received %s, computed %s, for data %s"
 msgstr ""
 
 #. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/payment.py:139
+#: code:addons/payment_buckaroo/models/payment.py:137
 #, python-format
 msgid "Buckaroo: received data for reference %s"
 msgstr ""
 
 #. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/payment.py:133
+#: code:addons/payment_buckaroo/models/payment.py:131
 #, python-format
 msgid "Buckaroo: received data with missing reference (%s) or pay_id (%s) or shasign (%s)"
 msgstr ""
diff --git a/addons/payment_ogone/i18n/payment_ogone.pot b/addons/payment_ogone/i18n/payment_ogone.pot
index 03738a4e968..44d236bc131 100644
--- a/addons/payment_ogone/i18n/payment_ogone.pot
+++ b/addons/payment_ogone/i18n/payment_ogone.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_ogone
-#: code:addons/payment_ogone/models/payment.py:241
+#: code:addons/payment_ogone/models/payment.py:240
 #, python-format
 msgid "; multiple order found"
 msgstr ""
 
 #. module: payment_ogone
-#: code:addons/payment_ogone/models/payment.py:239
+#: code:addons/payment_ogone/models/payment.py:238
 #, python-format
 msgid "; no order found"
 msgstr ""
@@ -54,12 +54,12 @@ msgstr ""
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
-msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Cardholder name"
 msgstr ""
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
-msgid "Expires"
+msgid "Expires (MM / YY)"
 msgstr ""
 
 #. module: payment_ogone
@@ -73,29 +73,19 @@ msgid "If you want to use Ogone Aliases, this default Alias Usage will be presen
 msgstr ""
 
 #. module: payment_ogone
-#: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
-msgid "MM / YY"
-msgstr ""
-
-#. module: payment_ogone
-#: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
-msgid "Name"
-msgstr ""
-
-#. module: payment_ogone
-#: code:addons/payment_ogone/models/payment.py:248
+#: code:addons/payment_ogone/models/payment.py:247
 #, python-format
 msgid "Ogone: invalid shasign, received %s, computed %s, for data %s"
 msgstr ""
 
 #. module: payment_ogone
-#: code:addons/payment_ogone/models/payment.py:237
+#: code:addons/payment_ogone/models/payment.py:236
 #, python-format
 msgid "Ogone: received data for reference %s"
 msgstr ""
 
 #. module: payment_ogone
-#: code:addons/payment_ogone/models/payment.py:230
+#: code:addons/payment_ogone/models/payment.py:229
 #, python-format
 msgid "Ogone: received data with missing reference (%s) or pay_id (%s) or shasign (%s)"
 msgstr ""
diff --git a/addons/payment_paypal/i18n/payment_paypal.pot b/addons/payment_paypal/i18n/payment_paypal.pot
index d618a4f35ad..5951bd49dcd 100644
--- a/addons/payment_paypal/i18n/payment_paypal.pot
+++ b/addons/payment_paypal/i18n/payment_paypal.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,6 +36,11 @@ msgid "Payment Acquirer"
 msgstr ""
 
 #. module: payment_paypal
+#: model:ir.model.fields,help:payment_paypal.field_payment_acquirer_paypal_pdt_token
+msgid "Payment Data Transfer allows you to receive notification of successful payments as they are made."
+msgstr ""
+
+#. module: payment_paypal
 #: model:ir.model,name:payment_paypal.model_payment_transaction
 msgid "Payment Transaction"
 msgstr ""
@@ -56,12 +61,12 @@ msgid "Paypal Merchant ID"
 msgstr ""
 
 #. module: payment_paypal
-#: model:ir.ui.view,arch_db:payment_paypal.transaction_form_paypal
-msgid "Paypal TX Details"
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_pdt_token
+msgid "Paypal PDT Token"
 msgstr ""
 
 #. module: payment_paypal
-#: code:addons/payment_paypal/models/payment.py:137
+#: code:addons/payment_paypal/models/payment.py:138
 #, python-format
 msgid "Paypal: received data with missing reference (%s) or txn_id (%s)"
 msgstr ""
diff --git a/addons/payment_payumoney/i18n/payment_payumoney.pot b/addons/payment_payumoney/i18n/payment_payumoney.pot
index ef574ce9660..5dc283909ff 100644
--- a/addons/payment_payumoney/i18n/payment_payumoney.pot
+++ b/addons/payment_payumoney/i18n/payment_payumoney.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,31 +26,31 @@ msgid "Merchant Salt"
 msgstr ""
 
 #. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:145
+#: code:addons/payment_payumoney/models/payment.py:146
 #, python-format
 msgid "PayUmoney: feedback error"
 msgstr ""
 
 #. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:107
+#: code:addons/payment_payumoney/models/payment.py:108
 #, python-format
 msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s"
 msgstr ""
 
 #. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:101
+#: code:addons/payment_payumoney/models/payment.py:102
 #, python-format
 msgid "PayUmoney: received data for reference %s; multiple orders found"
 msgstr ""
 
 #. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:98
+#: code:addons/payment_payumoney/models/payment.py:99
 #, python-format
 msgid "PayUmoney: received data for reference %s; no order found"
 msgstr ""
 
 #. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:93
+#: code:addons/payment_payumoney/models/payment.py:94
 #, python-format
 msgid "PayUmoney: received data with missing reference (%s) or pay_id (%s) or shashign (%s)"
 msgstr ""
diff --git a/addons/payment_sips/i18n/payment_sips.pot b/addons/payment_sips/i18n/payment_sips.pot
index 8a821864a3e..b15ad8f2575 100644
--- a/addons/payment_sips/i18n/payment_sips.pot
+++ b/addons/payment_sips/i18n/payment_sips.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,30 +16,40 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:155
+#: code:addons/payment_sips/models/payment.py:153
 #, python-format
 msgid "; multiple order found"
 msgstr ""
 
 #. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:153
+#: code:addons/payment_sips/models/payment.py:151
 #, python-format
 msgid "; no order found"
 msgstr ""
 
 #. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:76
+#: code:addons/payment_sips/models/payment.py:74
 #, python-format
 msgid "Currency not supported by Wordline"
 msgstr ""
 
 #. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:57
+#: code:addons/payment_sips/models/payment.py:55
 #, python-format
 msgid "Incorrect payment acquirer provider"
 msgstr ""
 
 #. module: payment_sips
+#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_version
+msgid "Interface Version"
+msgstr ""
+
+#. module: payment_sips
+#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id
+msgid "Merchant ID"
+msgstr ""
+
+#. module: payment_sips
 #: model:ir.model,name:payment_sips.model_payment_acquirer
 msgid "Payment Acquirer"
 msgstr ""
@@ -50,18 +60,28 @@ msgid "Payment Transaction"
 msgstr ""
 
 #. module: payment_sips
-#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id
-msgid "SIPS API User Password"
+#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_prod_url
+msgid "Prod's url"
 msgstr ""
 
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_secret
-msgid "SIPS Secret"
+msgid "Secret Key"
 msgstr ""
 
 #. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:151
+#: code:addons/payment_sips/models/payment.py:149
 #, python-format
 msgid "Sips: received data for reference %s"
 msgstr ""
 
+#. module: payment_sips
+#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_test_url
+msgid "Test's url"
+msgstr ""
+
+#. module: payment_sips
+#: model:ir.model.fields,help:payment_sips.field_payment_acquirer_sips_merchant_id
+msgid "Used for production only"
+msgstr ""
+
diff --git a/addons/payment_stripe/i18n/payment_stripe.pot b/addons/payment_stripe/i18n/payment_stripe.pot
index 664c1ef7953..3d9c23cc3c2 100644
--- a/addons/payment_stripe/i18n/payment_stripe.pot
+++ b/addons/payment_stripe/i18n/payment_stripe.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_stripe
+#. openerp-web
+#: code:addons/payment_stripe/static/src/xml/stripe_templates.xml:8
+#, python-format
+msgid "&times;"
+msgstr ""
+
+#. module: payment_stripe
 #: model:ir.model.fields,help:payment_stripe.field_payment_acquirer_stripe_image_url
 msgid "A relative or absolute URL pointing to a square image of your brand or product. As defined in your Stripe profile. See: https://stripe.com/docs/checkout"
 msgstr ""
@@ -27,12 +34,12 @@ msgstr ""
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
-msgid "Card Holder Name"
+msgid "Card number"
 msgstr ""
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
-msgid "Card Number"
+msgid "Cardholder name"
 msgstr ""
 
 #. module: payment_stripe
@@ -41,18 +48,22 @@ msgid "Checkout Image URL"
 msgstr ""
 
 #. module: payment_stripe
-#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
-msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
+#. openerp-web
+#: code:addons/payment_stripe/static/src/xml/stripe_templates.xml:15
+#, python-format
+msgid "Close"
 msgstr ""
 
 #. module: payment_stripe
-#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
-msgid "Expiration Date"
+#. openerp-web
+#: code:addons/payment_stripe/static/src/xml/stripe_templates.xml:9
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
-msgid "MM / YY"
+msgid "Expires (MM / YY)"
 msgstr ""
 
 #. module: payment_stripe
@@ -66,6 +77,13 @@ msgid "Payment Transaction"
 msgstr ""
 
 #. module: payment_stripe
+#. openerp-web
+#: code:addons/payment_stripe/static/src/js/stripe.js:38
+#, python-format
+msgid "Payment error"
+msgstr ""
+
+#. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key
 msgid "Stripe Publishable Key"
 msgstr ""
@@ -76,19 +94,19 @@ msgid "Stripe Secret Key"
 msgstr ""
 
 #. module: payment_stripe
-#: code:addons/payment_stripe/models/payment.py:124
+#: code:addons/payment_stripe/models/payment.py:171
 #, python-format
 msgid "Stripe: %s orders found for reference %s"
 msgstr ""
 
 #. module: payment_stripe
-#: code:addons/payment_stripe/models/payment.py:115
+#: code:addons/payment_stripe/models/payment.py:161
 #, python-format
-msgid "Stripe: invalid reply received from provider, missing reference"
+msgid "Stripe: invalid reply received from provider, missing reference. Additional message: %s"
 msgstr ""
 
 #. module: payment_stripe
-#: code:addons/payment_stripe/models/payment.py:120
+#: code:addons/payment_stripe/models/payment.py:167
 #, python-format
 msgid "Stripe: no order found for reference %s"
 msgstr ""
diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_transfer/i18n/payment_transfer.pot
index 65c04d6bc77..b56b65715f3 100644
--- a/addons/payment_transfer/i18n/payment_transfer.pot
+++ b/addons/payment_transfer/i18n/payment_transfer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:63
+#: code:addons/payment_transfer/models/payment.py:70
 #, python-format
 msgid "; multiple order found"
 msgstr ""
 
 #. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:61
+#: code:addons/payment_transfer/models/payment.py:68
 #, python-format
 msgid "; no order found"
 msgstr ""
@@ -62,7 +62,7 @@ msgid "Payment Transaction"
 msgstr ""
 
 #. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:59
+#: code:addons/payment_transfer/models/payment.py:66
 #, python-format
 msgid "received data for reference %s"
 msgstr ""
diff --git a/addons/phone_validation/i18n/phone_validation.pot b/addons/phone_validation/i18n/phone_validation.pot
index 0eef363c888..aea19439d1b 100644
--- a/addons/phone_validation/i18n/phone_validation.pot
+++ b/addons/phone_validation/i18n/phone_validation.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: phone_validation
+#: selection:res.company,phone_international_format:0
+msgid "Add international prefix"
+msgstr ""
+
+#. module: phone_validation
 #: model:ir.model.fields,help:phone_validation.field_res_company_phone_international_format
 msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
 msgstr ""
@@ -31,11 +36,6 @@ msgid "Display Name"
 msgstr ""
 
 #. module: phone_validation
-#: model:ir.model.fields,field_description:phone_validation.field_res_company_phone_international_format
-msgid "Enforce International Format"
-msgstr ""
-
-#. module: phone_validation
 #: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin_id
 msgid "ID"
 msgstr ""
@@ -58,6 +58,16 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: phone_validation
+#: model:ir.model.fields,field_description:phone_validation.field_res_company_phone_international_format
+msgid "Local Numbers"
+msgstr ""
+
+#. module: phone_validation
+#: selection:res.company,phone_international_format:0
+msgid "No prefix"
+msgstr ""
+
+#. module: phone_validation
 #: code:addons/phone_validation/tools/phone_validation.py:44
 #, python-format
 msgid "Unable to format %s:\n"
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 262c3c79c77..587b31eceb0 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:772
-#: code:addons/point_of_sale/models/pos_order.py:781
+#: code:addons/point_of_sale/models/pos_order.py:807
+#: code:addons/point_of_sale/models/pos_order.py:816
 #, python-format
 msgid " REFUND"
 msgstr ""
@@ -53,21 +53,21 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1448
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1474
 #, python-format
 msgid "% discount"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1575
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1615
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1603
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1643
 #, python-format
 msgid "&nbsp;"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:82
+#: code:addons/point_of_sale/models/pos_order.py:83
 #, python-format
 msgid "(RESCUE FOR %(session)s)"
 msgstr ""
@@ -83,13 +83,6 @@ msgid "+ Transactions"
 msgstr ""
 
 #. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:302
-#, python-format
-msgid "123.14 €"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
 msgid "<b>Set Custom Image...</b>"
 msgstr ""
@@ -100,6 +93,11 @@ msgid "<i class=\"fa fa-eye-slash\"/>Hide"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "<i class=\"fa fa-fw fa-arrow-right\"/>How to manage tax-included prices"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/tour.js:17
 #, python-format
@@ -129,6 +127,11 @@ msgid "<span class=\"o_stat_text\">Take</span>\n"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "<span class=\"oe_inline\"><b>Skip Preview Screen</b></span>"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_amount\">$ 0.86</span>"
@@ -231,14 +234,14 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1931
+#: code:addons/point_of_sale/static/src/js/screens.js:1964
 #, python-format
 msgid "? Clicking \"Confirm\" will validate the payment."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1201
+#: code:addons/point_of_sale/static/src/js/screens.js:1231
 #, python-format
 msgid "A Customer Name Is Required"
 msgstr ""
@@ -249,18 +252,8 @@ msgid "A Security PIN used to protect sensible functionality in the Point of Sal
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "A custom receipt footer message"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "A custom receipt header message"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_uuid
-msgid "A globally unique identifier for this pos configuration, used to prevent conflicts in client-generated data"
+msgid "A globally unique identifier for this pos configuration, used to prevent conflicts in client-generated data."
 msgstr ""
 
 #. module: point_of_sale
@@ -288,28 +281,23 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_footer
-msgid "A short text that will be inserted as a footer in the printed receipt"
+msgid "A short text that will be inserted as a footer in the printed receipt."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_header
-msgid "A short text that will be inserted as a header in the printed receipt"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_sale_price
-msgid "A single sale price per product"
+msgid "A short text that will be inserted as a header in the printed receipt."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1614
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1642
 #, python-format
 msgid "ABC"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Accept payments with an integrated card reader"
 msgstr ""
 
@@ -319,6 +307,11 @@ msgid "Account Bank Statement Cashbox Details"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Accounting"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
 msgid "Accounting Information"
 msgstr ""
@@ -340,13 +333,8 @@ msgid "Active"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_account_journal_journal_user
-msgid "Active in Point of Sale"
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1777
+#: code:addons/point_of_sale/static/src/js/screens.js:1810
 #, python-format
 msgid "Add Tip"
 msgstr ""
@@ -357,21 +345,28 @@ msgid "Add a Global Discount"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Add table management, tips, bill printing &amp; split, etc."
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Add a custom message to header and footer"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:397
-#: code:addons/point_of_sale/static/src/xml/pos.xml:485
+#: code:addons/point_of_sale/static/src/xml/pos.xml:414
+#: code:addons/point_of_sale/static/src/xml/pos.xml:511
 #, python-format
 msgid "Address"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Advanced Currencies Setup"
+#: code:addons/point_of_sale/models/pos_config.py:237
+#, python-format
+msgid "All available pricelists must be in the same currency as the company or as the Sales Journal set on this point of sale if you use the Accounting application."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_config.py:243
+#, python-format
+msgid "All payment methods must be in the same currency as the Sales Journal or the company currency if that is not set."
 msgstr ""
 
 #. module: point_of_sale
@@ -380,29 +375,19 @@ msgid "All sales lines"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Allow cashier to reprint receipts"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Allow global discounts on orders"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Allows the cashier to quickly give a percentage sale discount for all the sales order to a customer."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_group_sale_pricelist
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_group_sale_pricelist
 msgid "Allows to manage different prices based on rules per category of customers.\n"
-"                Example: 10% for retailers, promotion of 5 EUR on this product, etc."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Allows you to define a loyalty program in the point of sale, where the customers earn loyalty points and get rewards."
+"                    Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
 #. module: point_of_sale
@@ -423,7 +408,13 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_name
-msgid "An internal identification of the point of sale"
+msgid "An internal identification of the point of sale."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_session.py:160
+#, python-format
+msgid "Another session is already opened for this point of sale."
 msgstr ""
 
 #. module: point_of_sale
@@ -434,28 +425,22 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1923
+#: code:addons/point_of_sale/static/src/js/screens.js:1956
 #, python-format
 msgid "Are you sure that the customer wants to  pay"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_attribute_val
+#: model:ir.ui.menu,name:point_of_sale.pos_menu_products_variants_action
 msgid "Attribute Values"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_attribute
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.menu,name:point_of_sale.pos_menu_products_attribute_action
 msgid "Attributes"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_product_variant
-msgid "Attributes & Variants"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_session_rescue
 msgid "Auto-generated session for orphan orders, ignored in constraints"
 msgstr ""
@@ -467,17 +452,27 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_cashdrawer
-msgid "Automatically open the cashdrawer"
+msgid "Automatically open the cashdrawer."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_ids
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_journal_ids
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
 msgid "Available Payment Methods"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_available_pricelist_ids
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Available Pricelists"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_search_inherit_point_of_sale
+msgid "Available for Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
 msgid "Available in POS"
 msgstr ""
@@ -485,7 +480,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos
 #: model:ir.model.fields,field_description:point_of_sale.field_product_template_available_in_pos
-msgid "Available in the Point of Sale"
+msgid "Available in Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
@@ -495,8 +490,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:290
-#: code:addons/point_of_sale/static/src/xml/pos.xml:620
+#: code:addons/point_of_sale/static/src/xml/pos.xml:296
+#: code:addons/point_of_sale/static/src/xml/pos.xml:646
 #, python-format
 msgid "Back"
 msgstr ""
@@ -514,64 +509,65 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:374
-#: code:addons/point_of_sale/static/src/xml/pos.xml:426
+#: code:addons/point_of_sale/static/src/xml/pos.xml:380
+#: code:addons/point_of_sale/static/src/xml/pos.xml:443
 #, python-format
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_pos_barcode_nomenclature_all
-msgid "Barcode Nomenclatures"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_barcode_nomenclature_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Barcode Nomenclature"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1316
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1342
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_barcode_scanner
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 #, python-format
 msgid "Barcode Scanner"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_barcode_nomenclature_id
-msgid "Barcodes"
+#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
+msgid "Base Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
-msgid "Base Amount"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Bills &amp; Receipts"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:896
+#: code:addons/point_of_sale/static/src/js/screens.js:927
 #, python-format
 msgid "Button"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_via_proxy
-msgid "Bypass browser printing and prints via the hardware proxy"
+msgid "Bypass browser printing and prints via the hardware proxy."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:821
+#: code:addons/point_of_sale/static/src/xml/pos.xml:847
 #, python-format
 msgid "CHANGE"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:453
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1053
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1082
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1099
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1119
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1171
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: code:addons/point_of_sale/static/src/xml/pos.xml:479
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1062
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1079
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1108
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1125
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1145
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1197
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
@@ -588,7 +584,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1912
+#: code:addons/point_of_sale/static/src/js/screens.js:1945
 #, python-format
 msgid "Cannot return change without a cash payment method"
 msgstr ""
@@ -596,7 +592,6 @@ msgstr ""
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_session.py:317
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_cash_control
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
 #, python-format
 msgid "Cash Control"
 msgstr ""
@@ -623,12 +618,13 @@ msgid "CashBox Line"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Cashbox"
+#: model:ir.ui.view,arch_db:point_of_sale.account_cashbox_line_view_tree
+msgid "Cashbox balance"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_cashdrawer
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Cashdrawer"
 msgstr ""
 
@@ -644,14 +640,24 @@ msgid "Catalog"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Categories"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_pos_category_action
 msgid "Categories are used to browse your products through the\n"
 "                touchscreen interface."
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Category Pictures"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:526
+#: code:addons/point_of_sale/static/src/xml/pos.xml:552
 #, python-format
 msgid "Change"
 msgstr ""
@@ -665,23 +671,23 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1146
+#: code:addons/point_of_sale/static/src/js/screens.js:1176
 #, python-format
 msgid "Change Customer"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1777
+#: code:addons/point_of_sale/static/src/js/screens.js:1810
 #, python-format
 msgid "Change Tip"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:682
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1504
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1665
+#: code:addons/point_of_sale/static/src/xml/pos.xml:708
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1532
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1693
 #, python-format
 msgid "Change:"
 msgstr ""
@@ -699,6 +705,12 @@ msgid "Check if you want this product to appear in the Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_product_uom_categ_is_pos_groupable
+#: model:ir.model.fields,help:point_of_sale.field_product_uom_is_pos_groupable
+msgid "Check if you want to group products of this category in point of sale orders"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_cash_control
 msgid "Check the amount of the cashbox at opening and closing."
 msgstr ""
@@ -710,12 +722,12 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_by
-msgid "Check this if you want to group the Journal Items by Product while closing a Session"
+msgid "Check this if you want to group the Journal Items by Product while closing a Session."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1970
+#: code:addons/point_of_sale/static/src/js/screens.js:2003
 #, python-format
 msgid "Check your internet connection and try again."
 msgstr ""
@@ -726,9 +738,24 @@ msgid "Children Categories"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Choose a pricelist for the Point Of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Choose a specific tax regime at the order depending on the kind of customer (tax exempt, onsite vs. takeaway, etc.)."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Choose among several tax regimes when processing an order"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:345
-#: code:addons/point_of_sale/static/src/xml/pos.xml:346
+#: code:addons/point_of_sale/static/src/xml/pos.xml:351
+#: code:addons/point_of_sale/static/src/xml/pos.xml:352
 #, python-format
 msgid "City"
 msgstr ""
@@ -792,12 +819,13 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:345
+#: code:addons/point_of_sale/static/src/js/gui.js:346
 #, python-format
 msgid "Closing ..."
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
 #: selection:pos.session,state:0
 msgid "Closing Control"
 msgstr ""
@@ -821,8 +849,8 @@ msgid "Configuration"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_configuration
-msgid "Configure Point of Sale"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Configuration for journal entries of PoS orders"
 msgstr ""
 
 #. module: point_of_sale
@@ -833,7 +861,7 @@ msgstr ""
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/chrome.js:830
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1033
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1059
 #, python-format
 msgid "Confirm"
 msgstr ""
@@ -847,7 +875,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:121
+#: code:addons/point_of_sale/static/src/js/models.js:120
 #, python-format
 msgid "Connecting to the PosBox"
 msgstr ""
@@ -863,15 +891,20 @@ msgid "Continue Selling"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Control cash box at opening and closing"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1292
+#: code:addons/point_of_sale/static/src/js/screens.js:1328
 #, python-format
 msgid "Could Not Read Image"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:353
+#: code:addons/point_of_sale/static/src/xml/pos.xml:359
 #, python-format
 msgid "Country"
 msgstr ""
@@ -879,7 +912,6 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_create_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_create_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_create_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_create_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_create_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_create_uid
@@ -894,7 +926,6 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_create_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_create_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_create_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_create_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_create_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_create_date
@@ -911,16 +942,6 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_mercury
-msgid "Credit Cards"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Currencies"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_currency_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_currency_id
 msgid "Currency"
@@ -938,9 +959,9 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1788
-#: code:addons/point_of_sale/static/src/xml/pos.xml:139
-#: code:addons/point_of_sale/static/src/xml/pos.xml:650
+#: code:addons/point_of_sale/static/src/js/screens.js:1821
+#: code:addons/point_of_sale/static/src/xml/pos.xml:145
+#: code:addons/point_of_sale/static/src/xml/pos.xml:676
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_partner_id
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_partner_id
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
@@ -949,13 +970,18 @@ msgid "Customer"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Customer Display"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_customer_facing_display
 msgid "Customer Facing Display"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:463
-#: code:addons/point_of_sale/models/pos_order.py:514
+#: code:addons/point_of_sale/models/pos_order.py:486
+#: code:addons/point_of_sale/models/pos_order.py:537
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -977,7 +1003,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1306
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1332
 #, python-format
 msgid "Debug Window"
 msgstr ""
@@ -998,13 +1024,24 @@ msgid "Default Fiscal Position"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Default Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pricelist_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
 msgid "Default company logo"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_barcode_nomenclature_id
-msgid "Defines what kind of barcodes are available and how they are assigned to products, customers and cashiers"
+msgid "Defines what kind of barcodes are available and how they are assigned to products, customers and cashiers."
 msgstr ""
 
 #. module: point_of_sale
@@ -1014,7 +1051,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1326
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1352
 #, python-format
 msgid "Delete Paid Orders"
 msgstr ""
@@ -1028,7 +1065,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1327
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1353
 #, python-format
 msgid "Delete Unpaid Orders"
 msgstr ""
@@ -1042,7 +1079,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1149
+#: code:addons/point_of_sale/static/src/js/screens.js:1179
 #, python-format
 msgid "Deselect Customer"
 msgstr ""
@@ -1066,7 +1103,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:162
+#: code:addons/point_of_sale/static/src/xml/pos.xml:168
 #, python-format
 msgid "Disc"
 msgstr ""
@@ -1096,9 +1133,9 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:764
-#: code:addons/point_of_sale/static/src/xml/pos.xml:903
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1477
+#: code:addons/point_of_sale/static/src/xml/pos.xml:790
+#: code:addons/point_of_sale/static/src/xml/pos.xml:929
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1504
 #, python-format
 msgid "Discount:"
 msgstr ""
@@ -1111,7 +1148,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:830
+#: code:addons/point_of_sale/static/src/xml/pos.xml:856
 #, python-format
 msgid "Discounts"
 msgstr ""
@@ -1124,7 +1161,6 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_display_name
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_display_name
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_display_name
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_display_name
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_display_name
@@ -1140,6 +1176,11 @@ msgid "Display Name"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Display pictures of product categories"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_product_action
 msgid "Do not forget to set the price and the point of sale category\n"
 "                in which it should appear. If a product has no point of sale\n"
@@ -1158,89 +1199,86 @@ msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_vkeyboard
+msgid "Don’t turn this option on if you take orders on smartphones or tablets. \n"
+" Such devices already benefit from a native keyboard."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Don’t turn this option on if you take orders on smartphones or tablets. Such devices already benefit from a native keyboard."
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1329
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1355
 #, python-format
 msgid "Download Paid Orders"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1331
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1357
 #, python-format
 msgid "Download Unpaid Orders"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Drinks"
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:524
+#: code:addons/point_of_sale/static/src/xml/pos.xml:550
 #, python-format
 msgid "Due"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1309
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1335
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_electronic_scale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 #, python-format
 msgid "Electronic Scale"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:366
-#: code:addons/point_of_sale/static/src/xml/pos.xml:406
+#: code:addons/point_of_sale/static/src/xml/pos.xml:372
+#: code:addons/point_of_sale/static/src/xml/pos.xml:423
 #, python-format
 msgid "Email"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1883
+#: code:addons/point_of_sale/static/src/js/screens.js:1916
 #, python-format
 msgid "Empty Order"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:421
+#: code:addons/point_of_sale/static/src/js/screens.js:429
 #, python-format
 msgid "Empty Serial/Lot Number"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_scan_via_proxy
-msgid "Enable barcode scanning with a remotely connected barcode scanner"
+msgid "Enable barcode scanning with a remotely connected barcode scanner."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_electronic_scale
-msgid "Enables Electronic Scale integration"
+msgid "Enables Electronic Scale integration."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_payment_terminal
-msgid "Enables Payment Terminal integration"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display
-msgid "Enables a remotely connected customer facing display"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_vkeyboard
-msgid "Enables an integrated Virtual Keyboard"
+msgid "Enables Payment Terminal integration."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_invoicing
-msgid "Enables invoice generation from the Point of Sale"
+msgid "Enables invoice generation from the Point of Sale."
 msgstr ""
 
 #. module: point_of_sale
@@ -1266,28 +1304,28 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1221
+#: code:addons/point_of_sale/static/src/js/screens.js:1257
 #, python-format
 msgid "Error: Could not Save Changes"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:246
+#: code:addons/point_of_sale/static/src/js/models.js:243
 #, python-format
 msgid "Error: The Point of Sale User must belong to the same company as the Point of Sale. You are probably trying to load the point of sale as an administrator in a multi-company setup, with the administrator account set to the wrong company."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1328
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1354
 #, python-format
 msgid "Export Paid Orders"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1330
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1356
 #, python-format
 msgid "Export Unpaid Orders"
 msgstr ""
@@ -1304,35 +1342,37 @@ msgid "Fanta"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Features"
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1185
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1211
 #, python-format
 msgid "Finished Importing Orders"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_fiscal_position_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Fiscal Position"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Fiscal Position per Order"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_fiscal_position_ids
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Fiscal Positions"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Footer"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_big_scrollbars
-msgid "For imprecise industrial touchscreens"
+msgid "For imprecise industrial touchscreens."
 msgstr ""
 
 #. module: point_of_sale
@@ -1341,12 +1381,17 @@ msgid "General Information"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Get a predefined set of common drinks"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Generation of your order references"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Get one journal item per product rather than one journal item per receipt line. This works for any anonymous order. If the customer is set on the order, one journal item is created for each receipt line. This option is recommended for an easy review of your journal entries when managing lots of orders."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Give customer rewards, free samples, etc."
 msgstr ""
 
@@ -1356,7 +1401,7 @@ msgid "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_discount
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_discount
 msgid "Global Discounts"
 msgstr ""
 
@@ -1375,24 +1420,26 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_by
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Group Journal Items"
 msgstr ""
 
 #. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1343
-#, python-format
-msgid "Hardware Events"
+#: model:ir.model.fields,field_description:point_of_sale.field_product_uom_categ_is_pos_groupable
+#: model:ir.model.fields,field_description:point_of_sale.field_product_uom_is_pos_groupable
+msgid "Group Products in POS"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Hardware Proxy / PosBox"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1369
+#, python-format
+msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1338
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1364
 #, python-format
 msgid "Hardware Status"
 msgstr ""
@@ -1403,14 +1450,18 @@ msgid "Has Cash Control"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Header"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_header_or_footer
+msgid "Header & Footer"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_id
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_id
@@ -1434,6 +1485,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_proxy_ip
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "IP Address"
 msgstr ""
 
@@ -1456,23 +1508,24 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1332
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1358
 #, python-format
 msgid "Import Orders"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_data_drinks
-msgid "Import common drinks data"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Improve navigation for imprecise industrial touchscreens"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
 #: selection:pos.session,state:0
 msgid "In Progress"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:445
+#: code:addons/point_of_sale/models/pos_order.py:468
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -1483,20 +1536,29 @@ msgid "Inactive"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tax_included
-msgid "Include Taxes in Prices"
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:276
+#: code:addons/point_of_sale/static/src/js/gui.js:277
 #, python-format
 msgid "Incorrect Password"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id
+msgid "Initial Category"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_mercury
+msgid "Integrated Card Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Integrated Card Reader"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_category_action
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_category
 msgid "Internal Categories"
 msgstr ""
 
@@ -1506,9 +1568,14 @@ msgid "Internal Notes"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Inventory"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:658
-#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: code:addons/point_of_sale/static/src/xml/pos.xml:684
+#: model:ir.actions.report,name:point_of_sale.pos_invoice_report
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_invoice_id
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
 #, python-format
@@ -1517,6 +1584,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_invoice_journal_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Invoice Journal"
 msgstr ""
 
@@ -1535,6 +1603,16 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_installed_account_accountant
+msgid "Is Installed Account Accountant"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_restaurant
+msgid "Is a Bar/Restaurant"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id
 msgid "It acts as a default account for debit amount"
 msgstr ""
@@ -1546,13 +1624,13 @@ msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_account_move
-msgid "Journal Entry"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Journal Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Journals"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_account_move
+msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
@@ -1563,7 +1641,6 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category___last_update
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings___last_update
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard___last_update
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount___last_update
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment___last_update
@@ -1590,7 +1667,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_write_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_write_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_write_uid
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_write_uid
@@ -1605,7 +1681,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_write_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_write_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_write_date
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_write_date
@@ -1636,7 +1711,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:484
+#: code:addons/point_of_sale/static/src/js/models.js:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:38
 #, python-format
 msgid "Loading"
@@ -1655,7 +1730,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:303
+#: code:addons/point_of_sale/static/src/js/gui.js:304
 #, python-format
 msgid "Login as a Manager"
 msgstr ""
@@ -1667,7 +1742,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:2186
+#: code:addons/point_of_sale/static/src/js/models.js:2339
 #, python-format
 msgid "Lot/Serial Number(s) Required"
 msgstr ""
@@ -1678,16 +1753,26 @@ msgid "Lot/serial Number"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_loyalty
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_loyalty
 msgid "Loyalty Program"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Loyalty program to use for this point of sale."
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment
 msgid "Make Payment"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_available_pricelist_ids
+msgid "Make several pricelists available in the Point of Sale. You can also apply a pricelist to specific customers from their contact form (in Sales tab). To be valid, this pricelist must be listed here as an available pricelist. Otherwise the default pricelist will apply."
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "Malibu Drink"
@@ -1710,7 +1795,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:527
+#: code:addons/point_of_sale/static/src/xml/pos.xml:553
 #, python-format
 msgid "Method"
 msgstr ""
@@ -1727,40 +1812,26 @@ msgid "Month of order date"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_multi_currency
-msgid "Multi-Currencies"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_pricelist_setting
-msgid "Multiple Prices per Products"
-msgstr ""
-
-#. module: point_of_sale
-#: selection:pos.config.settings,default_pricelist_setting:0
-msgid "Multiple prices per product (e.g. quantity, shop-specific)"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
 msgid "My Sales"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:402
-#: code:addons/point_of_sale/static/src/xml/pos.xml:411
-#: code:addons/point_of_sale/static/src/xml/pos.xml:420
-#: code:addons/point_of_sale/static/src/xml/pos.xml:431
-#: code:addons/point_of_sale/static/src/xml/pos.xml:440
+#: code:addons/point_of_sale/static/src/xml/pos.xml:419
+#: code:addons/point_of_sale/static/src/xml/pos.xml:428
+#: code:addons/point_of_sale/static/src/xml/pos.xml:437
+#: code:addons/point_of_sale/static/src/xml/pos.xml:448
+#: code:addons/point_of_sale/static/src/xml/pos.xml:457
+#: code:addons/point_of_sale/static/src/xml/pos.xml:466
 #, python-format
 msgid "N/A"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:333
-#: code:addons/point_of_sale/static/src/xml/pos.xml:484
+#: code:addons/point_of_sale/static/src/xml/pos.xml:339
+#: code:addons/point_of_sale/static/src/xml/pos.xml:510
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_name
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
@@ -1770,7 +1841,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1893
+#: code:addons/point_of_sale/static/src/js/screens.js:1926
 #, python-format
 msgid "Negative Bank Payment"
 msgstr ""
@@ -1789,19 +1860,19 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:683
+#: code:addons/point_of_sale/static/src/xml/pos.xml:709
 #, python-format
 msgid "Next Order"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:139
+#: code:addons/point_of_sale/models/pos_order.py:140
 #, python-format
 msgid "No cash statement found for this session. Unable to record returned cash."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:25
+#: code:addons/point_of_sale/report/pos_invoice.py:24
 #, python-format
 msgid "No link to an invoice for %s."
 msgstr ""
@@ -1814,8 +1885,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2023
-#: code:addons/point_of_sale/static/src/xml/pos.xml:355
+#: code:addons/point_of_sale/static/src/js/screens.js:2056
+#: code:addons/point_of_sale/static/src/xml/pos.xml:361
 #, python-format
 msgid "None"
 msgstr ""
@@ -1856,36 +1927,42 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:327
+#: code:addons/point_of_sale/static/src/js/gui.js:328
 #, python-format
 msgid "Offline Orders"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:962
-#: code:addons/point_of_sale/static/src/xml/pos.xml:976
-#: code:addons/point_of_sale/static/src/xml/pos.xml:990
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1019
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1050
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1079
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1096
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1174
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1210
+#: code:addons/point_of_sale/static/src/xml/pos.xml:988
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1002
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1016
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1045
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1076
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1105
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1122
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1200
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1236
 #, python-format
 msgid "Ok"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:422
+#: code:addons/point_of_sale/static/src/js/screens.js:430
 #, python-format
 msgid "One or more product(s) required serial/lot number."
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_restrict_price_control
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Only users with Manager access rights for PoS app can modify the product prices on orders."
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1278
+#: code:addons/point_of_sale/static/src/js/screens.js:1314
 #, python-format
 msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
 msgstr ""
@@ -1902,8 +1979,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:669
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1345
+#: code:addons/point_of_sale/static/src/xml/pos.xml:695
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1371
 #, python-format
 msgid "Open Cashbox"
 msgstr ""
@@ -1942,6 +2019,7 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
 #: selection:pos.session,state:0
 msgid "Opening Control"
 msgstr ""
@@ -1952,14 +2030,31 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.account_cashbox_line_action
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Opening/Closing Values"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_picking_type_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_picking_type_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Operation Type"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Operation type used to record product pickings"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Operation types show up in the Inventory dashboard."
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:305
+#: code:addons/point_of_sale/static/src/xml/pos.xml:311
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_order_id
 #, python-format
 msgid "Order"
@@ -1967,8 +2062,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:1793
-#: code:addons/point_of_sale/static/src/js/models.js:1833
+#: code:addons/point_of_sale/static/src/js/models.js:1922
+#: code:addons/point_of_sale/static/src/js/models.js:1962
 #, python-format
 msgid "Order "
 msgstr ""
@@ -1984,6 +2079,11 @@ msgid "Order IDs Sequence"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Order Interface"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_sequence_line_id
 msgid "Order Line IDs Sequence"
 msgstr ""
@@ -2007,12 +2107,17 @@ msgid "Order Ref"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Order Reference"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_sequence_number
 msgid "Order Sequence Number"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:475
+#: code:addons/point_of_sale/models/pos_order.py:498
 #, python-format
 msgid "Order is not paid."
 msgstr ""
@@ -2024,7 +2129,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1323
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1349
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_session_orders
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_filtered
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
@@ -2044,7 +2149,12 @@ msgid "Orders Analysis"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:225
+#: model:ir.actions.act_window,name:point_of_sale.account_journal_action_point_of_sale
+msgid "POS Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_config.py:332
 #, python-format
 msgid "POS Order %s"
 msgstr ""
@@ -2075,7 +2185,7 @@ msgid "POS Sales"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:234
+#: code:addons/point_of_sale/models/pos_config.py:341
 #, python-format
 msgid "POS order line %s"
 msgstr ""
@@ -2109,7 +2219,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:273
+#: code:addons/point_of_sale/static/src/js/gui.js:274
 #, python-format
 msgid "Password ?"
 msgstr ""
@@ -2121,8 +2231,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:144
-#: code:addons/point_of_sale/static/src/xml/pos.xml:623
+#: code:addons/point_of_sale/static/src/xml/pos.xml:150
+#: code:addons/point_of_sale/static/src/xml/pos.xml:649
 #: code:addons/point_of_sale/wizard/pos_payment.py:65
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
@@ -2138,6 +2248,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
 #: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Payment Methods"
 msgstr ""
 
@@ -2165,8 +2276,13 @@ msgid "Payment methods are defined by accounting journals having the\n"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Payment methods available"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_statement_ids
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
 msgid "Payments"
@@ -2174,7 +2290,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:913
+#: code:addons/point_of_sale/static/src/xml/pos.xml:939
 #, python-format
 msgid "Payments:"
 msgstr ""
@@ -2191,16 +2307,16 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:370
-#: code:addons/point_of_sale/static/src/xml/pos.xml:415
-#: code:addons/point_of_sale/static/src/xml/pos.xml:486
+#: code:addons/point_of_sale/static/src/xml/pos.xml:376
+#: code:addons/point_of_sale/static/src/xml/pos.xml:432
+#: code:addons/point_of_sale/static/src/xml/pos.xml:512
 #, python-format
 msgid "Phone"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1424
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1450
 #, python-format
 msgid "Phone:"
 msgstr ""
@@ -2222,44 +2338,51 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1922
+#: code:addons/point_of_sale/static/src/js/screens.js:1955
 #, python-format
 msgid "Please Confirm Large Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:273
+#: code:addons/point_of_sale/models/pos_order.py:296
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:491
+#: code:addons/point_of_sale/models/pos_order.py:514
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:507
+#: code:addons/point_of_sale/static/src/xml/pos.xml:533
 #, python-format
 msgid "Please select a payment method."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1961
+#: code:addons/point_of_sale/static/src/js/screens.js:1994
 #, python-format
 msgid "Please select the Customer"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action
-#: model:ir.ui.menu,name:point_of_sale.menu_product_pos_category
+#: model:ir.ui.menu,name:point_of_sale.menu_products_pos_category
 msgid "PoS Categories"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pos_categ_id
+#: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
+msgid "PoS Category"
+msgstr ""
+
+#. module: point_of_sale
 #: model:stock.picking.type,name:point_of_sale.picking_type_posout
 msgid "PoS Orders"
 msgstr ""
@@ -2272,10 +2395,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_config_id
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_configuration
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
 #: model:ir.ui.view,arch_db:point_of_sale.res_users_form_view
+#: model:ir.ui.view,arch_db:point_of_sale.view_account_bank_journal_form_inherited_pos
 #: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_pos_user_form
 #: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
@@ -2301,7 +2423,7 @@ msgid "Point of Sale Config"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_tree
 msgid "Point of Sale Configuration"
 msgstr ""
@@ -2367,13 +2489,29 @@ msgid "Pos Order Line"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_state
+msgid "Pos Session State"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
 msgid "Pos Session Username"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_posbox
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "PosBox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "PosBox / Hardware Proxy"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:349
+#: code:addons/point_of_sale/static/src/xml/pos.xml:355
 #, python-format
 msgid "Postcode"
 msgstr ""
@@ -2391,8 +2529,13 @@ msgid "Prefill Cash Payment"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Prefill amount paid with the exact due amount"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:167
+#: code:addons/point_of_sale/static/src/xml/pos.xml:173
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 #, python-format
@@ -2400,13 +2543,13 @@ msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
-msgid "Price Unit"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Price Control"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.config.settings,default_pricelist_setting:0
-msgid "Price computed from formulas (discounts, margins, rounding)"
+#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
+msgid "Price Unit"
 msgstr ""
 
 #. module: point_of_sale
@@ -2416,20 +2559,25 @@ msgid "Priced Product"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pricelist_id
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:2138
+#: code:addons/point_of_sale/static/src/xml/pos.xml:388
+#: code:addons/point_of_sale/static/src/xml/pos.xml:461
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_pricelist_id
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pricelist_id
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+#, python-format
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_pricelist
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Pricelists"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Pricing"
 msgstr ""
 
@@ -2440,13 +2588,23 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:690
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1346
+#: code:addons/point_of_sale/static/src/xml/pos.xml:716
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1372
 #, python-format
 msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Print invoices on customer request"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Print receipts automatically once the payment registered"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_via_proxy
 msgid "Print via Proxy"
 msgstr ""
@@ -2475,17 +2633,17 @@ msgid "Product"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Product Catalog"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_product_categ_id
 #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
 msgid "Product Category"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Product Prices"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_tree_view
 msgid "Product Product Categories"
 msgstr ""
@@ -2502,34 +2660,48 @@ msgid "Product Template"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_uom
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_uom_categ
+msgid "Product UoM Categories"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_product_action
 #: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_product
 msgid "Product Variants"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Product prices on receipts"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tipproduct
+msgid "Product tips"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_template_action_pos_product
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_configuration_product
+#: model:ir.ui.menu,name:point_of_sale.pos_menu_products_configuration
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
 msgid "Products"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_category
-#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pos_categ_id
-msgid "Public Category"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_box_in
 msgid "Put Money In"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:157
+#: code:addons/point_of_sale/static/src/xml/pos.xml:163
 #, python-format
 msgid "Qty"
 msgstr ""
@@ -2544,7 +2716,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1347
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1373
 #, python-format
 msgid "Read Weighing Scale"
 msgstr ""
@@ -2562,11 +2734,6 @@ msgid "Real Closing Balance"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Receipt"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_receipt_footer
 msgid "Receipt Footer"
 msgstr ""
@@ -2577,7 +2744,7 @@ msgid "Receipt Header"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Receipt Printer"
 msgstr ""
 
@@ -2593,7 +2760,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1341
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1367
 #, python-format
 msgid "Refresh Display"
 msgstr ""
@@ -2604,13 +2771,13 @@ msgid "Reporting"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_reprint
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_reprint
 msgid "Reprint Receipt"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1313
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1339
 #, python-format
 msgid "Reset"
 msgstr ""
@@ -2621,14 +2788,13 @@ msgid "Responsible"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_restaurant
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Restaurant"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_restrict_price_control
+msgid "Restrict Price Modifications to Managers"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Restaurants benefit from additional features. Bill Printing allows you to print a receipt before the order is paid. Bill Splitting allows you to split an order into different orders. Kitchen Order Printing allows you to print order updates to kitchen or bar printers."
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Restrict price modification to managers"
 msgstr ""
 
 #. module: point_of_sale
@@ -2637,7 +2803,7 @@ msgid "Resume"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:788
+#: code:addons/point_of_sale/models/pos_order.py:823
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
 #, python-format
 msgid "Return Products"
@@ -2657,7 +2823,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
-#: model:ir.actions.report.xml,name:point_of_sale.sale_details_report
+#: model:ir.actions.report,name:point_of_sale.sale_details_report
 #: model:ir.ui.menu,name:point_of_sale.menu_report_order_details
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard
@@ -2667,6 +2833,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_sale_journal
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Sales Journal"
 msgstr ""
 
@@ -2688,16 +2855,11 @@ msgid "Salesperson"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Save"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Save this page and come back here to set up this feature."
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/chrome.js:397
 #, python-format
@@ -2706,14 +2868,14 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1319
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1345
 #, python-format
 msgid "Scan"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1320
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1346
 #, python-format
 msgid "Scan EAN-13"
 msgstr ""
@@ -2732,14 +2894,14 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:457
+#: code:addons/point_of_sale/static/src/xml/pos.xml:483
 #, python-format
 msgid "Search Customers"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:214
+#: code:addons/point_of_sale/static/src/xml/pos.xml:220
 #, python-format
 msgid "Search Products"
 msgstr ""
@@ -2762,7 +2924,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:465
+#: code:addons/point_of_sale/static/src/xml/pos.xml:491
 #, python-format
 msgid "Select Customer"
 msgstr ""
@@ -2776,20 +2938,22 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2034
+#: code:addons/point_of_sale/static/src/js/screens.js:2126
 #, python-format
-msgid "Select tax"
+msgid "Select pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:208
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:2067
 #, python-format
-msgid "Selected orders do not have the same session!"
+msgid "Select tax"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Sell in several currencies"
+#: code:addons/point_of_sale/models/pos_order.py:236
+#, python-format
+msgid "Selected orders do not have the same session!"
 msgstr ""
 
 #. module: point_of_sale
@@ -2804,27 +2968,27 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1073
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1099
 #, python-format
 msgid "Serial/Lot Number"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:742
+#: code:addons/point_of_sale/static/src/xml/pos.xml:768
 #, python-format
 msgid "Served by"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1974
+#: code:addons/point_of_sale/static/src/js/screens.js:2007
 #, python-format
 msgid "Server Error"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:285
+#: code:addons/point_of_sale/models/pos_config.py:440
 #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_pos_session_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_session_id
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_session_id
@@ -2841,7 +3005,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1199
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1225
 #, python-format
 msgid "Session ids:"
 msgstr ""
@@ -2863,48 +3027,52 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1144
+#: code:addons/point_of_sale/static/src/js/screens.js:1174
 #, python-format
 msgid "Set Customer"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_start_category
+msgid "Set Start Category"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1312
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1338
 #, python-format
 msgid "Set Weight"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "Set product attributes (e.g. color, size) to sell variants"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Set barcodes to scan products, customer cards, etc."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Set shop-specific prices, seasonal discounts, etc."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/pos.web_editor.js:34
+#: code:addons/point_of_sale/static/src/js/pos.web_editor.js:33
 #, python-format
 msgid "Set your customized advertisement here"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_pos_global_settings
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
 msgid "Settings"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_product_pricelist
-msgid "Show pricelists On Products"
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display
+msgid "Show checkout to customers with a remotely-connected screen."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_pricelist_item
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pricelist_item
 msgid "Show pricelists to customers"
 msgstr ""
 
@@ -2917,7 +3085,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_skip_screen
-msgid "Skip Receipt Screen"
+msgid "Skip Preview Screen"
 msgstr ""
 
 #. module: point_of_sale
@@ -2932,7 +3100,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:332
+#: code:addons/point_of_sale/static/src/js/gui.js:333
 #, python-format
 msgid "Some orders could not be submitted to"
 msgstr ""
@@ -2943,13 +3111,13 @@ msgid "Specify product lot/serial number in pos order line"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id
-msgid "Start Category"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_start_date
+msgid "Start Date"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_start_date
-msgid "Start Date"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Start selling from a default product category"
 msgstr ""
 
 #. module: point_of_sale
@@ -2958,7 +3126,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.action_report_account_statement
+#: model:ir.actions.report,name:point_of_sale.action_report_account_statement
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "Statement"
 msgstr ""
@@ -2987,16 +3155,21 @@ msgid "Stock Location"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Stock location used for the inventory"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:341
-#: code:addons/point_of_sale/static/src/xml/pos.xml:342
+#: code:addons/point_of_sale/static/src/xml/pos.xml:347
+#: code:addons/point_of_sale/static/src/xml/pos.xml:348
 #, python-format
 msgid "Street"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:792
+#: code:addons/point_of_sale/static/src/xml/pos.xml:818
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_price_subtotal_incl
 #, python-format
 msgid "Subtotal"
@@ -3014,21 +3187,21 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1463
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1489
 #, python-format
 msgid "Subtotal:"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1191
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1217
 #, python-format
 msgid "Successfully  imported"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1190
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1216
 #, python-format
 msgid "Successfully imported"
 msgstr ""
@@ -3050,7 +3223,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:805
+#: code:addons/point_of_sale/static/src/xml/pos.xml:831
 #, python-format
 msgid "TOTAL"
 msgstr ""
@@ -3062,8 +3235,8 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:302
-#: code:addons/point_of_sale/static/src/js/screens.js:2044
+#: code:addons/point_of_sale/models/pos_order.py:325
+#: code:addons/point_of_sale/static/src/js/screens.js:2080
 #, python-format
 msgid "Tax"
 msgstr ""
@@ -3074,95 +3247,122 @@ msgid "Tax Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tax_included
+msgid "Tax Display"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:378
-#: code:addons/point_of_sale/static/src/xml/pos.xml:435
+#: code:addons/point_of_sale/static/src/xml/pos.xml:384
+#: code:addons/point_of_sale/static/src/xml/pos.xml:452
 #, python-format
 msgid "Tax ID"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime
+msgid "Tax Regime"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime_selection
+msgid "Tax Regime Selection value"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.config,iface_tax_included:0
+msgid "Tax-Excluded Prices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.config,iface_tax_included:0
+msgid "Tax-Included Prices"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_tax
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_tax_ids
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_tax_ids_after_fiscal_position
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 msgid "Taxes"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:927
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1292
+#: code:addons/point_of_sale/static/src/xml/pos.xml:953
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1318
 #, python-format
 msgid "Taxes:"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:722
+#: code:addons/point_of_sale/static/src/xml/pos.xml:748
 #, python-format
 msgid "Tel:"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:525
+#: code:addons/point_of_sale/static/src/xml/pos.xml:551
 #, python-format
 msgid "Tendered"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:261
+#: code:addons/point_of_sale/models/pos_order.py:284
 #, python-format
 msgid "The POS order must have lines when calling this method"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1014
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1040
 #, python-format
 msgid "The Point of Sale could not find any product, client, employee\n"
 "                    or action associated with the scanned barcode."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:195
+#: code:addons/point_of_sale/models/pos_config.py:230
 #, python-format
 msgid "The company of a payment method is different than the one of point of sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:185
+#: code:addons/point_of_sale/models/pos_config.py:220
 #, python-format
 msgid "The company of the sales journal is different than the one of point of sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:180
+#: code:addons/point_of_sale/models/pos_config.py:215
 #, python-format
 msgid "The company of the stock location is different than the one of point of sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:200
+#: code:addons/point_of_sale/models/pos_config.py:235
 #, python-format
-msgid "The default fiscal position must be included in the available fiscal positions of the point of sale"
+msgid "The default pricelist must be included in the available pricelists."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_tax_included
-msgid "The displayed prices will always include all taxes, even if the taxes have been setup differently"
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_proxy_ip
+msgid "The hostname or ip address of the hardware proxy, Will be autodetected if left empty."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_proxy_ip
-msgid "The hostname or ip address of the hardware proxy, Will be autodetected if left empty"
+#: code:addons/point_of_sale/models/pos_config.py:225
+#, python-format
+msgid "The invoice journal and the point of sale must belong to the same company"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:190
+#: code:addons/point_of_sale/models/pos_config.py:241
 #, python-format
-msgid "The invoice journal and the point of sale must belong to the same company"
+msgid "The invoice journal must be in the same currency as the Sales Journal or the company currency if that is not set."
 msgstr ""
 
 #. module: point_of_sale
@@ -3178,21 +3378,21 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1969
+#: code:addons/point_of_sale/static/src/js/screens.js:2002
 #, python-format
 msgid "The order could not be sent"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1980
+#: code:addons/point_of_sale/static/src/js/screens.js:2013
 #, python-format
 msgid "The order could not be sent to the server due to an unknown error"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_precompute_cash
-msgid "The payment input will behave similarily to bank payment input, and will be prefilled with the exact due amount"
+msgid "The payment input will behave similarily to bank payment input, and will be prefilled with the exact due amount."
 msgstr ""
 
 #. module: point_of_sale
@@ -3203,22 +3403,22 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_start_categ_id
-msgid "The point of sale will display this product category by default. If no category is specified, all available products will be shown"
+msgid "The point of sale will display this product category by default. If no category is specified, all available products will be shown."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_display_categ_images
-msgid "The product categories will be displayed with pictures."
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_pricelist_id
+msgid "The pricelist used if no customer is selected or if the customer has no Sale Pricelist configured."
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_tip_product_id
-msgid "The product used to encode the customer tip. Leave empty if you do not accept tips."
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_display_categ_images
+msgid "The product categories will be displayed with pictures."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1293
+#: code:addons/point_of_sale/static/src/js/screens.js:1329
 #, python-format
 msgid "The provided file could not be read due to an unknown error"
 msgstr ""
@@ -3230,12 +3430,12 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_auto
-msgid "The receipt will automatically be printed at the end of each order"
+msgid "The receipt will automatically be printed at the end of each order."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1975
+#: code:addons/point_of_sale/static/src/js/screens.js:2008
 #, python-format
 msgid "The server encountered an error while receiving your order."
 msgstr ""
@@ -3246,11 +3446,6 @@ msgid "The system will open all cash registers, so that you can start recording
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "The transactions are processed by MercuryPay."
-msgstr ""
-
-#. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_session.py:283
 #, python-format
 msgid "The type of the journal for your payment method should be bank or cash "
@@ -3269,13 +3464,8 @@ msgid "There are pending operations that could not be saved into the database, a
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
-msgid "There are two ways to manage pricelists: 1) Multiple prices per product (e.g. quantity, shop-specific) : must be set in the Sales tab of the product detail form. 2) Price computed from formulas (discounts, margins, rounding) : must be set in the pricelist form."
-msgstr ""
-
-#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1913
+#: code:addons/point_of_sale/static/src/js/screens.js:1946
 #, python-format
 msgid "There is no cash payment method available in this point of sale to handle the change.\n"
 "\n"
@@ -3289,20 +3479,20 @@ msgid "There is no cash register for this PoS Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:729
+#: code:addons/point_of_sale/models/pos_order.py:764
 #, python-format
 msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:727
+#: code:addons/point_of_sale/models/pos_order.py:762
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1884
+#: code:addons/point_of_sale/static/src/js/screens.js:1917
 #, python-format
 msgid "There must be at least one product in your order before it can be validated"
 msgstr ""
@@ -3324,21 +3514,26 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_pos_manager_id
-msgid "This field is there to pass the id of the pos manager group to the point of sale client"
+msgid "This field is there to pass the id of the pos manager group to the point of sale client."
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_pos_user_id
-msgid "This field is there to pass the id of the pos user group to the point of sale client"
+msgid "This field is there to pass the id of the pos user group to the point of sale client."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:499
+#: code:addons/point_of_sale/models/pos_order.py:522
 #, python-format
 msgid "This invoice has been created from the point of sale session: <a href=# data-oe-model=pos.order data-oe-id=%d>%s</a>"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_fiscal_position_ids
+msgid "This is useful for restaurants with onsite and take-away services that imply specific tax rates."
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/chrome.js:273
 #, python-format
@@ -3353,6 +3548,11 @@ msgid "This operation will permanently destroy all paid orders from the local st
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_tip_product_id
+msgid "This product is used as reference on customer receipts."
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_line_id
 msgid "This sequence is automatically created by Odoo but you can change it to customize the reference numbers of your orders lines."
 msgstr ""
@@ -3363,7 +3563,7 @@ msgid "This sequence is automatically created by Odoo but you can change it to c
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:603
+#: code:addons/point_of_sale/models/pos_order.py:626
 #, python-format
 msgid "This transfer has been created from the point of sale session: <a href=# data-oe-model=pos.order data-oe-id=%d>%s</a>"
 msgstr ""
@@ -3376,7 +3576,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:664
+#: code:addons/point_of_sale/static/src/xml/pos.xml:690
 #, python-format
 msgid "Tip"
 msgstr ""
@@ -3387,13 +3587,19 @@ msgid "Tip Product"
 msgstr ""
 
 #. module: point_of_sale
+#: model:product.product,name:point_of_sale.product_product_tip
+#: model:product.template,name:point_of_sale.product_product_tip_product_template
+msgid "Tips"
+msgstr ""
+
+#. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_product_product_to_weight
 #: model:ir.model.fields,field_description:point_of_sale.field_product_template_to_weight
 msgid "To Weigh With Scale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:768
+#: code:addons/point_of_sale/models/pos_order.py:803
 #, python-format
 msgid "To return product(s), you need to open a session that will be used to register the refund."
 msgstr ""
@@ -3426,7 +3632,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:842
+#: code:addons/point_of_sale/static/src/xml/pos.xml:868
 #, python-format
 msgid "Total Taxes"
 msgstr ""
@@ -3453,16 +3659,16 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:941
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1291
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1483
+#: code:addons/point_of_sale/static/src/xml/pos.xml:967
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1317
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1511
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
 #, python-format
 msgid "Total:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:322
+#: code:addons/point_of_sale/models/pos_order.py:345
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
@@ -3480,21 +3686,21 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1010
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
 #, python-format
 msgid "Unknown Barcode"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1979
+#: code:addons/point_of_sale/static/src/js/screens.js:2012
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1277
+#: code:addons/point_of_sale/static/src/js/screens.js:1313
 #, python-format
 msgid "Unsupported File Format"
 msgstr ""
@@ -3505,7 +3711,32 @@ msgid "Use Existing Lots/Serial Numbers"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_sale_pricelist
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Use a default specific tax regime"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_use_pricelist
+msgid "Use a pricelist."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Use a virtual keyboard for touchscreens"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Use an integrated hardware setup like"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_account_journal_journal_user
+msgid "Use in Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_sale_pricelist
 msgid "Use pricelists to adapt your price per customers"
 msgstr ""
 
@@ -3523,13 +3754,13 @@ msgid "User"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.report_user_label
+#: model:ir.actions.report,name:point_of_sale.report_user_label
 msgid "User Labels"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1427
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1453
 #, python-format
 msgid "User:"
 msgstr ""
@@ -3546,14 +3777,14 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:725
+#: code:addons/point_of_sale/static/src/xml/pos.xml:751
 #, python-format
 msgid "VAT:"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:624
+#: code:addons/point_of_sale/static/src/xml/pos.xml:650
 #, python-format
 msgid "Validate"
 msgstr ""
@@ -3581,7 +3812,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1340
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1366
 #, python-format
 msgid "Weighing"
 msgstr ""
@@ -3593,9 +3824,14 @@ msgid "Weighted Product"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Whenever you close a session, one entry is generated in the following accounting journal for all the orders not invoiced. Invoices are recorded in accounting separately."
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1264
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1447
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1290
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1473
 #, python-format
 msgid "With a"
 msgstr ""
@@ -3612,7 +3848,7 @@ msgid "You can define another list of available currencies on the\n"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:435
+#: code:addons/point_of_sale/models/pos_order.py:458
 #, python-format
 msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
 msgstr ""
@@ -3625,12 +3861,6 @@ msgid "You cannot confirm all orders of this session, because they have not the
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:160
-#, python-format
-msgid "You cannot create two active sessions related to the same point of sale!"
-msgstr ""
-
-#. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_session.py:151
 #, python-format
 msgid "You cannot create two active sessions with the same responsible!"
@@ -3644,7 +3874,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1894
+#: code:addons/point_of_sale/static/src/js/screens.js:1927
 #, python-format
 msgid "You cannot have a negative amount in a Bank payment. Use a cash payment method to return money to the customer."
 msgstr ""
@@ -3662,19 +3892,19 @@ msgid "You have to define which payment method must be available in the point of
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:743
+#: code:addons/point_of_sale/models/pos_order.py:778
 #, python-format
 msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:891
+#: code:addons/point_of_sale/models/pos_order.py:926
 #, python-format
 msgid "You have to select a pricelist in the sale form !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:877
+#: code:addons/point_of_sale/models/pos_order.py:912
 #, python-format
 msgid "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
@@ -3706,7 +3936,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1962
+#: code:addons/point_of_sale/static/src/js/screens.js:1995
 #, python-format
 msgid "You need to select the customer before you can invoice an order."
 msgstr ""
@@ -3726,7 +3956,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1222
+#: code:addons/point_of_sale/static/src/js/screens.js:1258
 #, python-format
 msgid "Your Internet connection is probably down."
 msgstr ""
@@ -3739,21 +3969,21 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1283
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1309
 #, python-format
 msgid "Your shopping cart is empty"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:350
+#: code:addons/point_of_sale/static/src/xml/pos.xml:356
 #, python-format
 msgid "ZIP"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1256
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1282
 #, python-format
 msgid "at"
 msgstr ""
@@ -3765,14 +3995,14 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1196
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1222
 #, python-format
 msgid "belong to another session:"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1550
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1578
 #, python-format
 msgid "caps lock"
 msgstr ""
@@ -3789,28 +4019,38 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1577
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1619
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1605
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1647
 #, python-format
 msgid "close"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1535
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1612
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1563
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1640
 #, python-format
 msgid "delete"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1266
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1292
 #, python-format
 msgid "discount"
 msgstr ""
 
 #. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "e.g. Company Address, Website"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "e.g. Return Policy, Thanks for shopping with us!"
+msgstr ""
+
+#. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/popups.js:109
 #, python-format
@@ -3819,13 +4059,13 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1927
+#: code:addons/point_of_sale/static/src/js/screens.js:1960
 #, python-format
 msgid "for an order of"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:216
+#: code:addons/point_of_sale/models/pos_config.py:323
 #, python-format
 msgid "not used"
 msgstr ""
@@ -3833,7 +4073,7 @@ msgstr ""
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/chrome.js:292
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1190
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1216
 #, python-format
 msgid "paid orders"
 msgstr ""
@@ -3849,11 +4089,6 @@ msgid "pos.config"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_config_settings
-msgid "pos.config.settings"
-msgstr ""
-
-#. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_session
 msgid "pos.session"
 msgstr ""
@@ -3870,24 +4105,24 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:144
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1562
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1617
+#: code:addons/point_of_sale/models/pos_order.py:145
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1590
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1645
 #, python-format
 msgid "return"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1563
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1574
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1591
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1602
 #, python-format
 msgid "shift"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1536
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1564
 #, python-format
 msgid "tab"
 msgstr ""
@@ -3895,21 +4130,21 @@ msgstr ""
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/chrome.js:284
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1191
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1217
 #, python-format
 msgid "unpaid orders"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1193
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1219
 #, python-format
 msgid "unpaid orders could not be imported"
 msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1195
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1221
 #, python-format
 msgid "were duplicates of existing orders"
 msgstr ""
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
new file mode 100644
index 00000000000..97452e2aa0f
--- /dev/null
+++ b/addons/portal/i18n/portal.pot
@@ -0,0 +1,630 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* portal
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal
+#: model:mail.template,body_html:portal.mail_template_data_portal_welcome
+msgid "\n"
+"<p>\n"
+"    Dear ${object.user_id.name or ''},\n"
+"</p>\n"
+"<p>\n"
+"    You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.\n"
+"</p>\n"
+"<p>\n"
+"    Your login account data is:\n"
+"</p>\n"
+"<ul>\n"
+"    <li>Username: ${object.user_id.login or ''}</li>\n"
+"    <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
+"    <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
+"</ul>\n"
+"<p>\n"
+"    You can set or change your password via the following url:\n"
+"</p>\n"
+"<ul>\n"
+"    <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
+"</ul>\n"
+"<p>\n"
+"${object.wizard_id.welcome_message or ''}"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_show_sign_in
+msgid "<b>Sign in</b>"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_searchbar
+msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_archive_groups
+msgid "Archives"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_layout
+msgid "Change"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "City"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:12
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:27
+#, python-format
+msgid "Click here to see your document."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Company Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Confirm\n"
+"                                <span class=\"fa fa-long-arrow-right\"/>"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_partner_id
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Contacts"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Country"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Country..."
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_create_uid
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_create_date
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,help:portal.field_account_invoice_portal_url
+#: model:ir.model.fields,help:portal.field_portal_mixin_portal_url
+#: model:ir.model.fields,help:portal.field_project_project_portal_url
+#: model:ir.model.fields,help:portal.field_project_task_portal_url
+#: model:ir.model.fields,help:portal.field_sale_order_portal_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_mixin_display_name
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_display_name
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:14
+#, python-format
+msgid "Draw your signature"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_email
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:130
+#, python-format
+msgid "Group %s is not a portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_mixin_id
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_id
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_id
+msgid "ID"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_in_portal
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/controllers/portal.py:180
+#, python-format
+msgid "Invalid Email! Please enter a valid email address."
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_welcome_message
+msgid "Invitation Message"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_mixin___last_update
+#: model:ir.model.fields,field_description:portal.field_portal_wizard___last_update
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_write_uid
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_write_date
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:20
+#, python-format
+msgid "Leave a comment"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_user_id
+msgid "Login User"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.frontend_layout
+msgid "Logout"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.my_account_link
+msgid "My Account"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.pager
+msgid "Next"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:39
+#, python-format
+msgid "Oops! Something went wrong. Try to reload the page and log in."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Phone"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_portal_id
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Portal Access Management"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_account_invoice_portal_url
+#: model:ir.model.fields,field_description:portal.field_portal_mixin_portal_url
+#: model:ir.model.fields,field_description:portal.field_project_project_portal_url
+#: model:ir.model.fields,field_description:portal.field_project_task_portal_url
+#: model:ir.model.fields,field_description:portal.field_sale_order_portal_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.pager
+msgid "Prev"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/js/portal_chatter.js:101
+#, python-format
+msgid "Published on %s"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be valid and unique.\n"
+"                        If necessary, you can fix any contact's email address directly in the list."
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:42
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:106
+#, python-format
+msgid "Several contacts have the same email: "
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:19
+#, python-format
+msgid "Sign & Confirm"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:103
+#, python-format
+msgid "Some contacts don't have a valid email: "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:109
+#, python-format
+msgid "Some contacts have the same email as an existing portal user:"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/controllers/portal.py:197
+#, python-format
+msgid "Some required fields are empty."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "State / Province"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Street"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,help:portal.field_portal_wizard_portal_id
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:11
+#, python-format
+msgid "There are no comments for now."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "This text is included in the email sent to new portal users."
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,help:portal.field_portal_wizard_welcome_message
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:112
+#, python-format
+msgid "To resolve this error, you can: \n"
+"- Correct the emails of the relevant contacts\n"
+"- Grant access only to contacts with unique emails"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_ids
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "VAT Number"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_account_analytic_account_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_account_asset_asset_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_account_bank_statement_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_account_invoice_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_account_payment_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_account_voucher_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_blog_blog_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_calendar_event_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_crm_lead_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_crm_team_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_crossovered_budget_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_event_event_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_event_registration_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_event_track_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_fleet_vehicle_log_contract_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_fleet_vehicle_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_forum_forum_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_forum_tag_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_gamification_badge_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_gamification_challenge_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_applicant_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_contract_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_department_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_employee_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_expense_sheet_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_expense_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_holidays_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_hr_job_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_channel_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_mass_mailing_contact_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_test_simple_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_test_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_thread_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_maintenance_equipment_category_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_maintenance_equipment_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_maintenance_request_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mrp_bom_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mrp_production_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mrp_repair_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mrp_unbuild_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mrp_workorder_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_note_note_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_product_product_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_product_template_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_project_project_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_project_task_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_purchase_order_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_purchase_requisition_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_res_partner_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_res_users_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_sale_order_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_slide_channel_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_slide_slide_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_stock_landed_cost_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_stock_picking_batch_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_stock_picking_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_stock_production_lot_website_message_ids
+#: model:ir.model.fields,field_description:portal.field_survey_survey_website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,help:portal.field_account_analytic_account_website_message_ids
+#: model:ir.model.fields,help:portal.field_account_asset_asset_website_message_ids
+#: model:ir.model.fields,help:portal.field_account_bank_statement_website_message_ids
+#: model:ir.model.fields,help:portal.field_account_invoice_website_message_ids
+#: model:ir.model.fields,help:portal.field_account_payment_website_message_ids
+#: model:ir.model.fields,help:portal.field_account_voucher_website_message_ids
+#: model:ir.model.fields,help:portal.field_blog_blog_website_message_ids
+#: model:ir.model.fields,help:portal.field_calendar_event_website_message_ids
+#: model:ir.model.fields,help:portal.field_crm_lead_website_message_ids
+#: model:ir.model.fields,help:portal.field_crm_team_website_message_ids
+#: model:ir.model.fields,help:portal.field_crossovered_budget_website_message_ids
+#: model:ir.model.fields,help:portal.field_event_event_website_message_ids
+#: model:ir.model.fields,help:portal.field_event_registration_website_message_ids
+#: model:ir.model.fields,help:portal.field_event_track_website_message_ids
+#: model:ir.model.fields,help:portal.field_fleet_vehicle_log_contract_website_message_ids
+#: model:ir.model.fields,help:portal.field_fleet_vehicle_website_message_ids
+#: model:ir.model.fields,help:portal.field_forum_forum_website_message_ids
+#: model:ir.model.fields,help:portal.field_forum_tag_website_message_ids
+#: model:ir.model.fields,help:portal.field_gamification_badge_website_message_ids
+#: model:ir.model.fields,help:portal.field_gamification_challenge_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_applicant_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_contract_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_department_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_employee_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_expense_sheet_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_expense_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_holidays_website_message_ids
+#: model:ir.model.fields,help:portal.field_hr_job_website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_channel_website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_mass_mailing_contact_website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_test_simple_website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_test_website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_thread_website_message_ids
+#: model:ir.model.fields,help:portal.field_maintenance_equipment_category_website_message_ids
+#: model:ir.model.fields,help:portal.field_maintenance_equipment_website_message_ids
+#: model:ir.model.fields,help:portal.field_maintenance_request_website_message_ids
+#: model:ir.model.fields,help:portal.field_mrp_bom_website_message_ids
+#: model:ir.model.fields,help:portal.field_mrp_production_website_message_ids
+#: model:ir.model.fields,help:portal.field_mrp_repair_website_message_ids
+#: model:ir.model.fields,help:portal.field_mrp_unbuild_website_message_ids
+#: model:ir.model.fields,help:portal.field_mrp_workorder_website_message_ids
+#: model:ir.model.fields,help:portal.field_note_note_website_message_ids
+#: model:ir.model.fields,help:portal.field_product_product_website_message_ids
+#: model:ir.model.fields,help:portal.field_product_template_website_message_ids
+#: model:ir.model.fields,help:portal.field_project_project_website_message_ids
+#: model:ir.model.fields,help:portal.field_project_task_website_message_ids
+#: model:ir.model.fields,help:portal.field_purchase_order_website_message_ids
+#: model:ir.model.fields,help:portal.field_purchase_requisition_website_message_ids
+#: model:ir.model.fields,help:portal.field_res_partner_website_message_ids
+#: model:ir.model.fields,help:portal.field_res_users_website_message_ids
+#: model:ir.model.fields,help:portal.field_sale_order_website_message_ids
+#: model:ir.model.fields,help:portal.field_slide_channel_website_message_ids
+#: model:ir.model.fields,help:portal.field_slide_slide_website_message_ids
+#: model:ir.model.fields,help:portal.field_stock_landed_cost_website_message_ids
+#: model:ir.model.fields,help:portal.field_stock_picking_batch_website_message_ids
+#: model:ir.model.fields,help:portal.field_stock_picking_website_message_ids
+#: model:ir.model.fields,help:portal.field_stock_production_lot_website_message_ids
+#: model:ir.model.fields,help:portal.field_survey_survey_website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:25
+#, python-format
+msgid "Well done!"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_wizard_user_wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:32
+#, python-format
+msgid "Write a message..."
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#, python-format
+msgid "You must be"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:182
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Your Contact Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_layout
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Your Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_home
+msgid "Your Documents"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_signature.xml:6
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+#, python-format
+msgid "Your Name"
+msgstr ""
+
+#. module: portal
+#: model:mail.template,subject:portal.mail_template_data_portal_welcome
+msgid "Your Odoo account at ${user.company_id.name}"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "Zip / Postal Code"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:57
+#, python-format
+msgid "avatar"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:8
+#, python-format
+msgid "comment"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:9
+#, python-format
+msgid "comments"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#, python-format
+msgid "logged in"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_mixin
+msgid "portal.mixin"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_my_details
+msgid "select..."
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#, python-format
+msgid "to post a comment."
+msgstr ""
+
diff --git a/addons/pos_data_drinks/i18n/pos_data_drinks.pot b/addons/pos_data_drinks/i18n/pos_data_drinks.pot
index 539658c1875..7fda904ddd6 100644
--- a/addons/pos_data_drinks/i18n/pos_data_drinks.pot
+++ b/addons/pos_data_drinks/i18n/pos_data_drinks.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/pos_discount/i18n/pos_discount.pot b/addons/pos_discount/i18n/pos_discount.pot
index 565d10ad09b..7458d79f154 100644
--- a/addons/pos_discount/i18n/pos_discount.pot
+++ b/addons/pos_discount/i18n/pos_discount.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -28,21 +28,22 @@ msgid "Discount"
 msgstr ""
 
 #. module: pos_discount
+#: model:ir.ui.view,arch_db:pos_discount.pos_config_view_form_inherit_pos_discount
+msgid "Discount %"
+msgstr ""
+
+#. module: pos_discount
 #: model:ir.model.fields,field_description:pos_discount.field_pos_config_discount_pc
 msgid "Discount Percentage"
 msgstr ""
 
 #. module: pos_discount
 #: model:ir.model.fields,field_description:pos_discount.field_pos_config_discount_product_id
+#: model:ir.ui.view,arch_db:pos_discount.pos_config_view_form_inherit_pos_discount
 msgid "Discount Product"
 msgstr ""
 
 #. module: pos_discount
-#: model:ir.ui.view,arch_db:pos_discount.view_pos_config_form
-msgid "Discounts"
-msgstr ""
-
-#. module: pos_discount
 #: model:ir.model.fields,field_description:pos_discount.field_pos_config_iface_discount
 msgid "Order Discounts"
 msgstr ""
@@ -54,7 +55,7 @@ msgstr ""
 
 #. module: pos_discount
 #: model:ir.model.fields,help:pos_discount.field_pos_config_discount_product_id
-msgid "The product used to model the discount"
+msgid "The product used to model the discount."
 msgstr ""
 
 #. module: pos_discount
diff --git a/addons/pos_mercury/i18n/pos_mercury.pot b/addons/pos_mercury/i18n/pos_mercury.pot
index 2dd02dd8356..deee1d1fd20 100644
--- a/addons/pos_mercury/i18n/pos_mercury.pot
+++ b/addons/pos_mercury/i18n/pos_mercury.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,17 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:186
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:180
 #, python-format
 msgid "128 bit CryptoAPI failed"
 msgstr ""
 
 #. module: pos_mercury
+#: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
+msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Buy a card reader"
+msgstr ""
+
+#. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
 msgid "<i>Mercury Configurations</i> define what Mercury account will be used when\n"
 "                                processing credit card transactions in the Point Of Sale. Setting up a Mercury\n"
@@ -54,7 +59,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:190
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:184
 #, python-format
 msgid "All Connections Failed"
 msgstr ""
@@ -101,7 +106,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:196
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:190
 #, python-format
 msgid "Clear Text Request Not Supported"
 msgstr ""
@@ -113,35 +118,35 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:164
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:158
 #, python-format
 msgid "Connect Canceled"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:161
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:155
 #, python-format
 msgid "Connection Lost"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:185
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:179
 #, python-format
 msgid "Control failed to find branded serial (password lookup failed)"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:202
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:196
 #, python-format
 msgid "Could Not Encrypt Response- Call Provider"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:357
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:351
 #, python-format
 msgid "Could not read card"
 msgstr ""
@@ -166,7 +171,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:178
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:172
 #, python-format
 msgid "Disconnecting Socket"
 msgstr ""
@@ -179,7 +184,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:180
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:174
 #, python-format
 msgid "Duplicate Serial Number Detected"
 msgstr ""
@@ -193,28 +198,28 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:173
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:167
 #, python-format
 msgid "Empty Command String"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:638
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:641
 #, python-format
 msgid "Error"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:198
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:192
 #, python-format
 msgid "Error Occurred While Decrypting Request"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:188
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:182
 #, python-format
 msgid "Failed to start Event Thread."
 msgstr ""
@@ -228,42 +233,42 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:170
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:164
 #, python-format
 msgid "General Failure"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:155
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:149
 #, python-format
 msgid "Global API Not Initialized"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:192
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:186
 #, python-format
 msgid "Global Response Length Error (Too Short)"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:194
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:188
 #, python-format
 msgid "Global String Error"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:262
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:256
 #, python-format
 msgid "Go to payment screen to use cards"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:393
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:387
 #, python-format
 msgid "Handling transaction..."
 msgstr ""
@@ -287,232 +292,232 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:184
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:178
 #, python-format
 msgid "In Process with server"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:165
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:159
 #, python-format
 msgid "Initialize Failed"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:172
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:166
 #, python-format
 msgid "Insufficient Fields"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:183
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:177
 #, python-format
 msgid "Internal Server Error – Call Provider"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:206
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:200
 #, python-format
 msgid "Invalid Account Number"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:210
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:204
 #, python-format
 msgid "Invalid Authorization Amount"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:208
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:209
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:202
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:203
 #, python-format
 msgid "Invalid Authorization Code"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:225
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:219
 #, python-format
 msgid "Invalid Batch Item Count"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:224
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:218
 #, python-format
 msgid "Invalid Batch Number"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:230
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:224
 #, python-format
 msgid "Invalid Card Type"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:211
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:205
 #, python-format
 msgid "Invalid Cash Back Amount"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:199
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:193
 #, python-format
 msgid "Invalid Check Digit"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:219
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:213
 #, python-format
 msgid "Invalid Check Type"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:171
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:165
 #, python-format
 msgid "Invalid Command Format"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:218
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:212
 #, python-format
 msgid "Invalid Date of Birth"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:216
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:210
 #, python-format
 msgid "Invalid Derived Key Data"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:227
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:221
 #, python-format
 msgid "Invalid Driver’s License"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:207
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:201
 #, python-format
 msgid "Invalid Expiration Date"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:212
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:206
 #, python-format
 msgid "Invalid Gratuity Amount"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:226
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:220
 #, python-format
 msgid "Invalid MICR Input Type"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:214
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:208
 #, python-format
 msgid "Invalid Magnetic Stripe Data"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:205
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:199
 #, python-format
 msgid "Invalid Memo"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:222
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:216
 #, python-format
 msgid "Invalid Merchant ID"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:204
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:198
 #, python-format
 msgid "Invalid Operator ID"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:215
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:209
 #, python-format
 msgid "Invalid PIN Block Data"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:229
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:223
 #, python-format
 msgid "Invalid Pass Data"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:213
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:207
 #, python-format
 msgid "Invalid Purchase Amount"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:220
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:214
 #, python-format
 msgid "Invalid Routing Number"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:228
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:222
 #, python-format
 msgid "Invalid Sequence Number"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:217
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:211
 #, python-format
 msgid "Invalid State Code"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:223
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:217
 #, python-format
 msgid "Invalid TStream Type"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:221
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:215
 #, python-format
 msgid "Invalid TranCode"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:203
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:197
 #, python-format
 msgid "Invalid Transaction Type"
 msgstr ""
@@ -557,7 +562,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:200
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:194
 #, python-format
 msgid "Merchant ID Missing"
 msgstr ""
@@ -568,11 +573,6 @@ msgid "Merchant Password"
 msgstr ""
 
 #. module: pos_mercury
-#: model:ir.ui.view,arch_db:pos_mercury.pos_config_settings_view_form_inherit_pos_mercury
-msgid "Mercury Configuration"
-msgstr ""
-
-#. module: pos_mercury
 #: model:ir.actions.act_window,name:pos_mercury.action_configuration_form
 #: model:ir.ui.menu,name:pos_mercury.menu_pos_pos_mercury_config
 msgid "Mercury Configurations"
@@ -580,7 +580,7 @@ msgstr ""
 
 #. module: pos_mercury
 #: model:ir.model.fields,field_description:pos_mercury.field_account_journal_pos_mercury_config_id
-msgid "Mercury configuration"
+msgid "Mercury Credentials"
 msgstr ""
 
 #. module: pos_mercury
@@ -609,27 +609,27 @@ msgid "Name of this Mercury configuration"
 msgstr ""
 
 #. module: pos_mercury
-#: code:addons/pos_mercury/models/pos_mercury_transaction.py:35
+#: code:addons/pos_mercury/models/pos_mercury_transaction.py:33
 #, python-format
 msgid "No Mercury configuration associated with the journal."
 msgstr ""
 
 #. module: pos_mercury
-#: code:addons/pos_mercury/models/pos_mercury_transaction.py:23
+#: code:addons/pos_mercury/models/pos_mercury_transaction.py:21
 #, python-format
 msgid "No opened point of sale session for user %s found"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:334
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:328
 #, python-format
 msgid "No response from Mercury (Mercury down?)"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:336
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:330
 #, python-format
 msgid "No response from server (connected to network?)"
 msgstr ""
@@ -637,14 +637,14 @@ msgstr ""
 #. module: pos_mercury
 #. openerp-web
 #: code:addons/pos_mercury/static/src/js/pos_mercury.js:414
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:562
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:567
 #, python-format
 msgid "Odoo error while processing transaction."
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:639
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:642
 #, python-format
 msgid "One credit card swipe already pending."
 msgstr ""
@@ -663,28 +663,28 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:181
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:175
 #, python-format
 msgid "Password Failed (Client / Server)"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:176
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:170
 #, python-format
 msgid "Password Failed – Disconnecting"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:174
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:168
 #, python-format
 msgid "Password Verified"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:182
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:176
 #, python-format
 msgid "Password failed (Challenge / Response)"
 msgstr ""
@@ -718,7 +718,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:175
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:169
 #, python-format
 msgid "Queue Full"
 msgstr ""
@@ -730,63 +730,63 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:179
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:173
 #, python-format
 msgid "Refused ‘Max Connections’"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:540
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:539
 #, python-format
 msgid "Reversal failed, sending VoidSale..."
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:576
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:581
 #, python-format
 msgid "Reversal succeeded"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:543
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:542
 #, python-format
 msgid "Sending reversal..."
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:191
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:185
 #, python-format
 msgid "Server Login Failed"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:160
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:154
 #, python-format
 msgid "Socket Connection Failed"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:159
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:153
 #, python-format
 msgid "Socket Creation Failed"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:157
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:151
 #, python-format
 msgid "Socket Error sending request"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:158
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:152
 #, python-format
 msgid "Socket already open or in use"
 msgstr ""
@@ -798,14 +798,14 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:177
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:171
 #, python-format
 msgid "System Going Offline"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:162
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:156
 #, python-format
 msgid "TCP/IP Failed to Initialize"
 msgstr ""
@@ -819,7 +819,7 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:201
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:195
 #, python-format
 msgid "TStream Type Missing"
 msgstr ""
@@ -851,63 +851,63 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:358
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:352
 #, python-format
 msgid "This can be caused by a badly executed swipe or by not having your keyboard layout set to US QWERTY (not US International)."
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:187
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:181
 #, python-format
 msgid "Threaded Auth Started Expect Response"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:163
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:157
 #, python-format
 msgid "Time Out waiting for server response"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:169
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:163
 #, python-format
 msgid "Timeout error"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:156
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:150
 #, python-format
 msgid "Timeout on Response"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:152
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:146
 #, python-format
 msgid "Transaction approved"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:193
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:187
 #, python-format
 msgid "Unable to Parse Response from Global (Indistinguishable)"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:166
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:160
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:197
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:191
 #, python-format
 msgid "Unrecognized Request Format"
 msgstr ""
@@ -921,8 +921,13 @@ msgid "Using the Mercury integration in the Point Of Sale is easy: just press th
 msgstr ""
 
 #. module: pos_mercury
+#: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
+msgid "Vantiv Accounts"
+msgstr ""
+
+#. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:584
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:589
 #, python-format
 msgid "VoidSale succeeded"
 msgstr ""
@@ -942,14 +947,14 @@ msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:195
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:189
 #, python-format
 msgid "Weak Encryption Request Not Supported"
 msgstr ""
 
 #. module: pos_mercury
 #. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:189
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:183
 #, python-format
 msgid "XML Parse Error"
 msgstr ""
diff --git a/addons/pos_reprint/i18n/pos_reprint.pot b/addons/pos_reprint/i18n/pos_reprint.pot
index 82294ee97a9..adad53bbe50 100644
--- a/addons/pos_reprint/i18n/pos_reprint.pot
+++ b/addons/pos_reprint/i18n/pos_reprint.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,38 +17,29 @@ msgstr ""
 
 #. module: pos_reprint
 #. openerp-web
-#: code:addons/pos_reprint/static/src/js/reprint.js:24
+#: code:addons/pos_reprint/static/src/xml/reprint.xml:13
 #, python-format
-msgid "Nothing to Print"
+msgid "Back"
 msgstr ""
 
 #. module: pos_reprint
-#: model:ir.model.fields,field_description:pos_reprint.field_pos_config_iface_reprint
-msgid "Receipt Reprinting"
+#. openerp-web
+#: code:addons/pos_reprint/static/src/js/reprint.js:38
+#, python-format
+msgid "Nothing to Print"
 msgstr ""
 
 #. module: pos_reprint
 #. openerp-web
 #: code:addons/pos_reprint/static/src/xml/reprint.xml:6
-#: model:ir.ui.view,arch_db:pos_reprint.view_pos_config_form
 #, python-format
 msgid "Reprint Receipt"
 msgstr ""
 
 #. module: pos_reprint
 #. openerp-web
-#: code:addons/pos_reprint/static/src/js/reprint.js:25
+#: code:addons/pos_reprint/static/src/js/reprint.js:39
 #, python-format
 msgid "There is no previous receipt to print."
 msgstr ""
 
-#. module: pos_reprint
-#: model:ir.model.fields,help:pos_reprint.field_pos_config_iface_reprint
-msgid "This allows you to reprint a previously printed receipt."
-msgstr ""
-
-#. module: pos_reprint
-#: model:ir.model,name:pos_reprint.model_pos_config
-msgid "pos.config"
-msgstr ""
-
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index 301a06d0142..927dff79cb7 100644
--- a/addons/pos_restaurant/i18n/pos_restaurant.pot
+++ b/addons/pos_restaurant/i18n/pos_restaurant.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,16 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
+msgid "<strong>Floor Name: </strong>"
+msgstr ""
+
+#. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
+msgid "<strong>Point of Sale: </strong>"
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor_background_image
 msgid "A background image used to display a floor layout in the point of sale interface"
 msgstr ""
@@ -27,6 +37,11 @@ msgid "A restaurant floor represents the place where customers are served, this
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Accept customer tips or convert their change to a tip"
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_active
 msgid "Active"
 msgstr ""
@@ -39,13 +54,23 @@ msgid "Add Note"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Add notes to orderlines"
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_orderline_notes
-msgid "Allow custom notes on Orderlines"
+msgid "Allow custom notes on Orderlines."
+msgstr ""
+
+#. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Allow to print bill before payment"
 msgstr ""
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_printbill
-msgid "Allows to print the Bill before payment"
+msgid "Allows to print the Bill before payment."
 msgstr ""
 
 #. module: pos_restaurant
@@ -70,7 +95,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:550
+#: code:addons/pos_restaurant/static/src/js/floors.js:562
 #, python-format
 msgid "Are you sure ?"
 msgstr ""
@@ -94,11 +119,6 @@ msgid "Background Image"
 msgstr ""
 
 #. module: pos_restaurant
-#: model:ir.ui.view,arch_db:pos_restaurant.view_pos_config_form
-msgid "Bar & Restaurant"
-msgstr ""
-
-#. module: pos_restaurant
 #. openerp-web
 #: code:addons/pos_restaurant/static/src/xml/printbill.xml:31
 #, python-format
@@ -123,16 +143,16 @@ msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:30
+#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:39
 #, python-format
 msgid "CANCELLED"
 msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:260
-#: code:addons/pos_restaurant/static/src/js/floors.js:297
-#: code:addons/pos_restaurant/static/src/js/floors.js:411
+#: code:addons/pos_restaurant/static/src/js/floors.js:270
+#: code:addons/pos_restaurant/static/src/js/floors.js:309
+#: code:addons/pos_restaurant/static/src/js/floors.js:425
 #, python-format
 msgid "Changes could not be saved"
 msgstr ""
@@ -197,7 +217,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_splitbill
-msgid "Enables Bill Splitting in the Point of Sale"
+msgid "Enables Bill Splitting in the Point of Sale."
 msgstr ""
 
 #. module: pos_restaurant
@@ -217,6 +237,11 @@ msgid "Floor Plans"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Floors"
+msgstr ""
+
+#. module: pos_restaurant
 #. openerp-web
 #: code:addons/pos_restaurant/static/src/xml/floors.xml:28
 #: model:ir.model.fields,field_description:pos_restaurant.field_pos_order_customer_count
@@ -226,7 +251,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:925
+#: code:addons/pos_restaurant/static/src/js/floors.js:946
 #, python-format
 msgid "Guests ?"
 msgstr ""
@@ -283,16 +308,21 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Manage table orders"
+msgstr ""
+
+#. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:52
+#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:62
 #, python-format
 msgid "NEW"
 msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:40
-#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:62
+#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:50
+#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:73
 #, python-format
 msgid "NOTE"
 msgstr ""
@@ -306,7 +336,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:483
+#: code:addons/pos_restaurant/static/src/js/floors.js:495
 #, python-format
 msgid "Number of Seats ?"
 msgstr ""
@@ -327,6 +357,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #: model:ir.actions.act_window,name:pos_restaurant.action_restaurant_printer_form
+#: model:ir.model.fields,field_description:pos_restaurant.field_pos_config_is_order_printer
 #: model:ir.model.fields,field_description:pos_restaurant.field_pos_config_printer_ids
 #: model:ir.ui.menu,name:pos_restaurant.menu_restaurant_printer_all
 msgid "Order Printers"
@@ -373,6 +404,11 @@ msgid "Print"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Print orders at the kitchen, at the bar, etc."
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_printer_product_categories_ids
 msgid "Printed Product Categories"
 msgstr ""
@@ -383,13 +419,18 @@ msgid "Printer Name"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Printers"
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_printer_proxy_ip
 msgid "Proxy IP Address"
 msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:551
+#: code:addons/pos_restaurant/static/src/js/floors.js:563
 #, python-format
 msgid "Removing a table cannot be undone"
 msgstr ""
@@ -450,6 +491,11 @@ msgid "Split"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Split total or order lines"
+msgstr ""
+
+#. module: pos_restaurant
 #: selection:restaurant.table,shape:0
 msgid "Square"
 msgstr ""
@@ -474,13 +520,18 @@ msgid "Table"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.model.fields,field_description:pos_restaurant.field_pos_config_is_table_management
+msgid "Table Management"
+msgstr ""
+
+#. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_name
 msgid "Table Name"
 msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:471
+#: code:addons/pos_restaurant/static/src/js/floors.js:483
 #, python-format
 msgid "Table Name ?"
 msgstr ""
@@ -525,7 +576,7 @@ msgstr ""
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_floor_ids
-msgid "The restaurant floors served by this point of sale"
+msgid "The restaurant floors served by this point of sale."
 msgstr ""
 
 #. module: pos_restaurant
@@ -566,6 +617,21 @@ msgid "This floor has no tables yet, use the"
 msgstr ""
 
 #. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "This product is used as reference on customer receipts."
+msgstr ""
+
+#. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Tip Product"
+msgstr ""
+
+#. module: pos_restaurant
+#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
+msgid "Tips"
+msgstr ""
+
+#. module: pos_restaurant
 #. openerp-web
 #: code:addons/pos_restaurant/static/src/xml/floors.xml:37
 #, python-format
@@ -578,13 +644,6 @@ msgid "Used to sort Floors"
 msgstr ""
 
 #. module: pos_restaurant
-#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/printbill.xml:57
-#, python-format
-msgid "VAT:"
-msgstr ""
-
-#. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_position_v
 msgid "Vertical Position"
 msgstr ""
@@ -603,9 +662,9 @@ msgstr ""
 
 #. module: pos_restaurant
 #. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:261
-#: code:addons/pos_restaurant/static/src/js/floors.js:298
-#: code:addons/pos_restaurant/static/src/js/floors.js:412
+#: code:addons/pos_restaurant/static/src/js/floors.js:271
+#: code:addons/pos_restaurant/static/src/js/floors.js:310
+#: code:addons/pos_restaurant/static/src/js/floors.js:426
 #, python-format
 msgid "You must be connected to the internet to save your changes."
 msgstr ""
diff --git a/addons/pos_sale/i18n/pos_sale.pot b/addons/pos_sale/i18n/pos_sale.pot
index 20da8d8d705..caa95484b4b 100644
--- a/addons/pos_sale/i18n/pos_sale.pot
+++ b/addons/pos_sale/i18n/pos_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pos_sale
+#: model:ir.model,name:pos_sale.model_report_all_channels_sales
+msgid "All sales orders grouped by sales channels"
+msgstr ""
+
+#. module: pos_sale
 #: code:addons/pos_sale/models/crm_team.py:103
 #, python-format
 msgid "Dashboard"
diff --git a/addons/procurement_jit/i18n/procurement_jit.pot b/addons/procurement_jit/i18n/procurement_jit.pot
index caabd7ca952..307b2deddd9 100644
--- a/addons/procurement_jit/i18n/procurement_jit.pot
+++ b/addons/procurement_jit/i18n/procurement_jit.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 5069bd39164..6491b082be7 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,19 +32,19 @@ msgid "# Products"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:440
+#: code:addons/product/models/product_pricelist.py:446
 #, python-format
 msgid "%s %% discount"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:442
+#: code:addons/product/models/product_pricelist.py:448
 #, python-format
 msgid "%s %% discount and %s surcharge"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:327
+#: code:addons/product/models/product_template.py:324
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -67,6 +67,11 @@ msgid "<span>kg</span>"
 msgstr ""
 
 #. module: product
+#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
+msgid "<span>m³</span>"
+msgstr ""
+
+#. module: product
 #: model:ir.ui.view,arch_db:product.report_pricelist
 msgid "<strong>Currency</strong>:<br/>"
 msgstr ""
@@ -99,11 +104,6 @@ msgid "A barcode can only be assigned to one product !"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,help:product.field_product_category_type
-msgid "A category of the view type is a virtual category that can be used as the parent of another category to create a hierarchical structure."
-msgstr ""
-
-#. module: product
 #: model:ir.model.fields,help:product.field_product_product_description_sale
 #: model:ir.model.fields,help:product.field_product_template_description_sale
 msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
@@ -146,12 +146,17 @@ msgid "Active"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: product
 #: model:product.category,name:product.product_category_all
 msgid "All"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:435
+#: code:addons/product/models/product_pricelist.py:441
 #, python-format
 msgid "All Products"
 msgstr ""
@@ -162,6 +167,12 @@ msgid "All general settings about this product are managed on"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,help:product.field_res_config_settings_group_sale_pricelist
+msgid "Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+
+#. module: product
 #: model:ir.ui.view,arch_db:product.product_normal_form_view
 #: model:ir.ui.view,arch_db:product.product_pricelist_view
 msgid "Applicable On"
@@ -223,6 +234,11 @@ msgid "Attributes"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_product_variant
+msgid "Attributes and Variants"
+msgstr ""
+
+#. module: product
 #: model:ir.model.fields,field_description:product.field_product_packaging_barcode
 #: model:ir.model.fields,field_description:product.field_product_product_barcode
 #: model:ir.model.fields,field_description:product.field_product_template_barcode
@@ -301,22 +317,17 @@ msgstr ""
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_uom_category_id
+#: model:ir.ui.view,arch_db:product.product_template_form_view
 msgid "Category"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,field_description:product.field_product_category_type
-#: model:ir.ui.view,arch_db:product.product_category_form_view
-msgid "Category Type"
-msgstr ""
-
-#. module: product
 #: model:ir.ui.view,arch_db:product.product_category_form_view
 msgid "Category name"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:429
+#: code:addons/product/models/product_pricelist.py:435
 #, python-format
 msgid "Category: %s"
 msgstr ""
@@ -367,7 +378,7 @@ msgid "Color Index"
 msgstr ""
 
 #. module: product
-#: model:ir.ui.view,arch_db:product.base_config_settings_view_form_inherit_product
+#: model:ir.ui.view,arch_db:product.res_config_settings_view_form
 msgid "Common Product Catalog"
 msgstr ""
 
@@ -398,7 +409,7 @@ msgid "Compute Price"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:52
+#: code:addons/product/models/product_template.py:50
 #: selection:product.template,type:0
 #, python-format
 msgid "Consumable"
@@ -430,12 +441,12 @@ msgstr ""
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_standard_price
-msgid "Cost of the product template used for standard stock valuation in accounting and used as a base price on purchase orders. Expressed in the default unit of measure of the product."
+msgid "Cost used for stock valuation in standard price and as a first price to set in average/fifo. Also used as a base price for pricelists. Expressed in the default unit of measure of the product."
 msgstr ""
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_template_standard_price
-msgid "Cost of the product, in the default unit of measure of the product."
+msgid "Cost used for stock valuation in standard price and as a first price to set in average/fifo. Also used as a base price for pricelists. Expressed in the default unit of measure of the product. "
 msgstr ""
 
 #. module: product
@@ -546,7 +557,7 @@ msgstr ""
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_template_form_view
-msgid "Description for Quotations"
+msgid "Description for Customers"
 msgstr ""
 
 #. module: product
@@ -604,7 +615,7 @@ msgid "Ending valid for the pricelist item validation"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product.py:57
+#: code:addons/product/models/product.py:53
 #, python-format
 msgid "Error ! You cannot create recursive categories."
 msgstr ""
@@ -616,25 +627,25 @@ msgid "Error ! You cannot use this attribute with the following value."
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product.py:286
+#: code:addons/product/models/product.py:283
 #, python-format
 msgid "Error! It is not allowed to choose more than one value for a given attribute."
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:421
+#: code:addons/product/models/product_pricelist.py:427
 #, python-format
 msgid "Error! The minimum margin should be lower than the maximum margin."
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_pricelist.py:415
+#: code:addons/product/models/product_pricelist.py:421
 #, python-format
 msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:277
+#: code:addons/product/models/product_template.py:274
 #, python-format
 msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
 msgstr ""
@@ -678,11 +689,6 @@ msgid "Gives the different ways to package the same product."
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,help:product.field_product_pricelist_item_sequence
-msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."
-msgstr ""
-
-#. module: product
 #: model:ir.model.fields,help:product.field_product_product_sequence
 #: model:ir.model.fields,help:product.field_product_template_sequence
 msgid "Gives the sequence order when displaying a product list"
@@ -694,7 +700,7 @@ msgid "Global"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:32
+#: code:addons/product/models/product_template.py:30
 #, python-format
 msgid "Go to Internal Categories"
 msgstr ""
@@ -740,6 +746,11 @@ msgid "ID"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,help:product.field_product_supplierinfo_product_id
+msgid "If not set, the vendor price will apply to all variants of this products."
+msgstr ""
+
+#. module: product
 #: model:ir.model.fields,help:product.field_product_pricelist_active
 msgid "If unchecked, it will allow you to hide the pricelist without removing it."
 msgstr ""
@@ -778,7 +789,6 @@ msgstr ""
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_categ_id
 #: model:ir.model.fields,field_description:product.field_product_template_categ_id
-#: model:ir.ui.view,arch_db:product.product_template_form_view
 msgid "Internal Category"
 msgstr ""
 
@@ -959,8 +969,18 @@ msgid "New Price ="
 msgstr ""
 
 #. module: product
-#: selection:product.category,type:0
-msgid "Normal"
+#: model:ir.model.fields,field_description:product.field_product_product_activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_activity_type_id
+msgid "Next Activity Type"
 msgstr ""
 
 #. module: product
@@ -1069,7 +1089,7 @@ msgid "PriceList"
 msgstr ""
 
 #. module: product
-#: model:ir.actions.report.xml,name:product.action_report_pricelist
+#: model:ir.actions.report,name:product.action_report_pricelist
 #: model:ir.model,name:product.model_product_pricelist
 #: model:ir.model.fields,field_description:product.field_product_pricelist_item_pricelist_id
 #: model:ir.model.fields,field_description:product.field_product_product_pricelist_id
@@ -1201,6 +1221,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.action_packaging_view
 #: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
 #: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_stock_packaging
 #: model:ir.ui.view,arch_db:product.product_packaging_tree_view
 msgid "Product Packages"
 msgstr ""
@@ -1263,8 +1284,8 @@ msgid "Products"
 msgstr ""
 
 #. module: product
-#: model:ir.actions.report.xml,name:product.report_product_label
-#: model:ir.actions.report.xml,name:product.report_product_template_label
+#: model:ir.actions.report,name:product.report_product_label
+#: model:ir.actions.report,name:product.report_product_template_label
 msgid "Products Labels"
 msgstr ""
 
@@ -1285,7 +1306,7 @@ msgid "Products Price Search"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product.py:449
+#: code:addons/product/models/product.py:448
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -1359,6 +1380,11 @@ msgid "Reference Unit of Measure for this category"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_activity_user_id
+msgid "Responsible"
+msgstr ""
+
+#. module: product
 #: model:ir.model.fields,field_description:product.field_product_category_parent_right
 msgid "Right Parent"
 msgstr ""
@@ -1380,9 +1406,7 @@ msgid "Sale Description"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_list_price
 #: model:ir.model.fields,field_description:product.field_product_product_lst_price
-#: model:ir.model.fields,field_description:product.field_product_template_list_price
 msgid "Sale Price"
 msgstr ""
 
@@ -1403,6 +1427,12 @@ msgid "Sales"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_list_price
+#: model:ir.model.fields,field_description:product.field_product_template_list_price
+msgid "Sales Price"
+msgstr ""
+
+#. module: product
 #: model:res.groups,name:product.group_sale_pricelist
 msgid "Sales Pricelists"
 msgstr ""
@@ -1417,7 +1447,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:product.field_product_attribute_sequence
 #: model:ir.model.fields,field_description:product.field_product_attribute_value_sequence
 #: model:ir.model.fields,field_description:product.field_product_packaging_sequence
-#: model:ir.model.fields,field_description:product.field_product_pricelist_item_sequence
 #: model:ir.model.fields,field_description:product.field_product_pricelist_sequence
 #: model:ir.model.fields,field_description:product.field_product_product_sequence
 #: model:ir.model.fields,field_description:product.field_product_supplierinfo_sequence
@@ -1426,7 +1455,7 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:53
+#: code:addons/product/models/product_template.py:51
 #: selection:product.template,type:0
 #, python-format
 msgid "Service"
@@ -1445,20 +1474,28 @@ msgid "Sets the price so that it is a multiple of this value.\n"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,field_description:product.field_base_config_settings_company_share_product
-#: model:ir.model.fields,field_description:product.field_hr_timesheet_config_settings_company_share_product
+#: model:ir.model.fields,field_description:product.field_res_config_settings_company_share_product
 msgid "Share product to all companies"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,help:product.field_base_config_settings_company_share_product
-#: model:ir.model.fields,help:product.field_hr_timesheet_config_settings_company_share_product
+#: model:ir.model.fields,help:product.field_res_config_settings_company_share_product
 msgid "Share your product to all companies defined in your instance.\n"
 " * Checked : Product are visible for every company, even if a company is defined on the partner.\n"
 " * Unchecked : Each company can see only its product (product where company is defined). Product not related to a company are visible for all companies."
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_product_pricelist
+msgid "Show pricelists On Products"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_pricelist_item
+msgid "Show pricelists to customers"
+msgstr ""
+
+#. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_image_small
 #: model:ir.model.fields,field_description:product.field_product_template_image_small
 msgid "Small-sized image"
@@ -1527,6 +1564,19 @@ msgid "Starting date for the pricelist item validation"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_activity_state
+msgid "State"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product_activity_state
+msgid "Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
 msgstr ""
@@ -1647,7 +1697,7 @@ msgstr ""
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_template_form_view
-msgid "This note will be displayed on the quotations."
+msgid "This note will show up on sales orders."
 msgstr ""
 
 #. module: product
@@ -1700,6 +1750,7 @@ msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_uom
 #: model:ir.ui.view,arch_db:product.product_uom_form_view
 #: model:ir.ui.view,arch_db:product.product_uom_tree_view
 msgid "Units of Measure"
@@ -1719,6 +1770,11 @@ msgid "Units of measure belonging to the same category can be\n"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_res_config_settings_group_sale_pricelist
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: product
 #: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
 msgid "Validity"
 msgstr ""
@@ -1736,6 +1792,11 @@ msgid "Values"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_variant_count
+msgid "Variant Count"
+msgstr ""
+
+#. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_image_variant
 msgid "Variant Image"
 msgstr ""
@@ -1756,6 +1817,12 @@ msgid "Variant Prices"
 msgstr ""
 
 #. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_variant_seller_ids
+#: model:ir.model.fields,field_description:product.field_product_template_variant_seller_ids
+msgid "Variant Seller"
+msgstr ""
+
+#. module: product
 #: model:ir.actions.act_window,name:product.product_attribute_value_action
 #: model:ir.ui.view,arch_db:product.attribute_tree_view
 #: model:ir.ui.view,arch_db:product.variants_tree_view
@@ -1814,11 +1881,6 @@ msgid "Vendors"
 msgstr ""
 
 #. module: product
-#: selection:product.category,type:0
-msgid "View"
-msgstr ""
-
-#. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_volume
 #: model:ir.model.fields,field_description:product.field_product_template_volume
 #: model:product.uom.categ,name:product.product_uom_categ_vol
@@ -1826,12 +1888,6 @@ msgid "Volume"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_warranty
-#: model:ir.model.fields,field_description:product.field_product_template_warranty
-msgid "Warranty"
-msgstr ""
-
-#. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_weight
 #: model:ir.model.fields,field_description:product.field_product_template_weight
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -1844,22 +1900,11 @@ msgid "Weights"
 msgstr ""
 
 #. module: product
-#: model:ir.model.fields,help:product.field_product_supplierinfo_product_id
-msgid "When this field is filled in, the vendor data will only apply to the variant."
-msgstr ""
-
-#. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:272
-#, python-format
-msgid "You cannot create a product with an Internal Category set as View. Please change the category or the category type."
-msgstr ""
-
-#. module: product
 #: code:addons/product/models/decimal_precision.py:16
 #, python-format
 msgid "You cannot define the decimal precision of 'Account' as greater than the rounding factor of the company's main currency"
@@ -1898,14 +1943,9 @@ msgid "You must define a product for everything you sell, whether it's a physica
 msgstr ""
 
 #. module: product
-#: code:addons/product/models/product_template.py:31
+#: code:addons/product/models/product_template.py:29
 #, python-format
-msgid "You must define at least one product category (that is not a view) in order to be able to create products."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_base_config_settings
-msgid "base.config.settings"
+msgid "You must define at least one product category in order to be able to create products."
 msgstr ""
 
 #. module: product
@@ -1930,7 +1970,7 @@ msgstr ""
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
-msgid "e.g. Odoo Enterprise Susbcription"
+msgid "e.g. Odoo Enterprise Subscription"
 msgstr ""
 
 #. module: product
@@ -2024,6 +2064,11 @@ msgid "report.product.report_pricelist"
 msgstr ""
 
 #. module: product
+#: model:ir.model,name:product.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: product
 #: model:ir.ui.view,arch_db:product.view_partner_property_form
 msgid "the parent company"
 msgstr ""
diff --git a/addons/product_email_template/i18n/product_email_template.pot b/addons/product_email_template/i18n/product_email_template.pot
index af65bc60f8c..466ce62a9e0 100644
--- a/addons/product_email_template/i18n/product_email_template.pot
+++ b/addons/product_email_template/i18n/product_email_template.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,26 +21,23 @@ msgid "Body"
 msgstr ""
 
 #. module: product_email_template
-#: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
-msgid "Email Template"
-msgstr ""
-
-#. module: product_email_template
-#: model:ir.model,name:product_email_template.model_account_invoice
-msgid "Invoice"
+#: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
+msgid "Email"
 msgstr ""
 
 #. module: product_email_template
+#: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
 #: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
-msgid "Invoice Confirmation Email"
+msgid "Email Template"
 msgstr ""
 
 #. module: product_email_template
-#: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
-msgid "Miscellaneous"
+#: model:ir.model,name:product_email_template.model_account_invoice
+msgid "Invoice"
 msgstr ""
 
 #. module: product_email_template
+#: model:ir.model.fields,field_description:product_email_template.field_product_product_email_template_id
 #: model:ir.model.fields,field_description:product_email_template.field_product_template_email_template_id
 msgid "Product Email Template"
 msgstr ""
@@ -51,6 +48,12 @@ msgid "Product Template"
 msgstr ""
 
 #. module: product_email_template
+#: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
+msgid "Send a product-specific email once the invoice is paid"
+msgstr ""
+
+#. module: product_email_template
+#: model:ir.model.fields,help:product_email_template.field_product_product_email_template_id
 #: model:ir.model.fields,help:product_email_template.field_product_template_email_template_id
 msgid "When validating an invoice, an email will be sent to the customer based on this template. The customer will receive an email for each product linked to an email template."
 msgstr ""
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 6bc1754177c..ff667b4b335 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,13 @@ msgid "Best before Date"
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_alert_date
+msgid "Date to determine the expired lots and serial numbers using the filter \"Expiration Alerts\"."
+msgstr ""
+
+#. module: product_expiry
 #: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry
+#: model:ir.ui.view,arch_db:product_expiry.view_product_form_expiry
 msgid "Dates"
 msgstr ""
 
@@ -61,26 +67,31 @@ msgid "Lot/Serial"
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,help:product_expiry.field_product_product_alert_time
 #: model:ir.model.fields,help:product_expiry.field_product_template_alert_time
 msgid "Number of days before an alert should be raised on the lot/serial number."
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,help:product_expiry.field_product_product_life_time
 #: model:ir.model.fields,help:product_expiry.field_product_template_life_time
 msgid "Number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number."
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,help:product_expiry.field_product_product_removal_time
 #: model:ir.model.fields,help:product_expiry.field_product_template_removal_time
 msgid "Number of days before the goods should be removed from the stock. It will be computed on the lot/serial number."
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,help:product_expiry.field_product_product_use_time
 #: model:ir.model.fields,help:product_expiry.field_product_template_use_time
 msgid "Number of days before the goods starts deteriorating, without being dangerous yet. It will be computed on the lot/serial number."
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,field_description:product_expiry.field_product_product_alert_time
 #: model:ir.model.fields,field_description:product_expiry.field_product_template_alert_time
 msgid "Product Alert Time"
 msgstr ""
@@ -91,11 +102,13 @@ msgid "Product Expiry Alert"
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,field_description:product_expiry.field_product_product_life_time
 #: model:ir.model.fields,field_description:product_expiry.field_product_template_life_time
 msgid "Product Life Time"
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,field_description:product_expiry.field_product_product_removal_time
 #: model:ir.model.fields,field_description:product_expiry.field_product_template_removal_time
 msgid "Product Removal Time"
 msgstr ""
@@ -106,6 +119,7 @@ msgid "Product Template"
 msgstr ""
 
 #. module: product_expiry
+#: model:ir.model.fields,field_description:product_expiry.field_product_product_use_time
 #: model:ir.model.fields,field_description:product_expiry.field_product_template_use_time
 msgid "Product Use Time"
 msgstr ""
@@ -127,11 +141,6 @@ msgid "The Alert Date has been reached."
 msgstr ""
 
 #. module: product_expiry
-#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_alert_date
-msgid "This is the date on which an alert should be notified about the goods with this Serial Number."
-msgstr ""
-
-#. module: product_expiry
 #: model:ir.model.fields,help:product_expiry.field_stock_production_lot_life_date
 msgid "This is the date on which the goods with this Serial Number may become dangerous and must not be consumed."
 msgstr ""
diff --git a/addons/product_extended/i18n/product_extended.pot b/addons/product_extended/i18n/product_extended.pot
index 3464fc91703..05b30d2f30d 100644
--- a/addons/product_extended/i18n/product_extended.pot
+++ b/addons/product_extended/i18n/product_extended.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_product_product_available_in_pos
-msgid "Available in the Point of Sale"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,help:product_extended.field_product_product_to_weight
-msgid "Check if the product should be weighted using the hardware scale integration"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,help:product_extended.field_product_product_available_in_pos
-msgid "Check if you want this product to appear in the Point of Sale"
-msgstr ""
-
-#. module: product_extended
 #: model:ir.ui.view,arch_db:product_extended.product_product_ext_form_view2
 #: model:ir.ui.view,arch_db:product_extended.product_product_view_form_normal_inherit_extended
 msgid "Compute from BOM"
@@ -43,11 +28,6 @@ msgid "Compute the price of the product using products and operations of related
 msgstr ""
 
 #. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_product_product_pos_categ_id
-msgid "Point of Sale Category"
-msgstr ""
-
-#. module: product_extended
 #: model:ir.model,name:product_extended.model_product_product
 msgid "Product"
 msgstr ""
@@ -57,13 +37,3 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
-#. module: product_extended
-#: model:ir.model.fields,help:product_extended.field_product_product_pos_categ_id
-msgid "Those categories are used to group similar products for point of sale."
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_product_product_to_weight
-msgid "To Weigh With Scale"
-msgstr ""
-
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index f478332fb99..f13347c8aaf 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -62,11 +62,6 @@ msgid "Catalog Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_membership
-msgid "Check if the product is eligible for membership."
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_margin_create_uid
 msgid "Created by"
 msgstr ""
@@ -77,21 +72,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_taxes_id
-msgid "Customer Taxes"
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_membership_date_from
-msgid "Date from which membership becomes active."
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_membership_date_to
-msgid "Date until which membership remains active."
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_margin_display_name
 msgid "Display Name"
 msgstr ""
@@ -133,11 +113,6 @@ msgid "Expected margin * 100 / Expected Sale"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_property_account_expense_id
-msgid "Expense Account"
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_margin_from_date
 msgid "From"
 msgstr ""
@@ -153,11 +128,6 @@ msgid "ID"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_property_account_income_id
-msgid "Income Account"
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_margin_invoice_state
 #: model:ir.model.fields,field_description:product_margin.field_product_product_invoice_state
 msgid "Invoice State"
@@ -194,21 +164,6 @@ msgid "Margins"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_membership
-msgid "Membership"
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_membership_date_to
-msgid "Membership End Date"
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_membership_date_from
-msgid "Membership Start Date"
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_product_normal_cost
 msgid "Normal Cost"
 msgstr ""
@@ -241,11 +196,6 @@ msgid "Product"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_email_template_id
-msgid "Product Email Template"
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
 msgstr ""
@@ -323,16 +273,6 @@ msgid "Sum of Quantity in Vendor Bills"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_property_account_expense_id
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_property_account_income_id
-msgid "This account will be used for invoices instead of the default one to value sales for the current product."
-msgstr ""
-
-#. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_margin_to_date
 msgid "To"
 msgstr ""
@@ -345,6 +285,7 @@ msgstr ""
 
 #. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_product_total_margin
+#: model:ir.ui.view,arch_db:product_margin.view_product_margin_tree
 msgid "Total Margin"
 msgstr ""
 
@@ -369,13 +310,3 @@ msgstr ""
 msgid "Turnover - Standard price"
 msgstr ""
 
-#. module: product_margin
-#: model:ir.model.fields,field_description:product_margin.field_product_product_supplier_taxes_id
-msgid "Vendor Taxes"
-msgstr ""
-
-#. module: product_margin
-#: model:ir.model.fields,help:product_margin.field_product_product_email_template_id
-msgid "When validating an invoice, an email will be sent to the customer based on this template. The customer will receive an email for each product linked to an email template."
-msgstr ""
-
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 5da76b71711..175b79d24cd 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -121,16 +121,6 @@ msgid "\n"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_report_project_task_user_opening_days
-msgid "# Days to Assign"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_report_project_task_user_closing_days
-msgid "# Days to Close"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_delay_endings_days
 msgid "# Days to Deadline"
 msgstr ""
@@ -142,8 +132,13 @@ msgid "# Tasks"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_report_project_task_user_no_of_days
-msgid "# Working Days"
+#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_open
+msgid "# Working Days to Assign"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_close
+msgid "# Working Days to Close"
 msgstr ""
 
 #. module: project
@@ -153,7 +148,7 @@ msgstr ""
 
 #. module: project
 #: code:addons/project/models/project.py:244
-#: code:addons/project/models/project.py:436
+#: code:addons/project/models/project.py:533
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -170,7 +165,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "1. Learn about Tasks, Issues and Timesheets."
+msgid "1. Learn about Tasks and Timesheets."
 msgstr ""
 
 #. module: project
@@ -219,7 +214,7 @@ msgid "<i class=\"fa fa-user\"/> Person Responsible"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:124
+#: code:addons/project/models/project.py:116
 #, python-format
 msgid "<p class=\"oe_view_nocontent_create\">\n"
 "                        Documents are attached to the tasks and issues of your project.</p><p>\n"
@@ -229,17 +224,12 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:152
+#: code:addons/project/models/project.py:144
 #, python-format
 msgid "<p class=\"oe_view_nocontent_create\">Click to create a new project.</p>"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.edit_project
-msgid "<span attrs=\"{'invisible':[('use_tasks', '=', False)]}\">as </span>"
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<span class=\"fa fa-arrow-circle-o-down\"/> Install now"
 msgstr ""
@@ -331,7 +321,7 @@ msgstr ""
 msgid "<span class=\"panel-title\">\n"
 "                                            <span class=\"fa fa-thumb-tack\"/>\n"
 "                                            <strong> Exercise 2</strong><br/>\n"
-"                                            <span class=\"small\">Delay to close an Issue</span>\n"
+"                                            <span class=\"small\">Delay to close an Task</span>\n"
 "                                        </span>"
 msgstr ""
 
@@ -352,14 +342,6 @@ msgid "<span class=\"panel-title\">\n"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "<span class=\"panel-title\">\n"
-"                                        <span class=\"fa fa-exclamation-circle\"/>\n"
-"                                        <strong> Issues</strong>\n"
-"                                    </span>"
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form
 msgid "<span class=\"text-muted\">NB: This will archive the selected tasks (Except the destination task)</span>"
 msgstr ""
@@ -391,8 +373,8 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong> New business issues (5 min)</strong>\n"
-"                                You may have learned something during the week that affects the project.  Share the news early in the meeting to help team members consider the  issue as you walk through the project status session. Not every  issue warrants spending time here, so keep discussions to a minimum."
+msgid "<strong> New business tasks (5 min)</strong>\n"
+"                                You may have learned something during the week that affects the project.  Share the news early in the meeting to help team members consider the  task as you walk through the project status session. Not every task warrants spending time here, so keep discussions to a minimum."
 msgstr ""
 
 #. module: project
@@ -409,7 +391,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong> Q&amp;A and discussion time (10 min)</strong>\n"
-"                                Always give your team time to ask questions on issues that were not discussed. This gives you another opportunity to reinforce key points that you've picked up during the week or discovered during the meeting."
+"                                Always give your team time to ask questions on tasks that were not discussed. This gives you another opportunity to reinforce key points that you've picked up during the week or discovered during the meeting."
 msgstr ""
 
 #. module: project
@@ -427,12 +409,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>A great feature in Odoo is the integration of a Collaborative Notepad called Etherpad.</strong><br/>\n"
-"                            It replaces the standard Description area in Tasks and Issues and is extremely useful for several cases."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>A problem or request from a customer</strong> that needs to be identified, solved and followed up asap."
+"                            It replaces the standard Description area in Tasks and is extremely useful for several cases."
 msgstr ""
 
 #. module: project
@@ -443,7 +420,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Add a Deadline</strong><br/>\n"
-"                                    The deadline will help you determine if a task or issue is progressing as expected  and to anticipate its next update."
+"                                    The deadline will help you determine if a task is progressing as expected  and to anticipate its next update."
 msgstr ""
 
 #. module: project
@@ -458,13 +435,13 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>Approve your Timesheets</strong> (every week)"
+msgid "<strong>Ask participants to prepare</strong><br/>\n"
+"                                To run an effective meeting, prepare participants beforehand. Inform them of how they are expected to contribute."
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>Ask participants to prepare</strong><br/>\n"
-"                                To run an effective meeting, prepare participants beforehand. Inform them of how they are expected to contribute."
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Assigned to</strong>"
 msgstr ""
 
 #. module: project
@@ -496,8 +473,23 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>Create tasks and issues by email</strong><br/>\n"
-"                                In Odoo, every project has an email alias. If you send an email to this alias, it will automatically create a task or issue in the first stage of the project, with all the email recipients as its default followers."
+msgid "<strong>Create tasks by email</strong><br/>\n"
+"                                In Odoo, every project has an email alias. If you send an email to this alias, it will automatically create a task in the first stage of the project, with all the email recipients as its default followers."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_project
+msgid "<strong>Customer</strong>"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Deadline:</strong>"
 msgstr ""
 
 #. module: project
@@ -507,6 +499,11 @@ msgid "<strong>Define a Naming Convention</strong><br/>\n"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Description</strong>"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Enter your activities</strong> (every day)"
 msgstr ""
@@ -518,7 +515,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>Exercise:</strong> Try to create a graph with the monthly evolution of the 'Average delay to close'  of Issues."
+msgid "<strong>Exercise:</strong> Try to create a graph with the monthly evolution of the 'Average delay to close'  of Tasks."
 msgstr ""
 
 #. module: project
@@ -529,18 +526,13 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Follow every meeting with a recap email</strong>\n"
-"                                    As soon as the meeting is over, publish meeting minutes and distribute them along with the updated project schedule, issues/action item matrix, and  any other appropriate documents. Try to use the same template throughout meetings and improve it continuously."
+"                                    As soon as the meeting is over, publish meeting minutes and distribute them along with the updated project schedule, task/action item matrix, and  any other appropriate documents. Try to use the same template throughout meetings and improve it continuously."
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Follow only what you need</strong><br/>\n"
-"                                    The simplest way to use notifications is to follow a whole project: you will receive notifications for all the new and existing tasks or issues of a project."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "<strong>For issues:</strong>"
+"                                    The simplest way to use notifications is to follow a whole project: you will receive notifications for all the new and existing tasks of a project."
 msgstr ""
 
 #. module: project
@@ -585,6 +577,12 @@ msgid "<strong>Invoicing your customers</strong> on Time &amp; Material projects
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Message and communication history</strong>"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Need help to structure your projects?</strong><br/>"
 msgstr ""
@@ -611,6 +609,16 @@ msgid "<strong>Prepare yourself as well</strong><br/>\n"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_project
+msgid "<strong>Project Manager</strong>"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Project:</strong>"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Recommended actions:</strong>"
 msgstr ""
@@ -618,13 +626,18 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Rely on the chatter</strong><br/>\n"
-"                                    Below every Task and Issue (or more generally, below every Document in Odoo) is an area called Chatter."
+"                                    Below every Task (or more generally, below every Document in Odoo) is an area called Chatter."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "<strong>Reported by</strong>"
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Set Priorities</strong><br/>\n"
-"                                    The <i class=\"fa fa-star\"/> is used to indicate priority: in Kanban views, high priority Tasks or Issues will be displayed on top. This is particulary useful if you use a Scrum methodology to indicate the tasks for the week. Similarly to Status, you can change the meaning of the Star indicator from the Project Stages tab."
+"                                    The <i class=\"fa fa-star\"/> is used to indicate priority: in Kanban views, high priority Tasks will be displayed on top. This is particulary useful if you use a Scrum methodology to indicate the tasks for the week. Similarly to Status, you can change the meaning of the Star indicator from the Project Stages tab."
 msgstr ""
 
 #. module: project
@@ -656,13 +669,13 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Use Status Indicator</strong><br/>\n"
-"                                    The Status indicator helps you manage Tasks and Issues by giving them one of 3 different colour: Grey, Green or Red. The meaning of these Statuses can be freely configured, for example:"
+"                                    The Status indicator helps you manage Tasks by giving them one of 3 different colour: Grey, Green or Red. The meaning of these Statuses can be freely configured, for example:"
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "<strong>Use Tags</strong><br/>\n"
-"                                    Tags  are complementary to your project stages: they can work as a second  level categorization which is very useful if you have a lot of Tasks or Issues to manage. Also, it becomes very easy to find Tasks or Issues by typing  the Tag into the main Search bar."
+"                                    Tags  are complementary to your project stages: they can work as a second  level categorization which is very useful if you have a lot of Tasks to manage. Also, it becomes very easy to find Tasks by typing  the Tag into the main Search bar."
 msgstr ""
 
 #. module: project
@@ -700,11 +713,6 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "A customer sends a complaint to support@yourcompany.com: an Issue is automatically created into a 'Support level 1' project based on the original email from the customer."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
 msgid "A project usually involves many stakeholders, be it the project's sponsor, resources, customers or external contractors. But the most important person in a project is usually the Project Manager.<br/>\n"
 "                    In Odoo, the Project Managers have the responsibility of managing the Kanban view: they ensure smooth progression of the projects, minimal downtime between stages and optimal work distribution between resources."
 msgstr ""
@@ -764,11 +772,6 @@ msgid "Add columns to configure <b>stages for your tasks</b>.<br/><i>e.g. Specif
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.view_project_kanban
-msgid "Add/remove from favorite"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:56
 #, python-format
@@ -791,11 +794,6 @@ msgid "Alias Contact Security"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_alias_model
-msgid "Alias Model"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_alias_name
 msgid "Alias Name"
 msgstr ""
@@ -811,6 +809,12 @@ msgid "Aliased Model"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:89
+#, python-format
+msgid "All"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Also, lead by example. When your team members see how prepared you are it will  reinforce the need for each of them to be prepared for status meetings."
 msgstr ""
@@ -838,12 +842,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Another good way to limit the number of notifications you receive is to only follow your Project's 'Task Assigned' events.  Then you'll be notified when a Task or Issue is created, and can  manually decide if you want to be notified for its other events too."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Apple App Store"
+msgid "Another good way to limit the number of notifications you receive is to only follow your Project's 'Task Assigned' events.  Then you'll be notified when a Task is created, and can  manually decide if you want to be notified for its other events too."
 msgstr ""
 
 #. module: project
@@ -853,6 +852,11 @@ msgid "Archived"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Assign to Me"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_date_start
 msgid "Assignation Date"
 msgstr ""
@@ -893,28 +897,20 @@ msgid "At each stage employees can block or make task/issue ready for next stage
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "At the end of the week, each employee should review\n"
-"                            their entries for the week and makes sure the\n"
-"                            entries are correctly encoded. This can be done\n"
-"                            from the"
-msgstr ""
-
-#. module: project
-#: code:addons/project/models/project.py:117
-#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
-#, python-format
-msgid "Attachments"
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "Attachment"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_timesheet_attendance
-msgid "Attendances"
+#: model:ir.model.fields,help:project.field_project_task_attachment_ids
+msgid "Attachment that don't come from message."
 msgstr ""
 
 #. module: project
-#: selection:project.config.settings,generate_project_alias:0
-msgid "Automatically generate an email alias at the project creation"
+#: code:addons/project/models/project.py:109
+#: model:ir.ui.view,arch_db:project.portal_my_task
+#, python-format
+msgid "Attachments"
 msgstr ""
 
 #. module: project
@@ -923,11 +919,6 @@ msgid "Available on the Apple Store"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_timesheet_synchro
-msgid "Awesome Timesheet"
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Back at the office, the manager splits the customer's requests into several tasks and delegates them to several employees."
 msgstr ""
@@ -962,11 +953,6 @@ msgid "Be aware of the team’s productivity and time: try to keep meetings to o
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Billing"
-msgstr ""
-
-#. module: project
 #: model:project.task,legend_blocked:project.project_task_data_0
 #: model:project.task,legend_blocked:project.project_task_data_1
 #: model:project.task,legend_blocked:project.project_task_data_11
@@ -1000,7 +986,6 @@ msgid "By Responsible"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
 #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form
 msgid "Cancel"
 msgstr ""
@@ -1020,12 +1005,6 @@ msgid "Change their Stages in the Project Stages tab"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_account_analytic_account_use_tasks
-#: model:ir.model.fields,help:project.field_project_project_use_tasks
-msgid "Check this box to manage internal activities through this project"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/tour.js:23
 #, python-format
@@ -1038,6 +1017,12 @@ msgid "Choose a Project Email"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,help:project.field_project_project_subtask_project_id
+#: model:ir.model.fields,help:project.field_project_task_subtask_project_id
+msgid "Choosing a sub-tasks project will both enable sub-tasks and set their default project (possibly the project itself)"
+msgstr ""
+
+#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:55
 #, python-format
@@ -1081,11 +1066,6 @@ msgid "Click to create a new project.<br>"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_pad
-msgid "Collaborative Pads"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_color
 #: model:ir.model.fields,field_description:project.field_project_tags_color
 #: model:ir.model.fields,field_description:project.field_project_task_color
@@ -1103,7 +1083,6 @@ msgid "Companies"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_company_id
 #: model:ir.model.fields,field_description:project.field_project_project_company_id
 #: model:ir.model.fields,field_description:project.field_project_task_company_id
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_company_id
@@ -1154,6 +1133,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_partner
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_partner_id
+#: model:ir.ui.view,arch_db:project.project_view_kanban
 #: model:ir.ui.view,arch_db:project.view_project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
 msgid "Contact"
@@ -1187,6 +1167,11 @@ msgid "Create"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
+msgid "Create & Edit"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_create_date
 msgid "Create Date"
 msgstr ""
@@ -1232,7 +1217,6 @@ msgid "Create the Projects"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_create_uid
 #: model:ir.model.fields,field_description:project.field_project_project_create_uid
 #: model:ir.model.fields,field_description:project.field_project_tags_create_uid
 #: model:ir.model.fields,field_description:project.field_project_task_create_uid
@@ -1242,7 +1226,6 @@ msgid "Created by"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_create_date
 #: model:ir.model.fields,field_description:project.field_project_project_create_date
 #: model:ir.model.fields,field_description:project.field_project_tags_create_date
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_create_date
@@ -1252,7 +1235,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Creating Tasks and/or Issues is the next step in managing your Projects.<br/>\n"
+msgid "Creating Tasks is the next step in managing your Projects.<br/>\n"
 "                        In Odoo, it is pretty straightforward, but here are some explanations you may find useful."
 msgstr ""
 
@@ -1282,12 +1265,22 @@ msgid "Current Timesheet"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
+msgid "Current stage of the task"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "Current stage of this task"
+msgstr ""
+
+#. module: project
 #: model:ir.actions.act_window,help:project.project_task_action_activity
 msgid "Currently there are not any activity scheduled."
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:666
+#: code:addons/project/models/project.py:818
 #: model:ir.model.fields,field_description:project.field_project_project_partner_id
 #: model:ir.model.fields,field_description:project.field_project_task_partner_id
 #: model:ir.ui.view,arch_db:project.edit_project
@@ -1296,17 +1289,12 @@ msgid "Customer"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:666
+#: code:addons/project/models/project.py:818
 #, python-format
 msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Customer Satisfaction"
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Customer Service"
 msgstr ""
@@ -1355,6 +1343,11 @@ msgid "Dashboard"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Days"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_date_deadline
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_date_deadline
 msgid "Deadline"
@@ -1385,7 +1378,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Depending on what you need and how you want to operate, there are several ways to work with Odoo. First, decide if you want to think in terms of tasks or issues. Then, activate the Timesheets app if you need it."
+msgid "Depending on what you need and how you want to operate, there are several ways to work with Odoo. First, decide if you want to think in terms of tasks. Then, activate the Timesheets app if you need it."
 msgstr ""
 
 #. module: project
@@ -1428,7 +1421,6 @@ msgid "Discard"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_display_name
 #: model:ir.model.fields,field_description:project.field_project_project_display_name
 #: model:ir.model.fields,field_description:project.field_project_tags_display_name
 #: model:ir.model.fields,field_description:project.field_project_task_display_name
@@ -1453,11 +1445,6 @@ msgid "Distribution is completed"
 msgstr ""
 
 #. module: project
-#: selection:project.config.settings,generate_project_alias:0
-msgid "Do not create an email alias automatically"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:51
 #, python-format
@@ -1510,11 +1497,17 @@ msgid "Each employee will have his own task, while the manager will be able to f
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Edit Task"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_email_from
+msgid "Email"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.edit_project
 msgid "Email Alias"
 msgstr ""
@@ -1541,12 +1534,6 @@ msgid "Ending Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:444
-#, python-format
-msgid "Error ! Task starting date must be lower than its ending date."
-msgstr ""
-
-#. module: project
 #: sql_constraint:project.project:0
 msgid "Error! project start-date must be lower than project end-date."
 msgstr ""
@@ -1574,11 +1561,6 @@ msgid "Examples"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_expense
-msgid "Expenses"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:75
 #, python-format
@@ -1646,7 +1628,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "For example, risk and issue owners should come prepared to share the status of their item and, ideally, a path to resolution."
+msgid "For example, risk and task owners should come prepared to share the status of their item and, ideally, a path to resolution."
 msgstr ""
 
 #. module: project
@@ -1661,11 +1643,16 @@ msgid "For the same reason, don't create a Project based on weeks or time (examp
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_forecast
+#: model:ir.model.fields,field_description:project.field_res_config_settings_module_project_forecast
 msgid "Forecasts"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.view_task_search_form
+msgid "Future Activities"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
 msgid "GTD"
 msgstr ""
@@ -1718,16 +1705,6 @@ msgid "Good luck!"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Google Chrome Store"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Google Play Store"
-msgstr ""
-
-#. module: project
 #: selection:project.task,kanban_state:0
 msgid "Green"
 msgstr ""
@@ -1775,6 +1752,11 @@ msgid "Here, you can create new tasks"
 msgstr ""
 
 #. module: project
+#: selection:report.project.task.user,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,help:project.field_project_project_privacy_visibility
 msgid "Holds visibility of the tasks or issues that belong to the current project:\n"
 "- On invitation only: Employees may only see the followed project, tasks or issues\n"
@@ -1786,13 +1768,17 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:593
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Hours"
+msgstr ""
+
+#. module: project
+#: code:addons/project/models/project.py:730
 #, python-format
 msgid "I take it"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_id
 #: model:ir.model.fields,field_description:project.field_project_project_id
 #: model:ir.model.fields,field_description:project.field_project_tags_id
 #: model:ir.model.fields,field_description:project.field_project_task_id
@@ -1860,7 +1846,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "If you work on a Time &amp; Material project, you'll probably want to extract a Timesheet of the tasks and issues to invoice directly to the customer. To do that:"
+msgid "If you work on a Time &amp; Material project, you'll probably want to extract a Timesheet of the tasks to invoice directly to the customer. To do that:"
 msgstr ""
 
 #. module: project
@@ -1916,11 +1902,6 @@ msgid "Incoming"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.edit_project
-msgid "Incoming Emails create"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_planned_hours
 msgid "Initially Planned Hours"
 msgstr ""
@@ -1936,21 +1917,6 @@ msgid "Internal notes are messages that will appear in the Chatter but will not
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Issue Management"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_issue
-msgid "Issue Tracking"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Issue Tracking app."
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_tags_search_view
 msgid "Issue Version"
 msgstr ""
@@ -1971,23 +1937,13 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Issues"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Issues analysis"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
 msgid "It is better to start with a \"project answer\", such as: \"We are two weeks late\", \"We are at planned budget\" or \"We are 50% complete with the process model\". Also if you can, start the meeting on a positive note, such as milestones that have been met or are ahead of schedule. This will make participants feel motivated to engage in the conversation."
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "It is time to think about how you will transform your activities into real projects in Odoo.<br/>\n"
-"                        For that, the most important part is defining the stages of your projects. Stages are the different steps a task or an issue can go through, from its creation to its ending. They will appear in what we call the 'Kanban' view of your projects."
+"                        For that, the most important part is defining the stages of your projects. Stages are the different steps a task can go through, from its creation to its ending. They will appear in what we call the 'Kanban' view of your projects."
 msgstr ""
 
 #. module: project
@@ -2003,7 +1959,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "It's usually a good idea to take time to analyze your tasks and issues once a year. Here are some KPIs you should take a look at. Ask yourself 'How can they be improved?'"
+msgid "It's usually a good idea to take time to analyze your tasks once a year. Here are some KPIs you should take a look at. Ask yourself 'How can they be improved?'"
 msgstr ""
 
 #. module: project
@@ -2028,6 +1984,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_kanban_state
+#: model:ir.model.fields,field_description:project.field_project_task_kanban_state_label
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_state
 msgid "Kanban State"
 msgstr ""
@@ -2053,7 +2010,6 @@ msgid "Last Message"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings___last_update
 #: model:ir.model.fields,field_description:project.field_project_project___last_update
 #: model:ir.model.fields,field_description:project.field_project_tags___last_update
 #: model:ir.model.fields,field_description:project.field_project_task___last_update
@@ -2064,13 +2020,14 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:86
 #: model:ir.model.fields,field_description:project.field_project_task_date_last_stage_update
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_date_last_stage_update
+#, python-format
 msgid "Last Stage Update"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_write_uid
 #: model:ir.model.fields,field_description:project.field_project_project_write_uid
 #: model:ir.model.fields,field_description:project.field_project_tags_write_uid
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_write_uid
@@ -2080,7 +2037,6 @@ msgid "Last Updated by"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_write_date
 #: model:ir.model.fields,field_description:project.field_project_project_write_date
 #: model:ir.model.fields,field_description:project.field_project_tags_write_date
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_write_date
@@ -2089,13 +2045,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: project
-#: model:web.planner,tooltip_planner:project.planner_project
-msgid "Learn how to better organize your company using Projects, Tasks, Issues and Timesheets."
+#: model:ir.ui.view,arch_db:project.view_task_search_form
+msgid "Late Activities"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_holidays
-msgid "Leave Management"
+#: model:web.planner,tooltip_planner:project.planner_project
+msgid "Learn how to better organize your company using Projects, Tasks and Timesheets."
 msgstr ""
 
 #. module: project
@@ -2106,8 +2062,8 @@ msgid "Let's create your first project."
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Lets the company customize which Pad installation should be used to link to new pads (for example: http://ietherpad.com/)."
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
+msgid "Lets the company customize which Pad installation should be used to link to new pads (for example: http://etherpad.com/)."
 msgstr ""
 
 #. module: project
@@ -2121,7 +2077,18 @@ msgid "List, plan and track things to do"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
+msgid "Main Attachments"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Manage your resources with Gantt charts"
 msgstr ""
 
@@ -2193,7 +2160,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_action_activity
-msgid "My Next Task Activities"
+msgid "My Next Activities"
 msgstr ""
 
 #. module: project
@@ -2202,11 +2169,19 @@ msgid "My Tasks"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:31
 #: model:ir.model.fields,field_description:project.field_project_tags_name
+#: model:ir.ui.view,arch_db:project.portal_my_projects
+#, python-format
 msgid "Name"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.edit_project
+msgid "Name of the tasks :"
+msgstr ""
+
+#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:65
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -2228,19 +2203,28 @@ msgid "New task name"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:30
+#: code:addons/project/controllers/portal.py:83
+#, python-format
+msgid "Newest"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.project_task_menu_activity
 #: model:ir.ui.view,arch_db:project.project_task_view_tree_activity
 msgid "Next Activities"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.project_task_menu_activity
-msgid "Next Task Activities"
+#: code:addons/project/models/project.py:775
+#, python-format
+msgid "No Subject"
 msgstr ""
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
-msgid "Non Starred"
+msgid "Normal"
 msgstr ""
 
 #. module: project
@@ -2261,13 +2245,13 @@ msgid "Now that the project is set up, <b>create a few tasks</b>."
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_report_project_task_user_opening_days
-msgid "Number of Days to Open the task"
+#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_open
+msgid "Number of Working Days to Open the task"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_report_project_task_user_closing_days
-msgid "Number of Days to close the task"
+#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_close
+msgid "Number of Working Days to close the task"
 msgstr ""
 
 #. module: project
@@ -2283,28 +2267,18 @@ msgid "Odoo Project is a super fast and easy way to make your activities and tas
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_project_config_settings_generate_project_alias
-msgid "Odoo will generate an email alias at the project creation from project name."
-msgstr ""
-
-#. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
 msgid "Odoo's project management allows you to manage the pipeline of your tasks efficiently. You can track progress, discuss on tasks, attach documents, etc."
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:207
+#: code:addons/project/models/project.py:200
 #: selection:project.project,privacy_visibility:0
 #, python-format
 msgid "On invitation only"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,help:project.field_project_project_alias_force_thread_id
 msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
 msgstr ""
@@ -2316,11 +2290,6 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Or, if you are using Issues, by activating 'Activate timesheets on issues', also in the"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
 msgid "Organize meetings"
 msgstr ""
 
@@ -2335,11 +2304,6 @@ msgid "Organize your company, from personal tasks to collaborative meeting minut
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.view_task_search_form
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
 msgstr ""
@@ -2378,6 +2342,14 @@ msgid "Parent Record Thread ID"
 msgstr ""
 
 #. module: project
+#: code:addons/project/models/project.py:861
+#: model:ir.model.fields,field_description:project.field_project_task_parent_id
+#: model:ir.ui.view,arch_db:project.view_task_form2
+#, python-format
+msgid "Parent Task"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,help:project.field_project_project_alias_parent_model_id
 msgid "Parent model holding the alias. The model holding the alias reference is not necessarily the model given by alias_model_id (example: project (parent_model) and task (model))"
 msgstr ""
@@ -2393,7 +2365,7 @@ msgid "Planner"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:746
+#: code:addons/project/models/project.py:925
 #, python-format
 msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
 msgstr ""
@@ -2413,6 +2385,12 @@ msgid "Prepare"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_priority
+#: model:ir.model.fields,field_description:project.field_report_project_task_user_priority
+msgid "Priority"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_privacy_visibility
 msgid "Privacy"
 msgstr ""
@@ -2423,6 +2401,7 @@ msgid "Product or software version"
 msgstr ""
 
 #. module: project
+#: code:addons/project/models/project.py:346
 #: model:ir.model,name:project.model_project_project
 #: model:ir.model.fields,field_description:project.field_project_task_project_id
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_project_id
@@ -2432,12 +2411,13 @@ msgstr ""
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 #: model:res.request.link,name:project.req_link_project
+#, python-format
 msgid "Project"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_generate_project_alias
-msgid "Project Alias"
+#: model:ir.ui.view,arch_db:project.portal_my_project
+msgid "Project -"
 msgstr ""
 
 #. module: project
@@ -2450,6 +2430,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_project_project_user_id
 #: model:ir.model.fields,field_description:project.field_project_task_manager_id
 #: model:ir.ui.view,arch_db:project.edit_project
+#: model:ir.ui.view,arch_db:project.project_view_kanban
 #: model:ir.ui.view,arch_db:project.view_project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
 msgid "Project Manager"
@@ -2458,6 +2439,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.edit_project
 #: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
+#: model:ir.ui.view,arch_db:project.project_view_kanban
 #: model:ir.ui.view,arch_db:project.view_project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
 msgid "Project Name"
@@ -2480,6 +2462,12 @@ msgid "Project Tasks"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
+#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
 msgstr ""
@@ -2502,12 +2490,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_project_task_type_project_ids
 #: model:ir.ui.menu,name:project.menu_projects_config
 #: model:ir.ui.view,arch_db:project.analytic_account_inherited_form
+#: model:ir.ui.view,arch_db:project.portal_layout
+#: model:ir.ui.view,arch_db:project.portal_my_home
+#: model:ir.ui.view,arch_db:project.portal_my_projects
 #: model:ir.ui.view,arch_db:project.view_project
 msgid "Projects"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_rating_project
+#: model:ir.model.fields,field_description:project.field_res_config_settings_module_rating_project
 msgid "Rating on Tasks"
 msgstr ""
 
@@ -2578,8 +2569,8 @@ msgid "Record Thread ID"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Record time with mobile Timesheet app"
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Record's Colour"
 msgstr ""
 
 #. module: project
@@ -2603,11 +2594,6 @@ msgid "Reference"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Reimburse employee expenses and invoice customers"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:52
 #, python-format
@@ -2674,16 +2660,6 @@ msgid "Runs outside Odoo, always available"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Scrum Methodology"
 msgstr ""
@@ -2694,20 +2670,45 @@ msgid "Search"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:92
+#, python-format
+msgid "Search <span class=\"nolabel\"> (in Content)</span>"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
 msgid "Search Project"
 msgstr ""
 
 #. module: project
-#. openerp-web
-#: code:addons/project/static/src/js/project.js:62
+#: code:addons/project/controllers/portal.py:96
 #, python-format
-msgid "Select"
+msgid "Search in All"
+msgstr ""
+
+#. module: project
+#: code:addons/project/controllers/portal.py:94
+#, python-format
+msgid "Search in Customer"
+msgstr ""
+
+#. module: project
+#: code:addons/project/controllers/portal.py:93
+#, python-format
+msgid "Search in Messages"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Sell services and invoice time spent"
+#: code:addons/project/controllers/portal.py:95
+#, python-format
+msgid "Search in Stages"
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/project.js:62
+#, python-format
+msgid "Select"
 msgstr ""
 
 #. module: project
@@ -2717,7 +2718,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Send an automatic confirmation to all issue emails sent to your customer support"
+msgid "Send an automatic confirmation to all emails sent to your customer support"
 msgstr ""
 
 #. module: project
@@ -2773,7 +2774,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "So if you're looking for the history of a Task, or the latest message on an Issue, simply go to the corresponding Document and you'll find it!"
+msgid "So if you're looking for the history of a Task, or the latest message on a Task, simply go to the corresponding Document and you'll find it!"
 msgstr ""
 
 #. module: project
@@ -2803,6 +2804,11 @@ msgid "Specification of task is written"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
+msgid "Split your tasks to organize your work into sub-milestones"
+msgstr ""
+
+#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:49
 #, python-format
@@ -2810,10 +2816,13 @@ msgid "Sprint"
 msgstr ""
 
 #. module: project
+#: code:addons/project/controllers/portal.py:85
 #: model:ir.model.fields,field_description:project.field_project_task_stage_id
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_stage_id
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
 #: model:ir.ui.view,arch_db:project.view_task_search_form
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -2844,11 +2853,7 @@ msgid "Stages"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_priority
-#: model:ir.model.fields,field_description:project.field_report_project_task_user_priority
 #: model:ir.ui.view,arch_db:project.view_task_search_form
-#: selection:project.task,priority:0
-#: selection:report.project.task.user,priority:0
 msgid "Starred"
 msgstr ""
 
@@ -2873,6 +2878,25 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_project_project_subtask_project_id
+#: model:ir.model.fields,field_description:project.field_project_task_subtask_project_id
+msgid "Sub-task Project"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_subtask_count
+msgid "Sub-task count"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.project_task_action_sub_task
+#: model:ir.model.fields,field_description:project.field_project_task_child_ids
+#: model:ir.model.fields,field_description:project.field_res_config_settings_group_subtask_project
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Sub-tasks"
+msgstr ""
+
+#. module: project
 #: sql_constraint:project.tags:0
 msgid "Tag name already exists !"
 msgstr ""
@@ -2888,7 +2912,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_project_tags
-msgid "Tags of project's tasks, issues..."
+msgid "Tags of project's tasks"
 msgstr ""
 
 #. module: project
@@ -2898,6 +2922,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
 #: model:ir.ui.view,arch_db:project.view_task_form2
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
 #: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -2905,6 +2930,11 @@ msgid "Task"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_task
+msgid "Task -"
+msgstr ""
+
+#. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_tasks
 msgid "Task Activities"
 msgstr ""
@@ -2916,6 +2946,11 @@ msgid "Task Blocked"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
+msgid "Task Management"
+msgstr ""
+
+#. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Opened"
@@ -3002,6 +3037,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_res_users_task_ids
 #: model:ir.ui.menu,name:project.menu_action_view_task
 #: model:ir.ui.view,arch_db:project.edit_project
+#: model:ir.ui.view,arch_db:project.portal_layout
+#: model:ir.ui.view,arch_db:project.portal_my_home
+#: model:ir.ui.view,arch_db:project.portal_my_projects
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
 #: model:ir.ui.view,arch_db:project.project_planner
 #: model:ir.ui.view,arch_db:project.view_project_kanban
 #: model:ir.ui.view,arch_db:project.view_task_calendar
@@ -3012,11 +3051,6 @@ msgid "Tasks"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Tasks &amp; Issues"
-msgstr ""
-
-#. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree_filtered
 #: model:ir.ui.menu,name:project.menu_project_report_task_analysis
@@ -3053,11 +3087,6 @@ msgid "Tasks to Merge"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Team Collaboration"
-msgstr ""
-
-#. module: project
 #. openerp-web
 #: code:addons/project/static/src/js/web_planner_project.js:50
 #, python-format
@@ -3094,11 +3123,6 @@ msgid "The following tasks have been merged into this one:"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_project_project_alias_model
-msgid "The kind of document created when an email is received on this project's email alias"
-msgstr ""
-
-#. module: project
 #: model:ir.model.fields,help:project.field_project_project_alias_model_id
 msgid "The model (Odoo Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
@@ -3119,6 +3143,16 @@ msgid "The same features as the Chrome extension, but on your mobile phone!"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_projects
+msgid "There are no projects."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
+msgid "There are no tasks."
+msgstr ""
+
+#. module: project
 #. openerp-web
 #: code:addons/project/static/src/xml/project.xml:7
 #, python-format
@@ -3126,12 +3160,23 @@ msgid "There is no available image to be set as cover. Send a message on the tas
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,help:project.field_project_task_email_cc
+msgid "These email addresses will be added to the CC field of all inbound\n"
+"        and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_task_email_from
+msgid "These people will receive email."
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "This is particularly useful to manage help and support: all incoming email  from customers will be transformed into an issue that you'll be able to track easily!"
+msgid "This is particularly useful to manage help and support: all incoming email  from customers will be transformed into a task that you'll be able to track easily!"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "This replaces task's description text field by a collaborative rich text pad. This is advised if tasks involve several people."
 msgstr ""
 
@@ -3172,17 +3217,12 @@ msgid "This will set the unit of measure used in projects and tasks.\n"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_sale_timesheet
-msgid "Time Billing"
-msgstr ""
-
-#. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Time Management"
 msgstr ""
 
@@ -3192,13 +3232,7 @@ msgid "Time Scheduling"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
-#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
-msgid "Timesheet UoM"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_timesheet
+#: model:ir.model.fields,field_description:project.field_res_config_settings_module_hr_timesheet
 msgid "Timesheets"
 msgstr ""
 
@@ -3215,13 +3249,14 @@ msgid "Timesheets can be used for several purposes:"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Timesheets to Approve"
+#: model:ir.model.fields,help:project.field_project_project_resource_calendar_id
+msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
 
 #. module: project
-#: model:ir.model.fields,help:project.field_project_project_resource_calendar_id
-msgid "Timetable working hours to adjust the gantt diagram report"
+#: code:addons/project/controllers/portal.py:84
+#, python-format
+msgid "Title"
 msgstr ""
 
 #. module: project
@@ -3238,11 +3273,6 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "To use Issues, install the"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
 msgid "To use Timesheets, go to your"
 msgstr ""
 
@@ -3257,27 +3287,12 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Track and solve issues from a Kanban view"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Track attendances and compare with timesheets"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Track customer satisfaction on tasks"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Track leaves to optimize your scheduling"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Track time spent on projects and tasks"
 msgstr ""
 
@@ -3294,14 +3309,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.view_task_search_form
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_account_analytic_account_use_tasks
-#: model:ir.model.fields,field_description:project.field_project_project_use_tasks
-msgid "Use Tasks"
+#: model:res.groups,name:project.group_subtask_project
+msgid "Use Subtask Project"
 msgstr ""
 
 #. module: project
@@ -3315,13 +3324,13 @@ msgid "Use Timesheets"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_config_settings_view_form
-msgid "Use collaborative rich text pads in tasks"
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
+msgid "Use collaborative rich text pads on tasks"
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "Use separate meetings to solve big issues or issues that aren’t important for the entire team."
+msgid "Use separate meetings to solve big tasks or tasks that aren’t important for the entire team."
 msgstr ""
 
 #. module: project
@@ -3374,14 +3383,14 @@ msgid "View statistics for the week"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:208
+#: code:addons/project/models/project.py:201
 #: selection:project.project,privacy_visibility:0
 #, python-format
 msgid "Visible by all employees"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:209
+#: code:addons/project/models/project.py:202
 #: selection:project.project,privacy_visibility:0
 #, python-format
 msgid "Visible by following customers"
@@ -3411,6 +3420,11 @@ msgid "Want a better way to <b>manage your projects</b>? <i>It starts here.</i>"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_email_cc
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "We can add fields related to your business on any screen, for example:"
 msgstr ""
@@ -3442,12 +3456,12 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "What is the average number of working hours necessary to close an issue?"
+msgid "What is the average number of working hours necessary to close a task?"
 msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "What is the average time before an issue is assigned / closed?"
+msgid "What is the average time before a task is assigned / closed?"
 msgstr ""
 
 #. module: project
@@ -3462,7 +3476,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "What is their average number of tasks or issues worked on / closed?"
+msgid "What is their average number of tasks worked on / closed?"
 msgstr ""
 
 #. module: project
@@ -3488,6 +3502,36 @@ msgid "Working Time"
 msgstr ""
 
 #. module: project
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Working Time to Assign"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.view_task_form2
+msgid "Working Time to Close"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_working_days_open
+msgid "Working days to assign"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_working_days_close
+msgid "Working days to close"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_working_hours_open
+msgid "Working hours to assign"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_working_hours_close
+msgid "Working hours to close"
+msgstr ""
+
+#. module: project
 #: model:ir.filters,name:project.filter_task_report_workload
 msgid "Workload"
 msgstr ""
@@ -3533,7 +3577,13 @@ msgid "You can save your reports to easily reuse it later"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:70
+#: code:addons/project/models/project.py:547
+#, python-format
+msgid "You can't define a parent task if its project is not correctly configured. The sub-task's project of the parent task's project should be this task's project"
+msgstr ""
+
+#. module: project
+#: code:addons/project/models/project.py:67
 #, python-format
 msgid "You cannot delete a project containing tasks. You can either delete all the project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
@@ -3570,7 +3620,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "and activate:"
+msgid "and activate 'Log work activities on tasks'"
 msgstr ""
 
 #. module: project
@@ -3584,28 +3634,18 @@ msgid "etc.."
 msgstr ""
 
 #. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "for Issues: 'Activate timesheets on issues'"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "for Tasks: 'Log work activities on tasks'"
-msgstr ""
-
-#. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "oe_kanban_text_red"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_config_settings
-msgid "project.config.settings"
+#: model:ir.model,name:project.model_project_task_merge_wizard
+msgid "project.task.merge.wizard"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_merge_wizard
-msgid "project.task.merge.wizard"
+#: model:ir.model,name:project.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: project
@@ -3614,7 +3654,7 @@ msgid "send us an email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/models/project.py:492
+#: code:addons/project/models/project.py:595
 #, python-format
 msgid "tasks"
 msgstr ""
@@ -3641,16 +3681,6 @@ msgstr ""
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
-msgid "view of the Human Resources module."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "view."
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
 msgid "with Timesheet"
 msgstr ""
 
diff --git a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
index 8ed6c814b54..4941f1f9e50 100644
--- a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
+++ b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,12 +31,18 @@ msgid "Companies"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
+#: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
 msgid "Default project value for timesheet generated from leave type."
 msgstr ""
 
 #. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:30
+#, python-format
+msgid "For the leaves to generate timesheet, the internal project and task are requried."
+msgstr ""
+
+#. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
 msgid "Generate Timesheet"
 msgstr ""
@@ -47,10 +53,10 @@ msgid "If checked, when validating a leave, timesheet will be generated in the V
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:33
+#: code:addons/project_timesheet_holidays/models/res_company.py:30
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
 #, python-format
 msgid "Internal Project"
 msgstr ""
@@ -71,8 +77,8 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_task_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_task_id
 msgid "Leave Task"
 msgstr ""
 
@@ -82,18 +88,18 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:43
+#: code:addons/project_timesheet_holidays/models/res_company.py:40
 #, python-format
 msgid "Leaves"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
+#: model:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
 msgid "Project"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
+#: model:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
 msgid "Task"
 msgstr ""
 
@@ -114,7 +120,7 @@ msgid "You cannot delete timesheet lines attached to a leaves. Please cancel the
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_timesheet_config_settings
-msgid "hr.timesheet.config.settings"
+#: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index f5e48770e67..2eedcade4ae 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgid "\n"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/stock.py:89
+#: code:addons/purchase/models/stock.py:79
 #, python-format
 msgid " Buy"
 msgstr ""
@@ -117,6 +117,16 @@ msgid "${object.subject}"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
+msgid "3-way matching"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_module_account_3way_match
+msgid "3-way matching: purchases, receptions and bills"
+msgstr ""
+
+#. module: purchase
 #: model:mail.template,body_html:purchase.mail_template_data_notification_email_purchase_order
 msgid "<html>\n"
 "                <head></head>\n"
@@ -191,6 +201,11 @@ msgid "<html>\n"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgstr ""
+
+#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 msgid "<strong>Amount</strong>"
 msgstr ""
@@ -201,6 +216,11 @@ msgid "<strong>Date Req.</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 #: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
 msgid "<strong>Description</strong>"
@@ -222,18 +242,29 @@ msgid "<strong>Our Order Reference:</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 #: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
 msgid "<strong>Qty</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 #: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
 msgid "<strong>Shipping address:</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 msgid "<strong>Subtotal</strong>"
 msgstr ""
@@ -244,11 +275,17 @@ msgid "<strong>Taxes</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "<strong>Total:</strong>"
+msgstr ""
+
+#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 msgid "<strong>Total</strong>"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
 msgid "<strong>Unit Price</strong>"
 msgstr ""
@@ -264,13 +301,14 @@ msgid "A warning can be set on a product or a customer (Purchase)"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
-msgid "Adapt reordering scheduling with vendor's open days calendar"
+#: model:ir.model.fields,field_description:purchase.field_account_invoice_purchase_id
+msgid "Add Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_account_invoice_purchase_id
-msgid "Add Purchase Order"
+#: code:addons/purchase/controllers/portal.py:53
+#, python-format
+msgid "All"
 msgstr ""
 
 #. module: purchase
@@ -279,16 +317,11 @@ msgid "Allow to edit purchase orders"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.account_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_account
 msgid "Allows you to specify an analytic account on purchase order lines."
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "An administrator can set up default Terms and conditions in your Company settings."
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_account_analytic_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_account_analytic_id
 msgid "Analytic Account"
@@ -305,7 +338,7 @@ msgid "Analytic Tags"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_account_config_settings_group_analytic_account_for_purchases
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_group_analytic_account_for_purchases
 msgid "Analytic accounting for purchases"
 msgstr ""
 
@@ -320,26 +353,11 @@ msgid "Approve Order"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_procurement_ids
-msgid "Associated Procurements"
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,help:purchase.field_account_invoice_line_purchase_id
 msgid "Associated Purchase Order. Filled in automatically when a PO is chosen on the vendor bill."
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Attributes"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_product_variant
-msgid "Attributes & Variants"
-msgstr ""
-
-#. module: purchase
 #: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
 msgid "Average Delivery Time"
 msgstr ""
@@ -350,7 +368,7 @@ msgid "Average Price"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_default_purchase_method
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_default_purchase_method
 msgid "Bill Control"
 msgstr ""
 
@@ -365,12 +383,6 @@ msgid "Billed Qty"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:579
-#, python-format
-msgid "Billed Quantity"
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status
 msgid "Billing Status"
 msgstr ""
@@ -382,7 +394,6 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
-#: selection:purchase.order,invoice_status:0
 msgid "Bills Received"
 msgstr ""
 
@@ -393,8 +404,7 @@ msgid "Blocking Message"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:841
-#: code:addons/purchase/models/stock.py:83
+#: code:addons/purchase/models/stock.py:73
 #: model:stock.location.route,name:purchase.route_warehouse0_buy
 #, python-format
 msgid "Buy"
@@ -406,7 +416,7 @@ msgid "Buy rule"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "By default, vendor prices can be set manually in the product detail form. If your vendors provide you with pricelist files, this option allows you to easily import them into the system from ‘Purchase > Vendor Pricelists’ menu."
 msgstr ""
 
@@ -416,36 +426,31 @@ msgid "Calendar View"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:857
-#, python-format
-msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/models/stock.py:86
+#: code:addons/purchase/models/stock.py:76
 #, python-format
 msgid "Can't find any generic Buy route."
 msgstr ""
 
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/controllers/portal.py:55
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
+#, python-format
 msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:707
+#: code:addons/purchase/models/purchase.py:731
 #, python-format
 msgid "Cannot delete a purchase order line which is in state '%s'."
 msgstr ""
@@ -492,7 +497,6 @@ msgid "Companies"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_company_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_company_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_company_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_company_id
@@ -501,7 +505,7 @@ msgid "Company"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:297
+#: code:addons/purchase/models/purchase.py:313
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -513,7 +517,6 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
 msgid "Configure Purchases"
 msgstr ""
 
@@ -545,27 +548,30 @@ msgstr ""
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_product_product_purchase_method
 #: model:ir.model.fields,field_description:purchase.field_product_template_purchase_method
-msgid "Control Purchase Bills"
+msgid "Control Policy"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_stock_move_created_purchase_line_id
+msgid "Created Purchase Order Line"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_create_uid
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_create_date
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_create_date
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_company_currency_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_currency_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_currency_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_currency_id
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_company_currency_id
 msgid "Currency"
 msgstr ""
 
@@ -590,12 +596,17 @@ msgid "Days to Validate"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Define your terms and conditions ..."
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_picking_type_id
 msgid "Deliver To"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.config.settings,default_purchase_method:0
+#: selection:res.config.settings,default_purchase_method:0
 msgid "Delivered quantities"
 msgstr ""
 
@@ -626,7 +637,6 @@ msgid "Destination Location Type"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_display_name
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_display_name
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_display_name
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_display_name
@@ -644,6 +654,11 @@ msgid "Double validation amount"
 msgstr ""
 
 #. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_move_dest_ids
+msgid "Downstream Moves"
+msgstr ""
+
+#. module: purchase
 #: selection:purchase.report,state:0
 msgid "Draft RFQ"
 msgstr ""
@@ -654,7 +669,7 @@ msgid "Drop Ship Address"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_stock_dropshipping
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_module_stock_dropshipping
 msgid "Dropshipping"
 msgstr ""
 
@@ -669,11 +684,6 @@ msgid "Encoding help. When selected, the associated purchase order lines are add
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Engage successfully with your customers thanks to a perfect integration with the supply chain"
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "Expected Date"
 msgstr ""
@@ -684,7 +694,7 @@ msgid "Extended Filters"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:557
+#: code:addons/purchase/models/purchase.py:577
 #, python-format
 msgid "Extra line with %s "
 msgstr ""
@@ -697,12 +707,17 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: purchase
 #: selection:res.company,po_double_validation:0
 msgid "Get 2 levels of approvals to confirm a purchase order"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Get warnings in orders for products or vendors"
 msgstr ""
 
@@ -724,12 +739,11 @@ msgid "Hide cancelled lines"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "How to import"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_id
@@ -737,12 +751,17 @@ msgid "ID"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
+msgid "If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Import vendor pricelists"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:199
+#: code:addons/purchase/models/purchase.py:206
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -783,12 +802,12 @@ msgid "Invoices and Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Invoicing"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_is_installed_sale
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_is_installed_sale
 msgid "Is Installed Sale"
 msgstr ""
 
@@ -798,7 +817,6 @@ msgid "Is Shipped"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings___last_update
 #: model:ir.model.fields,field_description:purchase.field_purchase_order___last_update
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line___last_update
 #: model:ir.model.fields,field_description:purchase.field_purchase_report___last_update
@@ -806,26 +824,29 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_write_uid
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_write_uid
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_write_date
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_write_date
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_res_company_po_double_validation
 msgid "Levels of Approvals"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_double_validation
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_po_double_validation
 msgid "Levels of Approvals *"
 msgstr ""
 
@@ -835,27 +856,34 @@ msgid "Lock"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_lock_confirmed_po
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_lock_confirmed_po
 msgid "Lock Confirmed Orders"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/controllers/portal.py:56
 #: selection:purchase.order,state:0
+#, python-format
 msgid "Locked"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Logistics"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
+msgid "Make sure you only pay bills for which you received the goods you ordered"
+msgstr ""
+
+#. module: purchase
 #: model:res.groups,name:purchase.group_manage_vendor_price
 msgid "Manage Vendor Price"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Manage your purchase agreements (call for tenders, blanket orders)"
 msgstr ""
 
@@ -865,7 +893,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Managers must approve orders"
 msgstr ""
 
@@ -875,19 +903,14 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_mrp
-msgid "Manufacturing"
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,help:purchase.field_res_company_po_lead
-#: model:ir.model.fields,help:purchase.field_stock_config_settings_po_lead
+#: model:ir.model.fields,help:purchase.field_res_config_settings_po_lead
 msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays."
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_stock_config_settings_default_new_po_lead
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
+#: model:ir.model.fields,help:purchase.field_res_config_settings_use_po_lead
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
 msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays."
 msgstr ""
 
@@ -904,13 +927,18 @@ msgid "Message for Purchase Order Line"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_double_validation_amount
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_po_double_validation_amount
 msgid "Minimum Amount"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_double_validation_amount
+#: model:ir.model,name:purchase.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,help:purchase.field_res_company_po_double_validation_amount
+#: model:ir.model.fields,help:purchase.field_res_config_settings_po_double_validation_amount
 msgid "Minimum amount for which a double validation is required"
 msgstr ""
 
@@ -926,7 +954,7 @@ msgid "Most propositions of purchase orders are created automatically\n"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
 msgid "Move forward expected delivery dates by"
 msgstr ""
 
@@ -936,20 +964,36 @@ msgid "My Activities"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/controllers/portal.py:44
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/controllers/portal.py:43
+#, python-format
+msgid "Newest"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_status:0
+msgid "No Bill to Receive"
+msgstr ""
+
+#. module: purchase
 #: selection:product.template,purchase_line_warn:0
 #: selection:res.partner,purchase_warn:0
 msgid "No Message"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "No longer edit orders once confirmed"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:1018
-#, python-format
-msgid "No vendor associated to product %s. Please set one to fix this procurement."
+#: model:ir.model.fields,help:purchase.field_purchase_order_line_product_image
+msgid "Non-stored related field to allow portal user to see the image of the product he has ordered"
 msgstr ""
 
 #. module: purchase
@@ -980,7 +1024,7 @@ msgid "On received quantities"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_order_approval
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_po_order_approval
 msgid "Order Approval"
 msgstr ""
 
@@ -988,6 +1032,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_date_order
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_date_order
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_date_order
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "Order Date"
 msgstr ""
@@ -1020,34 +1065,22 @@ msgid "Order of Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:576
-#, python-format
-msgid "Ordered Quantity"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.config.settings,default_purchase_method:0
+#: selection:res.config.settings,default_purchase_method:0
 msgid "Ordered quantities"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:814
-#, python-format
-msgid "Ordered quantity decreased!"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_orderpoint_id
+msgid "Orderpoint"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
 msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: purchase
 #: model:mail.template,report_name:purchase.email_template_edi_purchase_done
 msgid "PO_${(object.name or '').replace('/','_')}"
 msgstr ""
@@ -1090,13 +1123,13 @@ msgid "Print RFQ"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_procurement_order
-msgid "Procurement"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_group_id
+msgid "Procurement Group"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_group_id
-msgid "Procurement Group"
+#: model:ir.model,name:purchase.model_procurement_group
+msgid "Procurement Requisition"
 msgstr ""
 
 #. module: purchase
@@ -1126,6 +1159,11 @@ msgid "Product Category"
 msgstr ""
 
 #. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_product_image
+msgid "Product Image"
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_unit_quantity
 msgid "Product Quantity"
 msgstr ""
@@ -1152,7 +1190,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Products"
 msgstr ""
 
@@ -1162,23 +1200,19 @@ msgid "Products Value"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_double_validation
 #: model:ir.model.fields,help:purchase.field_res_company_po_double_validation
+#: model:ir.model.fields,help:purchase.field_res_config_settings_po_double_validation
 msgid "Provide a double validation mechanism for purchases"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_normal_action_puchased
-msgid "Purchasable Products"
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
+#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit
 msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_purchase_requisition
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_module_purchase_requisition
 msgid "Purchase Agreements"
 msgstr ""
 
@@ -1193,23 +1227,29 @@ msgid "Purchase Analysis allows you to easily check and analyse your company pur
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.account_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_account
 msgid "Purchase Analytics"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit
+msgid "Purchase Bills"
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_res_company_po_lead
-#: model:ir.model.fields,field_description:purchase.field_stock_config_settings_po_lead
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_po_lead
 msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.report.xml,name:purchase.action_report_purchase_order
+#: code:addons/purchase/controllers/portal.py:54
+#: model:ir.actions.report,name:purchase.action_report_purchase_order
 #: model:ir.model,name:purchase.model_purchase_order
 #: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_id
-#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_id
 #: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn
 #: model:ir.model.fields,field_description:purchase.field_res_users_purchase_warn
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 #: model:ir.ui.view,arch_db:purchase.purchase_order_graph
 #: model:ir.ui.view,arch_db:purchase.purchase_order_pivot
@@ -1217,6 +1257,7 @@ msgstr ""
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
+#, python-format
 msgid "Purchase Order"
 msgstr ""
 
@@ -1233,7 +1274,6 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_line_id
-#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_line_id
 #: model:ir.model.fields,field_description:purchase.field_product_product_purchase_line_warn
 #: model:ir.model.fields,field_description:purchase.field_product_template_purchase_line_warn
 #: model:ir.model.fields,field_description:purchase.field_stock_move_purchase_line_id
@@ -1254,13 +1294,13 @@ msgid "Purchase Order Modification"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_lock
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_po_lock
 msgid "Purchase Order Modification *"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_lock
 #: model:ir.model.fields,help:purchase.field_res_company_po_lock
+#: model:ir.model.fields,help:purchase.field_res_config_settings_po_lock
 msgid "Purchase Order Modification used when you want to purchase order editable after confirm"
 msgstr ""
 
@@ -1269,21 +1309,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.purchase_order_action_generic
 #: model:ir.model.fields,field_description:purchase.field_stock_picking_purchase_id
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: model:ir.ui.view,arch_db:purchase.portal_my_home_menu_purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_home_purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_graph
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_pivot
-msgid "Purchase Orders Statistics"
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
+msgid "Purchase Orders #"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:709
-#, python-format
-msgid "Purchase order line deleted."
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_graph
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_pivot
+msgid "Purchase Orders Statistics"
 msgstr ""
 
 #. module: purchase
@@ -1309,9 +1351,9 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 #: model:ir.ui.menu,name:purchase.menu_purchase_root
-#: model:ir.ui.view,arch_db:purchase.procurement_order_view_form_inherit_purchase
 #: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_buttons
 #: model:ir.ui.view,arch_db:purchase.view_product_template_purchase_buttons_from
+#: model:ir.ui.view,arch_db:purchase.view_warehouse_orderpoint_purchase_form
 msgid "Purchases"
 msgstr ""
 
@@ -1326,7 +1368,7 @@ msgid "Put an address if you want to deliver directly from the vendor to the cus
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Quantities billed by vendors"
 msgstr ""
 
@@ -1393,12 +1435,6 @@ msgid "Received Qty"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:578
-#, python-format
-msgid "Received Quantity"
-msgstr ""
-
-#. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_open_picking
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_picking_count
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_picking_ids
@@ -1406,11 +1442,6 @@ msgid "Receptions"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_tree
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "Reference"
@@ -1423,7 +1454,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_order_origin
-msgid "Reference of the document that generated this purchase order request (e.g. a sales order or an internal procurement request)"
+msgid "Reference of the document that generated this purchase order request (e.g. a sales order)"
 msgstr ""
 
 #. module: purchase
@@ -1437,7 +1468,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: model:ir.actions.report,name:purchase.report_purchase_quotation
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 #: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
 msgid "Request for Quotation"
@@ -1449,7 +1480,7 @@ msgid "Request for Quotation #"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "Request your vendors to deliver to your customers"
 msgstr ""
 
@@ -1472,22 +1503,12 @@ msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_sale
-msgid "Sales"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Save"
+#: model:ir.model,name:purchase.model_stock_return_picking
+msgid "Return Picking"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
 msgid "Schedule receivings earlier to avoid delays"
 msgstr ""
 
@@ -1498,18 +1519,13 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
-msgid "Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).  By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules."
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "Search Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_stock_config_settings_default_new_po_lead
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_use_po_lead
 msgid "Security Lead Time for Purchase"
 msgstr ""
 
@@ -1522,11 +1538,6 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Sell and purchase products in different units of measure"
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 msgid "Send PO by Email"
 msgstr ""
@@ -1542,7 +1553,7 @@ msgid "Sequence"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.account_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_account
 msgid "Set analytic accounts in purchase orders"
 msgstr ""
 
@@ -1552,11 +1563,6 @@ msgid "Set date to all order lines"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Set product attributes (e.g. color, size) to manage variants"
-msgstr ""
-
-#. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 msgid "Set to Draft"
 msgstr ""
@@ -1600,11 +1606,6 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
-msgid "Streamline your manufacturing operations with an integrated inventory management"
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_price_subtotal
 msgid "Subtotal"
 msgstr ""
@@ -1628,6 +1629,11 @@ msgid "Taxes"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "Taxes:"
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_order_default_location_dest_id_usage
 msgid "Technical field used to display the Drop Ship Address"
 msgstr ""
@@ -1638,9 +1644,8 @@ msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:572
-#, python-format
-msgid "The ordered quantity has been decreased. Do not forget to take it into account on your bills and receipts."
+#: model:ir.model.fields,help:purchase.field_purchase_order_website_url
+msgid "The full URL to access the document through the website."
 msgstr ""
 
 #. module: purchase
@@ -1658,6 +1663,12 @@ msgid "The product form contains detailed information to improve the\n"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/models/purchase.py:643
+#, python-format
+msgid "The quantities on your purchase order indicate less than billed. You should ask for a refund. "
+msgstr ""
+
+#. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
 msgid "The quotation contains the history of the discussion/negotiation\n"
 "                you had with your vendor. Once confirmed, a request for\n"
@@ -1672,6 +1683,12 @@ msgid "The request for quotation is the first step of the purchases flow. Once\n
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/models/purchase.py:872
+#, python-format
+msgid "There is no vendor associated to the product %s. Please define a vendor for this product."
+msgstr ""
+
+#. module: purchase
 #: model:ir.model.fields,help:purchase.field_product_category_property_account_creditor_price_difference_categ
 msgid "This account will be used to value price difference between purchase price and accounting cost."
 msgstr ""
@@ -1683,7 +1700,7 @@ msgid "This account will be used to value price difference between purchase pric
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "This adds a dropshipping route to apply on products in order to request your vendors to deliver to your customers. A product to dropship will generate a purchase request for quotation once the sales order confirmed. This is a on-demand flow. The requested delivery address will be the customer delivery address and not your warehouse."
 msgstr ""
 
@@ -1699,36 +1716,24 @@ msgid "This currency will be used, instead of the default one, for purchases fro
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_default_purchase_method
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
+#: model:ir.model.fields,help:purchase.field_res_config_settings_default_purchase_method
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
 msgid "This default value is applied to any new product created. This can be changed in the product detail form."
 msgstr ""
 
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit
-msgid "This note will be displayed for vendors."
+msgid "This note will show up on purchase orders."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:1035
-#, python-format
-msgid "This purchase order has been created from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/models/purchase.py:1048
-#, python-format
-msgid "This purchase order has been modified from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:200
+#: code:addons/purchase/models/account_invoice.py:203
 #, python-format
 msgid "This vendor bill has been created from: %s"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/account_invoice.py:214
+#: code:addons/purchase/models/account_invoice.py:217
 #, python-format
 msgid "This vendor bill has been modified from: %s"
 msgstr ""
@@ -1756,8 +1761,11 @@ msgid "Today Activities"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/controllers/portal.py:45
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_amount_total
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_price_total
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
+#, python-format
 msgid "Total"
 msgstr ""
 
@@ -1782,13 +1790,13 @@ msgid "Transfer"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:346
+#: code:addons/purchase/models/purchase.py:362
 #, python-format
 msgid "Unable to cancel purchase order %s as some receptions have already been done."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:349
+#: code:addons/purchase/models/purchase.py:365
 #, python-format
 msgid "Unable to cancel this purchase order. You must first cancel related vendor bills."
 msgstr ""
@@ -1804,9 +1812,7 @@ msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_uom
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
-#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
 msgid "Units of Measure"
 msgstr ""
 
@@ -1831,8 +1837,8 @@ msgid "Untaxed Amount"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
-msgid "Upcoming Activities (7 days)"
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
+msgid "Untaxed Amount:"
 msgstr ""
 
 #. module: purchase
@@ -1857,17 +1863,11 @@ msgid "User"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_company_currency_id
+#: model:ir.model.fields,help:purchase.field_res_config_settings_company_currency_id
 msgid "Utility field to express amount currency"
 msgstr ""
 
 #. module: purchase
-#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
-#: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
-msgid "VAT:"
-msgstr ""
-
-#. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_partner_id
 #: model:ir.model.fields,field_description:purchase.field_purchase_report_partner_id
 #: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
@@ -1893,7 +1893,7 @@ msgid "Vendor Bills."
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_manage_vendor_price
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_group_manage_vendor_price
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 msgid "Vendor Pricelists"
 msgstr ""
@@ -1941,8 +1941,8 @@ msgid "Warning"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:253
-#: code:addons/purchase/models/purchase.py:775
+#: code:addons/purchase/models/purchase.py:268
+#: code:addons/purchase/models/purchase.py:802
 #, python-format
 msgid "Warning for %s"
 msgstr ""
@@ -1958,20 +1958,18 @@ msgid "Warning when Purchasing this Product"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_warning_purchase
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings_group_warning_purchase
 msgid "Warnings"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model.fields,help:purchase.field_stock_warehouse_buy_to_resupply
-msgid "When products are bought, they can be delivered to this warehouse"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_website_url
+msgid "Website URL"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:815
-#, python-format
-msgid "You are decreasing the ordered quantity!\n"
-"You must update the quantities on the reception and/or bills."
+#: model:ir.model.fields,help:purchase.field_stock_warehouse_buy_to_resupply
+msgid "When products are bought, they can be delivered to this warehouse"
 msgstr ""
 
 #. module: purchase
@@ -1995,28 +1993,18 @@ msgid "You must define a product for everything you purchase, whether\n"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/models/purchase.py:386
+#: code:addons/purchase/models/purchase.py:395
 #, python-format
 msgid "You must set a Vendor Location for this partner %s"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_account_config_settings
-msgid "account.config.settings"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
 msgid "days"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_purchase_config_settings
-msgid "purchase.config.settings"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_config_settings
-msgid "stock.config.settings"
+#: model:ir.model,name:purchase.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/purchase_mrp/i18n/purchase_mrp.pot b/addons/purchase_mrp/i18n/purchase_mrp.pot
index bb6d7af9541..a4393860494 100644
--- a/addons/purchase_mrp/i18n/purchase_mrp.pot
+++ b/addons/purchase_mrp/i18n/purchase_mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index fdc9d8f1560..9616a14d97c 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -86,14 +86,14 @@ msgid "Agreement Selection Type"
 msgstr ""
 
 #. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_11163
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_10513
 #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_name
 #: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_type_form
 msgid "Agreement Type"
 msgstr ""
 
 #. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_configuration_inherit_purchase_requisition
+#: model:ir.ui.view,arch_db:purchase_requisition.res_config_settings_view_form
 msgid "Agreement Types"
 msgstr ""
 
@@ -114,7 +114,7 @@ msgid "Blanket Order"
 msgstr ""
 
 #. module: purchase_requisition
-#: model:ir.actions.report.xml,name:purchase_requisition.action_report_purchase_requisitions
+#: model:ir.actions.report,name:purchase_requisition.action_report_purchase_requisitions
 #: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
 msgid "Call for Tenders"
 msgstr ""
@@ -130,7 +130,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/models/purchase_requisition.py:76
+#: code:addons/purchase_requisition/models/purchase_requisition.py:82
 #, python-format
 msgid "Cancelled by the agreement associated to this quotation."
 msgstr ""
@@ -211,6 +211,11 @@ msgid "Done"
 msgstr ""
 
 #. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_move_dest_id
+msgid "Downstream Move"
+msgstr ""
+
+#. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
 #: selection:purchase.requisition,state:0
 msgid "Draft"
@@ -280,11 +285,6 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_procurement_order_requisition_id
-msgid "Latest Requisition"
-msgstr ""
-
-#. module: purchase_requisition
 #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_line_copy
 msgid "Lines"
 msgstr ""
@@ -326,13 +326,17 @@ msgid "Ordering Date"
 msgstr ""
 
 #. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
+#: model:ir.model.fields,field_description:purchase_requisition.field_product_product_purchase_requisition
 #: model:ir.model.fields,field_description:purchase_requisition.field_product_template_purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_procurement_id
 msgid "Procurement"
 msgstr ""
 
 #. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_rule
+msgid "Procurement Rule"
+msgstr ""
+
+#. module: purchase_requisition
 #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_product_id
 msgid "Product"
 msgstr ""
@@ -422,12 +426,6 @@ msgid "Purchase Requisition Line"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/models/purchase_requisition.py:315
-#, python-format
-msgid "Purchase Requisition created"
-msgstr ""
-
-#. module: purchase_requisition
 #: model:purchase.requisition.type,name:purchase_requisition.type_multi
 msgid "Purchase Tender"
 msgstr ""
@@ -453,6 +451,11 @@ msgid "RFQs/Orders"
 msgstr ""
 
 #. module: purchase_requisition
+#: model:ir.ui.view,arch_db:purchase_requisition.product_template_form_view_inherit
+msgid "Reordering"
+msgstr ""
+
+#. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_to_so
 msgid "Request for Quotation"
 msgstr ""
@@ -587,13 +590,13 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/models/purchase_requisition.py:82
+#: code:addons/purchase_requisition/models/purchase_requisition.py:88
 #, python-format
 msgid "You cannot confirm call because there is no product line."
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/models/purchase_requisition.py:99
+#: code:addons/purchase_requisition/models/purchase_requisition.py:105
 #, python-format
 msgid "You have to cancel or validate every RfQ before closing the purchase requisition."
 msgstr ""
diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot
index 2361562bcca..dd4c8afa3ea 100644
--- a/addons/rating/i18n/rating.pot
+++ b/addons/rating/i18n/rating.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,11 @@ msgid "<br/>\n"
 msgstr ""
 
 #. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_rating_view_form
+msgid "<span class=\"o_stat_text\">Resource</span>"
+msgstr ""
+
+#. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_access_token
 msgid "Access token to set the rating of the value"
 msgstr ""
@@ -70,7 +75,7 @@ msgstr ""
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_res_id
-msgid "Document ID"
+msgid "Document"
 msgstr ""
 
 #. module: rating
@@ -79,6 +84,11 @@ msgid "Document Model"
 msgstr ""
 
 #. module: rating
+#: model:ir.model,name:rating.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_consumed
 msgid "Enabled if the rating has been filled."
 msgstr ""
@@ -99,41 +109,12 @@ msgid "Group By"
 msgstr ""
 
 #. module: rating
-#: code:addons/rating/models/rating.py:58
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-#, python-format
+#: selection:rating.rating,rating_text:0
 msgid "Highly dissatisfied"
 msgstr ""
 
 #. module: rating
-#. openerp-web
-#: code:addons/rating/static/src/js/rating_common.js:26
-#, python-format
-msgid "I don't like it"
-msgstr ""
-
-#. module: rating
-#. openerp-web
-#: code:addons/rating/static/src/js/rating_common.js:25
-#, python-format
-msgid "I hate it"
-msgstr ""
-
-#. module: rating
-#. openerp-web
-#: code:addons/rating/static/src/js/rating_common.js:28
-#, python-format
-msgid "I like it"
-msgstr ""
-
-#. module: rating
-#. openerp-web
-#: code:addons/rating/static/src/js/rating_common.js:29
-#, python-format
-msgid "I love it"
-msgstr ""
-
-#. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_id
 #: model:ir.model.fields,field_description:rating.field_rating_rating_id
 msgid "ID"
@@ -150,13 +131,6 @@ msgid "Image"
 msgstr ""
 
 #. module: rating
-#. openerp-web
-#: code:addons/rating/static/src/js/rating_common.js:27
-#, python-format
-msgid "It's okay"
-msgstr ""
-
-#. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_mixin___last_update
 #: model:ir.model.fields,field_description:rating.field_rating_rating___last_update
 msgid "Last Modified on"
@@ -178,6 +152,11 @@ msgid "Linked message"
 msgstr ""
 
 #. module: rating
+#: model:ir.model,name:rating.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_res_model_id
 msgid "Model of the followed resource"
 msgstr ""
@@ -193,15 +172,13 @@ msgid "My Ratings"
 msgstr ""
 
 #. module: rating
-#: code:addons/rating/models/rating.py:60
-#, python-format
-msgid "No rating yet"
+#: selection:rating.rating,rating_text:0
+msgid "No Rating yet"
 msgstr ""
 
 #. module: rating
-#: code:addons/rating/models/rating.py:58
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-#, python-format
+#: selection:rating.rating,rating_text:0
 msgid "Not satisfied"
 msgstr ""
 
@@ -211,6 +188,26 @@ msgid "Owner of the rated resource"
 msgstr ""
 
 #. module: rating
+#: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_id
+msgid "Parent Document"
+msgstr ""
+
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_model
+msgid "Parent Document Model"
+msgstr ""
+
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_name
+msgid "Parent Document Name"
+msgstr ""
+
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_model_id
+msgid "Parent Related Document Model"
+msgstr ""
+
+#. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 msgid "Rated User"
 msgstr ""
@@ -225,7 +222,6 @@ msgstr ""
 #: model:ir.model,name:rating.model_rating_rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_ids
 #: model:ir.model.fields,field_description:rating.field_product_template_rating_ids
-#: model:ir.model.fields,field_description:rating.field_project_issue_rating_ids
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_ids
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_ids
 #: model:ir.model.fields,field_description:rating.field_rating_rating_rating
@@ -245,7 +241,6 @@ msgstr ""
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_feedback
 #: model:ir.model.fields,field_description:rating.field_product_template_rating_last_feedback
-#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_feedback
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_last_feedback
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_feedback
 msgid "Rating Last Feedback"
@@ -254,7 +249,6 @@ msgstr ""
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_image
 #: model:ir.model.fields,field_description:rating.field_product_template_rating_last_image
-#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_image
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_last_image
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_image
 msgid "Rating Last Image"
@@ -263,7 +257,6 @@ msgstr ""
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_value
 #: model:ir.model.fields,field_description:rating.field_product_template_rating_last_value
-#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_value
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_last_value
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_value
 msgid "Rating Last Value"
@@ -275,9 +268,16 @@ msgid "Rating Mixin"
 msgstr ""
 
 #. module: rating
+#: model:ir.model.fields,field_description:rating.field_mail_compose_message_rating_value
+#: model:ir.model.fields,field_description:rating.field_mail_mail_rating_value
+#: model:ir.model.fields,field_description:rating.field_mail_message_rating_value
+#: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message_rating_value
+msgid "Rating Value"
+msgstr ""
+
+#. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_count
 #: model:ir.model.fields,field_description:rating.field_product_template_rating_count
-#: model:ir.model.fields,field_description:rating.field_project_issue_rating_count
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_count
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_count
 msgid "Rating count"
@@ -301,7 +301,6 @@ msgstr ""
 #. module: rating
 #: model:ir.model.fields,help:rating.field_mail_channel_rating_last_feedback
 #: model:ir.model.fields,help:rating.field_product_template_rating_last_feedback
-#: model:ir.model.fields,help:rating.field_project_issue_rating_last_feedback
 #: model:ir.model.fields,help:rating.field_project_task_rating_last_feedback
 #: model:ir.model.fields,help:rating.field_rating_mixin_rating_last_feedback
 #: model:ir.model.fields,help:rating.field_rating_rating_feedback
@@ -314,6 +313,14 @@ msgid "Related Document Model"
 msgstr ""
 
 #. module: rating
+#: model:ir.model.fields,field_description:rating.field_mail_compose_message_rating_ids
+#: model:ir.model.fields,field_description:rating.field_mail_mail_rating_ids
+#: model:ir.model.fields,field_description:rating.field_mail_message_rating_ids
+#: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message_rating_ids
+msgid "Related ratings"
+msgstr ""
+
+#. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 msgid "Resource"
 msgstr ""
@@ -324,9 +331,8 @@ msgid "Resource name"
 msgstr ""
 
 #. module: rating
-#: code:addons/rating/models/rating.py:58
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-#, python-format
+#: selection:rating.rating,rating_text:0
 msgid "Satisfied"
 msgstr ""
 
diff --git a/addons/rating_project/i18n/rating_project.pot b/addons/rating_project/i18n/rating_project.pot
index ff924f67c17..16f4b1bba87 100644
--- a/addons/rating_project/i18n/rating_project.pot
+++ b/addons/rating_project/i18n/rating_project.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -103,6 +103,11 @@ msgid "% On tasks"
 msgstr ""
 
 #. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
+msgid "<i class=\"fa fa-smile-o\"/> No rating yet"
+msgstr ""
+
+#. module: rating_project
 #: model:ir.model.fields,field_description:rating_project.field_project_task_type_auto_validation_kanban_state
 msgid "Automatic kanban status"
 msgstr ""
@@ -116,20 +121,24 @@ msgid "Automatically modify the kanban state when the customer replies to the fe
 msgstr ""
 
 #. module: rating_project
-#: model:ir.actions.act_window,name:rating_project.rating_rating_action_project
-#: model:ir.actions.act_window,name:rating_project.rating_rating_action_task
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_project_report
 #: model:ir.ui.menu,name:rating_project.rating_rating_menu_project
 #: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
 msgid "Customer Ratings"
 msgstr ""
 
 #. module: rating_project
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_task
+msgid "Customer Ratings from task"
+msgstr ""
+
+#. module: rating_project
 #: model:ir.actions.act_window,help:rating_project.rating_rating_action_task
 msgid "Customer ratings on tasks. If you have no rating, change your project Settings to activate it."
 msgstr ""
 
 #. module: rating_project
-#: model:ir.actions.act_window,help:rating_project.rating_rating_action_project
+#: model:ir.actions.act_window,help:rating_project.rating_rating_action_project_report
 msgid "Customer ratings on tasks/issues. If you have no rating, change your project Settings to activate it."
 msgstr ""
 
@@ -174,6 +183,11 @@ msgid "If set and if the project's rating configuration is 'Rating when changing
 msgstr ""
 
 #. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.rating_rating_view_search_project
+msgid "Last 30 days"
+msgstr ""
+
+#. module: rating_project
 #: model:ir.ui.view,arch_db:rating_project.project_task_view_kanban_inherit_rating
 msgid "Latest Rating: Higly Dissatisfied"
 msgstr ""
@@ -194,11 +208,6 @@ msgid "No rating"
 msgstr ""
 
 #. module: rating_project
-#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
-msgid "No rating yet"
-msgstr ""
-
-#. module: rating_project
 #: selection:project.project,rating_status_period:0
 msgid "Once a Month"
 msgstr ""
@@ -215,6 +224,7 @@ msgstr ""
 
 #. module: rating_project
 #: model:ir.model,name:rating_project.model_project_project
+#: model:ir.ui.view,arch_db:rating_project.rating_rating_view_search_project
 msgid "Project"
 msgstr ""
 
@@ -236,6 +246,7 @@ msgid "Rated tasks"
 msgstr ""
 
 #. module: rating_project
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_view_project_rating
 #: model:ir.ui.view,arch_db:rating_project.project_task_view_form_inherit_rating
 msgid "Rating"
 msgstr ""
@@ -256,7 +267,7 @@ msgid "Rating Request Deadline"
 msgstr ""
 
 #. module: rating_project
-#: model:ir.ui.view,arch_db:rating_project.rating_rating_view_search
+#: model:ir.ui.view,arch_db:rating_project.rating_rating_view_search_project
 msgid "Rating for tasks"
 msgstr ""
 
@@ -271,7 +282,18 @@ msgid "Ratings"
 msgstr ""
 
 #. module: rating_project
-#: model:ir.ui.view,arch_db:rating_project.project_config_settings_view_form_inherit_rating_project
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_view_project_rating_task
+msgid "Ratings for tasks"
+msgstr ""
+
+#. module: rating_project
+#: code:addons/rating_project/models/project.py:107
+#, python-format
+msgid "Ratings of %s"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.res_config_settings_view_form
 msgid "Set Email Template to Stages"
 msgstr ""
 
@@ -292,6 +314,16 @@ msgid "Task Stage"
 msgstr ""
 
 #. module: rating_project
+#: model:ir.actions.act_window,help:rating_project.rating_rating_action_view_project_rating_task
+msgid "There is no rating for tasks of this project at the moment."
+msgstr ""
+
+#. module: rating_project
+#: model:ir.actions.act_window,help:rating_project.rating_rating_action_view_project_rating
+msgid "There is no rating for this object at the moment."
+msgstr ""
+
+#. module: rating_project
 #: selection:project.project,rating_status_period:0
 msgid "Twice a Month"
 msgstr ""
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index 4140d4d3d87..82718dc99a1 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,11 @@ msgstr ""
 
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
+msgid "<strong>Fiscal Position Remark:</strong>"
+msgstr ""
+
+#. module: report_intrastat
+#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "<strong>Fiscal Position:</strong>"
 msgstr ""
 
@@ -154,6 +159,8 @@ msgstr ""
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
+#: model:ir.model.fields,field_description:report_intrastat.field_product_product_intrastat_id
+#: model:ir.model.fields,field_description:report_intrastat.field_product_template_intrastat_id
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: model:ir.ui.view,arch_db:report_intrastat.view_report_intrastat_code_form
 msgid "Intrastat Code"
@@ -166,15 +173,12 @@ msgid "Intrastat Data"
 msgstr ""
 
 #. module: report_intrastat
-#: model:ir.actions.report.xml,name:report_intrastat.account_intrastatinvoices
+#: model:ir.actions.report,name:report_intrastat.account_intrastatinvoices
 msgid "Intrastat Invoices"
 msgstr ""
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
-#: model:ir.model.fields,field_description:report_intrastat.field_delivery_carrier_intrastat_id
-#: model:ir.model.fields,field_description:report_intrastat.field_product_product_intrastat_id
-#: model:ir.model.fields,field_description:report_intrastat.field_product_template_intrastat_id
 #: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_intrastat_id
 #: model:ir.ui.view,arch_db:report_intrastat.view_report_intrastat_code_tree
 msgid "Intrastat code"
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index e0483c563b1..9332892ba51 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: resource
-#: code:addons/resource/models/resource.py:691
+#: code:addons/resource/models/resource.py:703
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -115,7 +115,7 @@ msgid "End Date"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/models/resource.py:722
+#: code:addons/resource/models/resource.py:734
 #, python-format
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Test Resource Model"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/models/resource.py:677
+#: code:addons/resource/models/resource.py:689
 #, python-format
 msgid "The efficiency factor cannot be equal to 0."
 msgstr ""
@@ -424,6 +424,11 @@ msgid "Thursday Morning"
 msgstr ""
 
 #. module: resource
+#: sql_constraint:resource.resource:0
+msgid "Time efficiency must be strictly positive"
+msgstr ""
+
+#. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_tz
 msgid "Timezone"
 msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 7a067c8d67a..402e791c669 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,9 @@ msgid "\n"
 "% set access_action = object.with_context(force_website=True).get_access_action()\n"
 "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
 "% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
-"% set access_name = is_online and object.template_id and doc_name == 'quotation' and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
-"% set access_url = is_online and '/mail/view?model=sale.order&res_id=%d' % (object.id) or ''\n"
+"% set pay_sign_name =  object.get_portal_confirmation_action()\n"
+"% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name in ('pay', 'sign') and 'Accept and %s online' % pay_sign_name or 'View %s' % doc_name\n"
+"% set access_url = is_online and object.get_mail_url() or ''\n"
 "\n"
 "% if object.partner_id.parent_id:\n"
 "    (<i>${object.partner_id.parent_id.name}</i>)\n"
@@ -32,7 +33,7 @@ msgid "\n"
 "<p>\n"
 "Here is\n"
 "% if ctx.get('proforma')\n"
-"in attachment, your pro-forma\n"
+"in attachment, your pro-forma invoice\n"
 "% else\n"
 "the ${doc_name} <strong>${object.name}</strong>\n"
 "% endif\n"
@@ -113,15 +114,18 @@ msgid "&amp;bull;"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "(update)"
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "&amp;nbsp;"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:85
-#, python-format
-msgid "<b>Invite salespeople or managers</b> via email.<br/><i>Enter one email per line.</i>"
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "&amp;nbsp;<span>on</span>&amp;nbsp;"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "(update)"
 msgstr ""
 
 #. module: sale
@@ -201,6 +205,16 @@ msgid "<html>\n"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<i class=\"fa fa-arrow-circle-right\"/> Accept &amp; Sign"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<i class=\"fa fa-check-circle\"/> Signed"
+msgstr ""
+
+#. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders_upselling
 msgid "<i>Example: pre-paid service offers for which the customer have\n"
 "                to buy an extra pack of hours, because he used all his support\n"
@@ -208,15 +222,54 @@ msgid "<i>Example: pre-paid service offers for which the customer have\n"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:66
-#, python-format
-msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>"
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "<span class=\"hidden-xs\">Sales Order #</span>\n"
+"                      <span class=\"visible-xs\">Ref.</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "<span class=\"label label-danger\"><i class=\"fa fa-fw fa-warning\"/><span class=\"hidden-xs\"> Problem</span></span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "<span class=\"label label-default hidden-xs\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Done</span></span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Invoiced</span></span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
 msgstr ""
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<span>Pro-Forma # </span>"
+msgid "<span>Pro-Forma Invoice # </span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Contact</strong>"
 msgstr ""
 
 #. module: sale
@@ -225,16 +278,41 @@ msgid "<strong>Date Ordered:</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Fiscal Position Remark:</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Invoices</strong>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Invoicing Address</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Payment Terms:</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Quotation Date:</strong>"
 msgstr ""
@@ -245,6 +323,11 @@ msgid "<strong>Salesperson:</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Shipping Address</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Shipping address:</strong>"
@@ -257,22 +340,33 @@ msgid "<strong>Subtotal: </strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Subtotal</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Total:</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Total</strong>"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Unit Price</strong>"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Your Reference:</strong>"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,sale_pricelist_setting:0
+#: selection:res.config.settings,sale_pricelist_setting:0
 msgid "A single sales price per product"
 msgstr ""
 
@@ -282,14 +376,13 @@ msgid "A warning can be set on a product or a customer (Sale)"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_sale_config_settings_group_stock_packaging
-msgid "Ability to select a package type in sales orders and\n"
-"                to force a quantity that is a multiple of the number of units per package."
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Ability to select a package type in sales orders and to force a quantity that is a multiple of the number of units per package."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Ability to select a package type in sales orders and to force a quantity that is a multiple of the number of units per package."
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "Accept order"
 msgstr ""
 
 #. module: sale
@@ -298,11 +391,6 @@ msgid "Account used for deposits"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Add all accounting features: journal entries, legal statements, etc."
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_layout_category_pagebreak
 msgid "Add pagebreak"
 msgstr ""
@@ -324,24 +412,35 @@ msgid "Advance: %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Allow manual discounts on order lines"
+#: model:ir.actions.act_window,name:sale.report_all_channels_sales_action
+#: model:ir.ui.menu,name:sale.report_all_channels_sales
+msgid "All Channels Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_pivot
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
+msgid "All Channels Sales Orders Analysis"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_all_channels_sales
+msgid "All sales orders grouped by sales channels"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_sale_config_settings_group_sale_pricelist
-msgid "Allows to manage different prices based on rules per category of customers.\n"
-"                Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Allow manual discounts on order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Allows you to send Pro-Forma to your customers"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Allows you to send Pro-Forma Invoice to your customers"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_sale_config_settings_group_proforma_sales
-msgid "Allows you to send pro-forma."
+#: model:ir.model.fields,help:sale.field_res_config_settings_group_proforma_sales
+msgid "Allows you to send pro-forma invoice."
 msgstr ""
 
 #. module: sale
@@ -350,13 +449,25 @@ msgid "Amount"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_amt_invoiced
+#: model:ir.model.fields,field_description:sale.field_sale_report_amt_invoiced
+msgid "Amount Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_amt_to_invoice
+#: model:ir.model.fields,field_description:sale.field_sale_report_amt_to_invoice
+msgid "Amount To Invoice"
+msgstr ""
+
+#. module: sale
 #: model:ir.model.fields,field_description:sale.field_crm_team_quotations_amount
 msgid "Amount of quotations to invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_project_id
-#: model:ir.model.fields,field_description:sale.field_sale_order_related_project_id
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_analytic_account_id
+#: model:ir.model.fields,field_description:sale.field_sale_order_analytic_account_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_analytic_account_id
 msgid "Analytic Account"
 msgstr ""
@@ -382,34 +493,24 @@ msgid "At cost"
 msgstr ""
 
 #. module: sale
-#: selection:product.template,expense_policy:0
-msgid "At sale price"
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.menu,name:sale.menu_variants_action
 msgid "Attribute Values"
 msgstr ""
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_attribute_action
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Attributes"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_product_variant
-msgid "Attributes & Variants"
-msgstr ""
-
-#. module: sale
 #: selection:product.template,sale_line_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products."
 msgstr ""
 
@@ -466,13 +567,6 @@ msgid "Check this box to set an invoicing target for this sales channel."
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:39
-#, python-format
-msgid "Click here to add some lines to your quotations."
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
 msgid "Click to define a target"
 msgstr ""
@@ -488,6 +582,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_company_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_company_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_company_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_company_id
@@ -496,15 +591,18 @@ msgid "Company"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:81
-#, python-format
-msgid "Configuration options are available in the Settings app."
+#: model:ir.ui.menu,name:sale.menu_sale_config
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: sale
@@ -524,7 +622,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_coupon
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_sale_coupon
 msgid "Coupons & Promotions"
 msgstr ""
 
@@ -548,11 +646,6 @@ msgid "Create a Quotation, the first step of a new sale."
 msgstr ""
 
 #. module: sale
-#: selection:product.template,track_service:0
-msgid "Create a task per order line to track hours"
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv
 msgid "Create and View Invoices"
 msgstr ""
@@ -578,17 +671,17 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Currencies"
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_currency_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_currency_id
 msgid "Currency"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
+msgid "Current Year Sales"
+msgstr ""
+
+#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_order_partner_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_partner_id
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
@@ -597,16 +690,11 @@ msgid "Customer"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_delivery_address
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_sale_delivery_address
 msgid "Customer Addresses"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_web_clearbit
-msgid "Customer Autocomplete"
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_client_order_ref
 msgid "Customer Reference"
 msgstr ""
@@ -617,11 +705,12 @@ msgid "Customer Taxes"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery_dhl
-msgid "DHL"
+#: model:ir.ui.menu,name:sale.res_partner_menu
+msgid "Customers"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_date_order
 #: model:ir.model.fields,field_description:sale.field_sale_report_date
 msgid "Date Order"
 msgstr ""
@@ -637,7 +726,7 @@ msgid "Date on which the sales order is confirmed."
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_default_use_sale_note
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_use_sale_note
 msgid "Default Terms & Conditions"
 msgstr ""
 
@@ -647,7 +736,7 @@ msgid "Default Terms and Conditions"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_sale_config_settings_deposit_product_id_setting
+#: model:ir.model.fields,help:sale.field_res_config_settings_default_deposit_product_id
 msgid "Default product used for payment advances"
 msgstr ""
 
@@ -657,7 +746,7 @@ msgid "Delivered"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:734
+#: code:addons/sale/models/sale.py:824
 #: model:ir.ui.view,arch_db:sale.view_order_form
 #, python-format
 msgid "Delivered Quantity"
@@ -669,11 +758,6 @@ msgid "Delivered quantities"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,default_invoice_policy:0
-msgid "Delivered quantities or service hours"
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_account_invoice_partner_shipping_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_partner_shipping_id
 msgid "Delivery Address"
@@ -695,7 +779,7 @@ msgid "Delivery address for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_deposit_product_id_setting
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_default_deposit_product_id
 msgid "Deposit Product"
 msgstr ""
 
@@ -707,6 +791,16 @@ msgid "Description"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Design standardized offers"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_website_sale_digital
+msgid "Digital Content"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_invoice_layouted
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "Disc.(%)"
@@ -733,11 +827,12 @@ msgid "Discount on lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_discount_per_so_line
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_discount_per_so_line
 msgid "Discounts"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_display_name
 #: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma_display_name
 #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_display_name
 #: model:ir.model.fields,field_description:sale.field_sale_layout_category_display_name
@@ -748,12 +843,6 @@ msgid "Display Name"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_print_docsaway
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Docsaway"
-msgstr ""
-
-#. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:84
 #, python-format
 msgid "Down Payment"
@@ -770,7 +859,7 @@ msgid "Down Payment Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Down Payments"
 msgstr ""
 
@@ -796,6 +885,11 @@ msgid "Down payments are made when creating invoices from a sales order. They ar
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "Download"
+msgstr ""
+
+#. module: sale
 #: selection:sale.report,state:0
 msgid "Draft Quotation"
 msgstr ""
@@ -816,17 +910,12 @@ msgid "Extended Filters"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:707
+#: code:addons/sale/models/sale.py:803
 #, python-format
 msgid "Extra line with %s "
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery_fedex
-msgid "FedEx"
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_fiscal_position_id
 msgid "Fiscal Position"
 msgstr ""
@@ -843,7 +932,12 @@ msgid "Fully Invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Get warnings in orders for products or customers"
 msgstr ""
 
@@ -853,6 +947,7 @@ msgid "Gross Weight"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
 #: model:ir.ui.view,arch_db:sale.view_sales_order_filter
 #: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
@@ -865,6 +960,7 @@ msgid "Group By Name"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_id
 #: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma_id
 #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_id
 #: model:ir.model.fields,field_description:sale.field_sale_layout_category_id
@@ -880,23 +976,24 @@ msgid "If the sale is locked, you can not modify it anymore. However, you will s
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_account_id
-msgid "Income Account"
+#: model:ir.model.fields,help:sale.field_sale_order_line_product_image
+msgid "Image of the product variant (Big-sized image of product template if false). It is automatically resized as a 1024x1024px image, with aspect ratio preserved."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Insert your terms & conditions here..."
+#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_account_id
+msgid "Income Account"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_product_category_action_form
-msgid "Internal Categories"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Insert your terms & conditions here..."
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_stock
-msgid "Inventory Management"
+#: code:addons/sale/controllers/portal.py:210
+#, python-format
+msgid "Invalid order"
 msgstr ""
 
 #. module: sale
@@ -962,6 +1059,16 @@ msgid "Invoice revenue for the current month. This is the amount the sales chann
 msgstr ""
 
 #. module: sale
+#: selection:res.config.settings,default_invoice_policy:0
+msgid "Invoice what is delivered"
+msgstr ""
+
+#. module: sale
+#: selection:res.config.settings,default_invoice_policy:0
+msgid "Invoice what is ordered"
+msgstr ""
+
+#. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoiceable lines"
 msgstr ""
@@ -977,7 +1084,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:735
+#: code:addons/sale/models/sale.py:825
 #: model:ir.ui.view,arch_db:sale.view_order_form
 #, python-format
 msgid "Invoiced Quantity"
@@ -1021,7 +1128,8 @@ msgstr ""
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sale_invoicing
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.product_template_form_view_invoice_policy
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:sale.view_order_form
 msgid "Invoicing"
 msgstr ""
@@ -1029,8 +1137,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_product_product_invoice_policy
 #: model:ir.model.fields,field_description:sale.field_product_template_invoice_policy
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_default_invoice_policy
-#: model:ir.ui.view,arch_db:sale.product_template_form_view_invoice_policy
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_default_invoice_policy
 msgid "Invoicing Policy"
 msgstr ""
 
@@ -1055,6 +1162,12 @@ msgid "Is a down payment"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_is_expired
+msgid "Is expired"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales___last_update
 #: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma___last_update
 #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv___last_update
 #: model:ir.model.fields,field_description:sale.field_sale_layout_category___last_update
@@ -1081,32 +1194,28 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_account_invoice_line_layout_category_sequence
-#: model:ir.model.fields,field_description:sale.field_sale_order_line_layout_category_sequence
-msgid "Layout Sequence"
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+msgid "Late Activities"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Let your customers sign &amp; pay online"
+#: model:ir.model.fields,field_description:sale.field_account_invoice_line_layout_category_sequence
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_layout_category_sequence
+msgid "Layout Sequence"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:24
-#, python-format
-msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Let your customers log in to see their documents"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:18
-#, python-format
-msgid "Let's have a look at the quotations of this sales channel."
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Let your customers sign &amp; pay online"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Line subtotals in sales orders"
 msgstr ""
 
@@ -1116,7 +1225,7 @@ msgid "Lock"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_auto_done_setting
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_auto_done_setting
 msgid "Lock Confirmed Orders"
 msgstr ""
 
@@ -1126,33 +1235,23 @@ msgid "Locked"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Look up company information (name, logo, etc.)"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Mail your quotations &amp; invoices in one-click using"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Manage picking and deliveries"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Manage promotion &amp; coupon programs"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Manage promotion &amp; coupon programs"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery
+msgid "Manage shipping internally"
 msgstr ""
 
 #. module: sale
-#: selection:product.template,track_service:0
+#: selection:product.template,service_type:0
 msgid "Manually set quantities on order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_product_product_track_service
-#: model:ir.model.fields,help:sale.field_product_template_track_service
+#: model:ir.model.fields,help:sale.field_product_product_service_type
+#: model:ir.model.fields,help:sale.field_product_template_service_type
 msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
 "Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
 "Create a task and track hours: Create a task on the sales order validation and track the work hours."
@@ -1164,7 +1263,7 @@ msgid "Manually set the expiration date of your quotation (offer), or it will se
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_margin
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_sale_margin
 msgid "Margins"
 msgstr ""
 
@@ -1186,23 +1285,18 @@ msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_multi_currency
-msgid "Multi-Currencies"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Multiple Prices per Product"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,multi_sales_price_method:0
-#: selection:sale.config.settings,sale_pricelist_setting:0
+#: selection:res.config.settings,multi_sales_price_method:0
+#: selection:res.config.settings,sale_pricelist_setting:0
 msgid "Multiple prices per product (e.g. customer segments, currencies)"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_multi_sales_price
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_multi_sales_price
 msgid "Multiple sales price per product"
 msgstr ""
 
@@ -1228,10 +1322,10 @@ msgid "Name"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:104
-#: code:addons/sale/models/sale.py:255
-#: code:addons/sale/models/sale.py:257
-#: code:addons/sale/models/sale.py:259
+#: code:addons/sale/models/sale.py:115
+#: code:addons/sale/models/sale.py:279
+#: code:addons/sale/models/sale.py:281
+#: code:addons/sale/models/sale.py:283
 #, python-format
 msgid "New"
 msgstr ""
@@ -1253,7 +1347,7 @@ msgid "No Message"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "No longer edit orders once confirmed"
 msgstr ""
 
@@ -1305,15 +1399,14 @@ msgid "Once the quotation is confirmed, it becomes a sales order.\n"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:61
-#, python-format
-msgid "Once your quotation is ready, you can save, print or send it by email."
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_sale_payment
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_portal_confirmation
+msgid "Online Signature & Payment"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_quote
-msgid "Online Quotations & Templates"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_portal_confirmation_options
+msgid "Online Signature & Payment options"
 msgstr ""
 
 #. module: sale
@@ -1324,6 +1417,8 @@ msgid "Only Integer Value should be valid."
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
 #: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
 msgid "Order"
 msgstr ""
@@ -1334,13 +1429,18 @@ msgid "Order #"
 msgstr ""
 
 #. module: sale
+#: code:addons/sale/controllers/portal.py:86
+#: code:addons/sale/controllers/portal.py:137
 #: model:ir.model.fields,field_description:sale.field_sale_order_date_order
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
 #: model:ir.ui.view,arch_db:sale.view_order_tree
+#, python-format
 msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Order Line Sections"
 msgstr ""
 
@@ -1362,6 +1462,7 @@ msgid "Order Number"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_name
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_order_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_name
 #: model:ir.model.fields,field_description:sale.field_sale_report_name
@@ -1374,6 +1475,18 @@ msgid "Order Status"
 msgstr ""
 
 #. module: sale
+#: code:addons/sale/controllers/portal.py:215
+#, python-format
+msgid "Order is not in a state requiring customer validation."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/controllers/portal.py:222
+#, python-format
+msgid "Order signed by %s"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
 msgid "Order to Invoice"
 msgstr ""
@@ -1384,7 +1497,7 @@ msgid "Ordered Qty"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:732
+#: code:addons/sale/models/sale.py:821
 #: model:ir.ui.view,arch_db:sale.view_order_form
 #, python-format
 msgid "Ordered Quantity"
@@ -1404,11 +1517,16 @@ msgstr ""
 
 #. module: sale
 #: selection:product.template,invoice_policy:0
-#: selection:sale.config.settings,default_invoice_policy:0
 msgid "Ordered quantities"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: model:ir.ui.menu,name:sale.sale_order_menu
+msgid "Orders"
+msgstr ""
+
+#. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_to_invoice
 #: model:ir.ui.menu,name:sale.menu_sale_order_invoice
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
@@ -1429,33 +1547,18 @@ msgid "Orders to upsell are orders having products with an invoicing\n"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:13
-#, python-format
-msgid "Organize your sales activities with the <b>Sales app</b>."
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_form
 msgid "Other Information"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_stock_packaging
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_partner_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_country_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_country_id
 msgid "Partner Country"
 msgstr ""
@@ -1466,6 +1569,16 @@ msgid "Partner's Country"
 msgstr ""
 
 #. module: sale
+#: selection:res.config.settings,portal_confirmation_options:0
+msgid "Payment"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_payment_term_id
 msgid "Payment Terms"
 msgstr ""
@@ -1476,13 +1589,13 @@ msgid "Personalize sales order and invoice report"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:289
+#: code:addons/sale/models/sale.py:357
 #, python-format
 msgid "Please define an accounting sales journal for this company."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:817
+#: code:addons/sale/models/sale.py:918
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
 msgstr ""
@@ -1508,13 +1621,19 @@ msgid "Price Reduce Tax inc"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,multi_sales_price_method:0
-#: selection:sale.config.settings,sale_pricelist_setting:0
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_price_subtotal
+msgid "Price Subtotal"
+msgstr ""
+
+#. module: sale
+#: selection:res.config.settings,multi_sales_price_method:0
+#: selection:res.config.settings,sale_pricelist_setting:0
 msgid "Price computed from formulas (discounts, margins, roundings)"
 msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_product_pricelist
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_pricelist_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_pricelist_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_pricelist_id
 msgid "Pricelist"
@@ -1526,15 +1645,15 @@ msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_multi_sales_price_method
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_pricelist_setting
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_multi_sales_price_method
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_sale_pricelist_setting
 #: model:ir.ui.menu,name:sale.menu_product_pricelist_main
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Pricelists"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Pricing"
 msgstr ""
 
@@ -1544,8 +1663,8 @@ msgid "Print"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_proforma_sales
-msgid "Pro-Forma"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_proforma_sales
+msgid "Pro-Forma Invoice"
 msgstr ""
 
 #. module: sale
@@ -1554,22 +1673,8 @@ msgid "Pro-forma Invoices"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_procurement_order
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_procurement_group_id
-msgid "Procurement Group"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_line_procurement_ids
-msgid "Procurements"
-msgstr ""
-
-#. module: sale
 #: model:ir.model,name:sale.model_product_product
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_product_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_product_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_product_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_product_id
@@ -1578,18 +1683,30 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Product Catalog"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_categ_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_categ_id
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
 msgid "Product Category"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_product_image
+msgid "Product Image"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_product_qty
+msgid "Product Quantity"
+msgstr ""
+
+#. module: sale
 #: model:ir.model,name:sale.model_product_template
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_product_tmpl_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_product_tmpl_id
 msgid "Product Template"
 msgstr ""
@@ -1601,7 +1718,7 @@ msgid "Product Variants"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Product used for down payments"
 msgstr ""
 
@@ -1637,7 +1754,7 @@ msgid "Qty To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Quantities to invoice from sales orders"
 msgstr ""
 
@@ -1649,19 +1766,27 @@ msgid "Quantity"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Quantity:"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
+#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
+#: model:ir.ui.view,arch_db:sale.portal_order_page
 #: model:ir.ui.view,arch_db:sale.view_quotation_tree
 #: selection:sale.order,state:0
 msgid "Quotation"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "Quotation #"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
+#: model:ir.actions.report,name:sale.action_report_saleorder
 msgid "Quotation / Order"
 msgstr ""
 
@@ -1700,6 +1825,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:sale.field_crm_team_use_quotations
 #: model:ir.ui.menu,name:sale.menu_sale_quotations
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
+#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
 #: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
 #, python-format
@@ -1707,7 +1835,7 @@ msgid "Quotations"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Quotations &amp; Orders"
 msgstr ""
 
@@ -1722,6 +1850,11 @@ msgid "Quotations Sent"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_website_quote
+msgid "Quotations Templates"
+msgstr ""
+
+#. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Quotations and Sales"
 msgstr ""
@@ -1733,8 +1866,10 @@ msgid "Re-Invoice Expenses"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Record time spent on services and invoice it"
+#: code:addons/sale/controllers/portal.py:87
+#: code:addons/sale/controllers/portal.py:138
+#, python-format
+msgid "Reference"
 msgstr ""
 
 #. module: sale
@@ -1755,13 +1890,14 @@ msgid "Report Layout Categories"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.menu,name:sale.menu_sale_report
 #: model:ir.ui.view,arch_db:sale.view_order_form
 msgid "Reporting"
 msgstr ""
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_report_product_all
-#: model:ir.ui.menu,name:sale.menu_sales_config
+#: model:ir.ui.menu,name:sale.sale_menu_root
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
 #: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
 #: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
@@ -1790,9 +1926,11 @@ msgstr ""
 #: model:ir.model,name:sale.model_crm_team
 #: model:ir.model.fields,field_description:sale.field_account_invoice_report_team_id
 #: model:ir.model.fields,field_description:sale.field_account_invoice_team_id
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_team_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_team_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_team_id
 #: model:ir.ui.view,arch_db:sale.account_invoice_groupby_inherit
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
 #: model:ir.ui.view,arch_db:sale.view_account_invoice_report_search_inherit
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
 #: model:ir.ui.view,arch_db:sale.view_sales_order_filter
@@ -1800,6 +1938,12 @@ msgid "Sales Channel"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.menu,name:sale.report_sales_team
+#: model:ir.ui.menu,name:sale.sales_team_config
+msgid "Sales Channels"
+msgstr ""
+
+#. module: sale
 #: selection:sale.report,state:0
 msgid "Sales Done"
 msgstr ""
@@ -1837,7 +1981,6 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: model:ir.model.fields,field_description:sale.field_account_analytic_line_so_line
-#: model:ir.model.fields,field_description:sale.field_procurement_order_sale_line_id
 #: model:ir.model.fields,field_description:sale.field_product_product_sale_line_warn
 #: model:ir.model.fields,field_description:sale.field_product_template_sale_line_warn
 msgid "Sales Order Line"
@@ -1866,8 +2009,11 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.actions.act_window,name:sale.action_orders_salesteams
 #: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams
-#: model:ir.ui.menu,name:sale.menu_sale_order
+#: model:ir.ui.menu,name:sale.menu_sales_config
 #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
+#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
 #: model:ir.ui.view,arch_db:sale.view_order_tree
 #: model:ir.ui.view,arch_db:sale.view_sale_order_calendar
 #: model:ir.ui.view,arch_db:sale.view_sale_order_graph
@@ -1882,12 +2028,18 @@ msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
+#: selection:product.template,expense_policy:0
+msgid "Sales price"
+msgstr ""
+
+#. module: sale
 #: code:addons/sale/models/sales_team.py:94
 #, python-format
 msgid "Sales: Untaxed Total"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_user_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_salesman_id
 #: model:ir.model.fields,field_description:sale.field_sale_order_user_id
 #: model:ir.model.fields,field_description:sale.field_sale_report_user_id
@@ -1898,11 +2050,6 @@ msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.view,arch_db:sale.report_configuration_search_view
 msgid "Search Name"
 msgstr ""
@@ -1920,15 +2067,13 @@ msgid "Section"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_sale_layout
 msgid "Sections on Sales Orders"
 msgstr ""
 
 #. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:44
-#, python-format
-msgid "Select a product, or create a new one on the fly. The product will define the default sales price (that you can change), taxes and description automatically."
+#: model:ir.model.fields,field_description:sale.field_sale_order_access_token
+msgid "Security Token"
 msgstr ""
 
 #. module: sale
@@ -1940,42 +2085,22 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Sell and purchase products in different units of measure"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_sale_digital
-msgid "Sell digital products - provide downloadable content on your customer portal"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Sell in foreign currencies"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Sell products by multiple of unit # per package"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Sell your products on eBay"
-msgstr ""
-
-#. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "Send PRO-FORMA"
+msgid "Send PRO-FORMA Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Send a product-specific email once the invoice is paid"
 msgstr ""
 
@@ -1985,12 +2110,7 @@ msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Send delivery orders to your warehouse and get delivered quantities updated in sales orders accordingly."
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Sending an email is useful if you need to share specific information or content about a product (instructions, rules, links, media, etc.). Create and set the email template from the product detail form (in Sales tab)."
 msgstr ""
 
@@ -2018,17 +2138,17 @@ msgid "Set an invoicing target: "
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Set multiple prices per product, automated discounts, etc."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Set product attributes (e.g. color, size) to sell variants"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Set specific billing and shipping addresses"
 msgstr ""
 
@@ -2038,48 +2158,43 @@ msgid "Set to Quotation"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.menu,name:sale.menu_sale_general_settings
+msgid "Settings"
+msgstr ""
+
+#. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "Setup default terms and conditions in your company settings."
+msgid "Setup default terms and conditions in your sales settings ..."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Ship with DHL"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Ship with DHL USA"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Ship with FedEx"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Ship with UPS"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Ship with USPS"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Shipping"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Shipping Connectors"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery
-msgid "Shipping Costs"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Ship with bpost"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods."
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Shipping"
 msgstr ""
 
 #. module: sale
@@ -2098,42 +2213,37 @@ msgid "Show line subtotals without taxes (B2B)"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Show margins on orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_product_pricelist
-msgid "Show pricelists On Products"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_pricelist_item
-msgid "Show pricelists to customers"
-msgstr ""
-
-#. module: sale
 #: selection:product.pricelist,discount_policy:0
 msgid "Show public price & discount to the customer"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Show standard terms &amp; conditions on orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_show_price_subtotal
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_show_price_subtotal
 msgid "Show subtotal"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_show_price_total
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_show_price_total
 msgid "Show total"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: selection:res.config.settings,portal_confirmation_options:0
+msgid "Signature"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Sort products in sections with subtotals and page-breaks"
 msgstr ""
 
@@ -2143,7 +2253,7 @@ msgid "Source Document"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_product_email_template
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_product_email_template
 msgid "Specific Email"
 msgstr ""
 
@@ -2156,6 +2266,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_price_subtotal
+#: model:ir.ui.view,arch_db:sale.invoice_form_inherit_sale
 msgid "Subtotal"
 msgstr ""
 
@@ -2165,7 +2276,7 @@ msgid "Target of invoice revenue for the current month. This is the amount the s
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_show_tax
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_sale_show_tax
 msgid "Tax Display"
 msgstr ""
 
@@ -2180,12 +2291,12 @@ msgid "Tax display B2C"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,sale_show_tax:0
+#: selection:res.config.settings,sale_show_tax:0
 msgid "Tax-Excluded Prices"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.settings,sale_show_tax:0
+#: selection:res.config.settings,sale_show_tax:0
 msgid "Tax-Included Prices"
 msgstr ""
 
@@ -2204,7 +2315,17 @@ msgid "Taxes used for deposits"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_note
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "Taxes:"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_res_config_settings_module_sale_payment
+msgid "Technical field implied by user choice of online_confirmation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_sale_note
 msgid "Terms & Conditions"
 msgstr ""
 
@@ -2214,7 +2335,8 @@ msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale_analytic.py:112
+#: code:addons/sale/models/analytic.py:128
+#: code:addons/sale/models/analytic.py:140
 #, python-format
 msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses."
 msgstr ""
@@ -2225,18 +2347,17 @@ msgid "The amount to be invoiced in advance, taxes excluded."
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_project_id
-#: model:ir.model.fields,help:sale.field_sale_order_related_project_id
+#: model:ir.model.fields,help:sale.field_sale_order_analytic_account_id
 msgid "The analytic account related to a sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "The margin is computed as the sum of product sales prices minus the cost set in their detail form."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:728
+#: code:addons/sale/models/sale.py:816
 #, python-format
 msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders."
 msgstr ""
@@ -2260,7 +2381,17 @@ msgid "The value of the down payment amount must be positive."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "There are currently no orders for your account."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
+msgid "There are currently no quotations for your account."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "There are two ways to manage pricelists: 1) Multiple prices per product: must be set in the Sales tab of the product detail form. 2) Price computed from formulas: must be set in the pricelist form."
 msgstr ""
 
@@ -2271,24 +2402,24 @@ msgid "There is no income account defined for this product: \"%s\". You may have
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:366
-#: code:addons/sale/models/sale.py:370
+#: code:addons/sale/models/sale.py:434
+#: code:addons/sale/models/sale.py:438
 #, python-format
 msgid "There is no invoicable line."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_product_search
-msgid "This Year"
+#: model:ir.ui.view,arch_db:sale.portal_order_error
+msgid "There was an error processing this page."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "This adds the choice of a currency on pricelists."
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
+msgid "This Year"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "This default value is applied to any new product created. This can be changed in the product detail form."
 msgstr ""
 
@@ -2308,14 +2439,8 @@ msgid "This report performs analysis on your sales orders. Analysis check your s
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_timesheet
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Timesheets"
-msgstr ""
-
-#. module: sale
-#: selection:product.template,track_service:0
-msgid "Timesheets on project"
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
 msgstr ""
 
 #. module: sale
@@ -2333,15 +2458,20 @@ msgid "Today Activities"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales_price_total
 #: model:ir.model.fields,field_description:sale.field_sale_order_amount_total
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_price_total
 #: model:ir.model.fields,field_description:sale.field_sale_report_price_total
+#: model:ir.ui.view,arch_db:sale.invoice_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
 #: model:ir.ui.view,arch_db:sale.report_configuration_search_view
 #: model:ir.ui.view,arch_db:sale.view_order_line_tree
 msgid "Total"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_pivot
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "Total Price"
 msgstr ""
@@ -2353,22 +2483,12 @@ msgid "Total Tax Included"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_product_product_track_service
-#: model:ir.model.fields,field_description:sale.field_product_template_track_service
+#: model:ir.model.fields,field_description:sale.field_product_product_service_type
+#: model:ir.model.fields,field_description:sale.field_product_template_service_type
 msgid "Track Service"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery_ups
-msgid "UPS"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery_usps
-msgid "USPS"
-msgstr ""
-
-#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_price_unit
 #: model:ir.ui.view,arch_db:sale.report_invoice_layouted
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
@@ -2376,6 +2496,11 @@ msgid "Unit Price"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Unit Price:"
+msgstr ""
+
+#. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_line_product_uom
 #: model:ir.model.fields,field_description:sale.field_sale_report_product_uom
 #: model:ir.ui.view,arch_db:sale.view_order_line_tree
@@ -2388,10 +2513,9 @@ msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_uom
 #: model:ir.ui.menu,name:sale.menu_product_uom_form_action
 #: model:ir.ui.menu,name:sale.next_id_16
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Units of Measure"
 msgstr ""
 
@@ -2411,13 +2535,13 @@ msgid "Untaxed Amount"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
-msgid "Untaxed Total"
+#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "Untaxed Amount:"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Upcoming Activities (7 days)"
+#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
+msgid "Untaxed Total"
 msgstr ""
 
 #. module: sale
@@ -2432,28 +2556,8 @@ msgid "Upselling Opportunity"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_pricelist
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:71
-#, python-format
-msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
-msgstr ""
-
-#. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:75
-#, python-format
-msgid "Use this menu to access quotations, sales orders and customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "VAT:"
+#: model:ir.ui.view,arch_db:sale.portal_my_quotations
+msgid "Valid Until"
 msgstr ""
 
 #. module: sale
@@ -2468,7 +2572,7 @@ msgid "Warning"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:898
+#: code:addons/sale/models/sale.py:1007
 #, python-format
 msgid "Warning for %s"
 msgstr ""
@@ -2479,12 +2583,13 @@ msgid "Warning on the Sales Order"
 msgstr ""
 
 #. module: sale
+#: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
 #: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
 msgid "Warning when Selling this Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_warning_sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings_group_warning_sale
 msgid "Warnings"
 msgstr ""
 
@@ -2494,18 +2599,6 @@ msgid "What do you want to invoice?"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set."
-msgstr ""
-
-#. module: sale
-#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:29
-#, python-format
-msgid "Write the name of your customer to create one on the fly, or select an existing one."
-msgstr ""
-
-#. module: sale
 #. openerp-web
 #: code:addons/sale/static/src/js/sale.js:32
 #, python-format
@@ -2513,13 +2606,13 @@ msgid "Wrong value entered!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:167
+#: code:addons/sale/models/sale.py:192
 #, python-format
 msgid "You can not delete a sent quotation or a sales order! Try to cancel it before."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/models/sale.py:940
+#: code:addons/sale/models/sale.py:1049
 #, python-format
 msgid "You can not remove a sales order line.\n"
 "Discard changes and try setting the quantity to 0."
@@ -2537,6 +2630,12 @@ msgid "You will find here all orders that are ready to be invoiced."
 msgstr ""
 
 #. module: sale
+#: code:addons/sale/controllers/portal.py:226
+#, python-format
+msgid "Your Order has been confirmed."
+msgstr ""
+
+#. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations_salesteams
 msgid "Your next actions should flow efficiently: confirm the Quotation\n"
 "                to a Sales Order, then create the Invoice and collect the Payment."
@@ -2555,13 +2654,14 @@ msgid "Your next actions should flow efficiently: confirm the Quotation to a Sal
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "days"
+#: model:ir.ui.view,arch_db:sale.portal_order_error
+#: model:ir.ui.view,arch_db:sale.portal_order_success
+msgid "close"
 msgstr ""
 
 #. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_ebay
-msgid "eBay"
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "days"
 msgstr ""
 
 #. module: sale
@@ -2570,8 +2670,8 @@ msgid "report.sale.report_saleproforma"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
+#: model:ir.model,name:sale.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 1dca1749a57..a4d316bf837 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,105 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_issue_count
-msgid "# Issues"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_order_count
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
 msgid "<span class=\"o_stat_text\"> Orders</span>"
 msgstr ""
 
 #. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
-msgid "<span class=\"o_stat_text\"> Quote(s) </span>"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_associate_member
-msgid "A member with whom you want to associate your membership. It will consider the membership state of the associated member."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_activation
-msgid "Activation"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_associate_member
-msgid "Associate Member"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_cancel
-msgid "Cancel Membership Date"
-msgstr ""
-
-#. module: sale_crm
-#. openerp-web
-#: code:addons/sale_crm/static/src/js/tour.js:16
-#, python-format
-msgid "Click here to see more options."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_token_count
-msgid "Count Payment Token"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_state
-msgid "Current Membership Status"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_property_stock_customer
-msgid "Customer Location"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_membership_start
-msgid "Date from which membership becomes active."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_membership_cancel
-msgid "Date on which membership has been cancelled"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_membership_stop
-msgid "Date until which membership remains active."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_free_member
-msgid "Free Member"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_partner_weight
-msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_implemented_partner_ids
-msgid "Implementation References"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_implemented_count
-msgid "Implemented Count"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_assigned_partner_id
-msgid "Implemented by"
+msgid "<span class=\"o_stat_text\"> Quotation(s) </span>"
 msgstr ""
 
 #. module: sale_crm
@@ -128,89 +36,21 @@ msgid "Invoiced in Sales Orders Target"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_membership_state
-msgid "It indicates the membership state.\n"
-"-Non Member: A partner who has not applied for any membership.\n"
-"-Cancelled Member: A member who has cancelled his membership.\n"
-"-Old Member: A member whose membership date has expired.\n"
-"-Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-"-Invoiced Member: A member whose invoice has been created.\n"
-"-Paying member: A member who has paid the membership fee."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_review
-msgid "Latest Partner Review"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
 #. module: sale_crm
-#. openerp-web
-#: code:addons/sale_crm/static/src/js/tour.js:20
-#, python-format
-msgid "Let's have a look at the quotations of this sales channel."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_grade_id
-msgid "Level"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_partner_weight
-msgid "Level Weight"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.sale_view_inherit123
 msgid "Log in the chatter from which opportunity the order originates"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_member_lines
-msgid "Membership"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_amount
-msgid "Membership Amount"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_stop
-msgid "Membership End Date"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_start
-msgid "Membership Start Date"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_warn_msg
-msgid "Message for Sales Order"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_picking_warn_msg
-msgid "Message for Stock Picking"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
 msgid "New Quotation"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_review_next
-msgid "Next Partner Review"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_crm_lead_sale_number
 msgid "Number of Quotations"
 msgstr ""
@@ -226,16 +66,6 @@ msgid "Orders"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_partnership
-msgid "Partnership Date"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_token_ids
-msgid "Payment Tokens"
-msgstr ""
-
-#. module: sale_crm
 #: code:addons/sale_crm/models/crm_team.py:12
 #, python-format
 msgid "Pipeline"
@@ -248,43 +78,26 @@ msgstr ""
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.sale_action_quotations
+#: model:ir.ui.menu,name:sale_crm.sale_order_menu_quotations_crm
 msgid "Quotations"
 msgstr ""
 
 #. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.sale_action_orders
+msgid "Sale orders"
+msgstr ""
+
+#. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_team
 msgid "Sales Channel"
 msgstr ""
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_order_ids
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_warn
 msgid "Sales Order"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_free_member
-msgid "Select if you want to give free membership."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_picking_warn
-#: model:ir.model.fields,help:sale_crm.field_res_users_sale_warn
-msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_grade_sequence
-msgid "Sequence"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_picking_warn
-msgid "Stock Picking"
-msgstr ""
-
-#. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_crm_lead_sale_amount_total
 msgid "Sum of Orders"
 msgstr ""
@@ -295,18 +108,8 @@ msgid "Tags"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_membership_amount
-msgid "The price negotiated by the partner"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_property_stock_customer
-msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_property_stock_supplier
-msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
+#: model:ir.model.fields,help:sale_crm.field_crm_lead_sale_amount_total
+msgid "Untaxed Total of Confirmed Orders"
 msgstr ""
 
 #. module: sale_crm
@@ -314,8 +117,3 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_property_stock_supplier
-msgid "Vendor Location"
-msgstr ""
-
diff --git a/addons/sale_expense/i18n/sale_expense.pot b/addons/sale_expense/i18n/sale_expense.pot
new file mode 100644
index 00000000000..746629ebab0
--- /dev/null
+++ b/addons/sale_expense/i18n/sale_expense.pot
@@ -0,0 +1,37 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* sale_expense
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_expense
+#: model:ir.model,name:sale_expense.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: sale_expense
+#: model:ir.model,name:sale_expense.model_hr_expense
+msgid "Expense"
+msgstr ""
+
+#. module: sale_expense
+#: model:ir.ui.view,arch_db:sale_expense.product_product_view_form_inherit_sale_expense
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale_expense
+#: model:ir.model.fields,field_description:sale_expense.field_hr_expense_sale_order_id
+msgid "Sale Order"
+msgstr ""
+
diff --git a/addons/sale_management/i18n/sale_management.pot b/addons/sale_management/i18n/sale_management.pot
new file mode 100644
index 00000000000..9a64dba201c
--- /dev/null
+++ b/addons/sale_management/i18n/sale_management.pot
@@ -0,0 +1,94 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* sale_management
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:79
+#, python-format
+msgid "<b>Invite salespeople or managers</b> via email.<br/><i>Enter one email per line.</i>"
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:60
+#, python-format
+msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>"
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:33
+#, python-format
+msgid "Click here to add some lines to your quotations."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:75
+#, python-format
+msgid "Configuration options are available in the Settings app."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:18
+#, python-format
+msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>"
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:55
+#, python-format
+msgid "Once your quotation is ready, you can save, print or send it by email."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:13
+#, python-format
+msgid "Organize your sales activities with the <b>Sales Management app</b>."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:38
+#, python-format
+msgid "Select a product, or create a new one on the fly. The product will define the default sales price (that you can change), taxes and description automatically."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:65
+#, python-format
+msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:69
+#, python-format
+msgid "Use this menu to access quotations, sales orders and customers."
+msgstr ""
+
+#. module: sale_management
+#. openerp-web
+#: code:addons/sale_management/static/src/js/tour.js:23
+#, python-format
+msgid "Write the name of your customer to create one on the fly, or select an existing one."
+msgstr ""
+
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index 3f1eaf6c8d3..fd893e62a8c 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 1baf1b75f27..e143bb12777 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,41 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sale_mrp
-#: model:ir.model.fields,help:sale_mrp.field_mrp_production_sale_ref
-msgid "Indicate the Customer Reference from sales order."
-msgstr ""
-
-#. module: sale_mrp
-#: model:ir.model.fields,help:sale_mrp.field_mrp_production_sale_name
-msgid "Indicate the name of sales order."
-msgstr ""
-
-#. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_account_invoice_line
 msgid "Invoice Line"
 msgstr ""
 
 #. module: sale_mrp
-#: model:ir.model,name:sale_mrp.model_procurement_order
-msgid "Procurement"
-msgstr ""
-
-#. module: sale_mrp
-#: model:ir.model,name:sale_mrp.model_mrp_production
-msgid "Production"
-msgstr ""
-
-#. module: sale_mrp
-#: model:ir.model.fields,field_description:sale_mrp.field_mrp_production_sale_name
-msgid "Sale Name"
-msgstr ""
-
-#. module: sale_mrp
-#: model:ir.model.fields,field_description:sale_mrp.field_mrp_production_sale_ref
-msgid "Sale Reference"
-msgstr ""
-
-#. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 3ca1af3434b..1185e6791ca 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_payment/i18n/sale_payment.pot b/addons/sale_payment/i18n/sale_payment.pot
new file mode 100644
index 00000000000..4722e8203b0
--- /dev/null
+++ b/addons/sale_payment/i18n/sale_payment.pot
@@ -0,0 +1,210 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* sale_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_payment
+#: code:addons/sale_payment/models/payment.py:111
+#, python-format
+msgid "<%s> transaction (%s) failed: <%s>"
+msgstr ""
+
+#. module: sale_payment
+#: code:addons/sale_payment/models/payment.py:118
+#, python-format
+msgid "<%s> transaction (%s) invalid state: %s"
+msgstr ""
+
+#. module: sale_payment
+#: code:addons/sale_payment/models/payment.py:126
+#, python-format
+msgid "<%s> transaction (%s) order confirmation failed: <%s>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<i class=\"fa fa-check-circle\"/> Done"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<strong>Transactions</strong>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_crm_team_pending_payment_transactions_amount
+msgid "Amount of pending transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_crm_team_authorized_payment_transactions_amount
+msgid "Amount of transactions to capture"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_authorized
+msgid "Authorized Payment Transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
+msgid "Awaiting Payment"
+msgstr ""
+
+#. module: sale_payment
+#: code:addons/sale_payment/controllers/payment.py:53
+#, python-format
+msgid "If we store your payment information on our server, subscription payments will be made automatically."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order_payment_tx_id
+msgid "Last Transaction"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order_payment_transaction_count
+msgid "Number of payment transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_crm_team_pending_payment_transactions_count
+msgid "Number of pending transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_crm_team_authorized_payment_transactions_count
+msgid "Number of transactions to capture"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_success
+msgid "Order successfully paid."
+msgstr ""
+
+#. module: sale_payment
+#: code:addons/sale_payment/controllers/payment.py:50
+#, python-format
+msgid "Pay"
+msgstr ""
+
+#. module: sale_payment
+#: code:addons/sale_payment/models/payment.py:187
+#, python-format
+msgid "Pay Now"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "Pay with"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
+msgid "Payment"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order_payment_acquirer_id
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model,name:sale_payment.model_payment_transaction
+msgid "Payment Transaction"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_pending
+msgid "Pending Payment Transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model,name:sale_payment.model_crm_team
+msgid "Sales Channel"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model,name:sale_payment.model_sale_order
+#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction_sale_order_id
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: impossible to validate order."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: invalid order state."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: invalid order."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: issue with credit card ID validation."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: transaction amount issue.<br/>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: transaction failed.<br/>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was an error processing your payment: transaction issue.<br/>"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
+msgid "There was en error processing your payment: invalid credit card ID."
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order_payment_tx_ids
+#: model:ir.ui.view,arch_db:sale_payment.sale_order_view_form
+msgid "Transactions"
+msgstr ""
+
+#. module: sale_payment
+#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
+msgid "to Capture"
+msgstr ""
+
diff --git a/addons/sale_service_rating/i18n/sale_service_rating.pot b/addons/sale_service_rating/i18n/sale_service_rating.pot
index cd44296b3a9..32fb09f1035 100644
--- a/addons/sale_service_rating/i18n/sale_service_rating.pot
+++ b/addons/sale_service_rating/i18n/sale_service_rating.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 05c265f41ba..71aa16f4406 100644
--- a/addons/sale_stock/i18n/sale_stock.pot
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:148
+#: code:addons/sale_stock/models/sale_order.py:164
 #, python-format
 msgid "\n"
 "There are %s %s available accross all warehouses."
@@ -39,12 +39,12 @@ msgid "After-Sale"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Apply special routes from orders (e.g. dropshipping, MTO)"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "By default Odoo computes the expected delivery date this way: order date + highest customer lead time of products. With this option, you can set a specific delivery date on orders rather than setting lead times on products."
 msgstr ""
 
@@ -69,7 +69,7 @@ msgid "Delivery"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_module_sale_order_dates
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_module_sale_order_dates
 msgid "Delivery Date"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgid "Display incoterms on Sales Order and related invoices"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Display incoterms on orders &amp; invoices"
 msgstr ""
 
@@ -95,9 +95,9 @@ msgstr ""
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_account_invoice_incoterms_id
-#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_group_display_incoterm
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_group_display_incoterm
 #: model:ir.model.fields,field_description:sale_stock.field_sale_order_incoterm
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Incoterms"
 msgstr ""
 
@@ -132,32 +132,35 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: sale_stock
+#: model:ir.model.fields,help:sale_stock.field_res_config_settings_use_security_lead
+msgid "Margin of error for dates promised to customers. Products will be scheduled for delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain."
+msgstr ""
+
+#. module: sale_stock
 #: model:ir.model.fields,help:sale_stock.field_res_company_security_lead
-#: model:ir.model.fields,help:sale_stock.field_sale_config_settings_security_lead
-#: model:ir.model.fields,help:sale_stock.field_stock_config_settings_default_new_security_lead
-#: model:ir.model.fields,help:sale_stock.field_stock_config_settings_security_lead
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.model.fields,help:sale_stock.field_res_config_settings_security_lead
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "Margin of error for dates promised to customers. Products will be scheduled for procurement and delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain."
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "Move forward expected delivery dates by"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:152
+#: code:addons/sale_stock/models/sale_order.py:168
 #, python-format
 msgid "Not enough inventory!"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_group_route_so_lines
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_group_route_so_lines
 msgid "Order-Specific Routes"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:162
+#: code:addons/sale_stock/models/sale_order.py:182
 #, python-format
 msgid "Ordered quantity decreased!"
 msgstr ""
@@ -169,12 +172,12 @@ msgstr ""
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_sale_order_picking_ids
-msgid "Picking associated to this sale"
+msgid "Pickings"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model,name:sale_stock.model_procurement_order
-msgid "Procurement"
+#: model:ir.model.fields,field_description:sale_stock.field_sale_order_procurement_group_id
+msgid "Procurement Group"
 msgstr ""
 
 #. module: sale_stock
@@ -183,12 +186,12 @@ msgid "Procurement Requisition"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model,name:sale_stock.model_product_product
-msgid "Product"
+#: model:ir.model,name:sale_stock.model_procurement_rule
+msgid "Procurement Rule"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs. By default, the scheduler runs automatically every 24 hours."
 msgstr ""
 
@@ -198,16 +201,26 @@ msgid "Route"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Routes for Sales Order Lines"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_procurement_group_sale_order_id
+#: model:ir.model.fields,field_description:sale_stock.field_stock_move_sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_procurement_group_sale_id
 msgid "Sale Order"
 msgstr ""
 
 #. module: sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.product_template_view_form_inherit_stock
+msgid "Sales"
+msgstr ""
+
+#. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_order
 #: model:ir.model.fields,field_description:sale_stock.field_stock_picking_sale_id
 msgid "Sales Order"
@@ -219,7 +232,7 @@ msgid "Sales Order Line"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_location_route_form_view_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.stock_location_route_view_form_inherit_sale_stock
 msgid "Sales Order Lines"
 msgstr ""
 
@@ -230,22 +243,21 @@ msgstr ""
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_res_company_security_lead
-#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_security_lead
 msgid "Sales Safety Days"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "Schedule deliveries earlier to avoid delays"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_security_lead
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_security_lead
 msgid "Security Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_default_new_security_lead
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_use_security_lead
 msgid "Security Lead Time for Sales"
 msgstr ""
 
@@ -255,17 +267,17 @@ msgid "Selectable on Sales Order Line"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Set a delivery date on orders"
 msgstr ""
 
 #. module: sale_stock
-#: selection:stock.config.settings,default_picking_policy:0
+#: selection:res.config.settings,default_picking_policy:0
 msgid "Ship all products at once"
 msgstr ""
 
 #. module: sale_stock
-#: selection:stock.config.settings,default_picking_policy:0
+#: selection:res.config.settings,default_picking_policy:0
 msgid "Ship products as soon as available, with back orders"
 msgstr ""
 
@@ -275,7 +287,7 @@ msgid "Shipping Information"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_default_picking_policy
+#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_default_picking_policy
 msgid "Shipping Management"
 msgstr ""
 
@@ -290,12 +302,17 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.sale_config_settings_view_form_inherit_sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_move_ids
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:209
+#: code:addons/sale_stock/models/sale_order.py:267
 #, python-format
 msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
 msgstr ""
@@ -312,45 +329,40 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:208
+#: code:addons/sale_stock/models/sale_order.py:266
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "When to reserve sold products"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "When to start shipping"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:163
+#: code:addons/sale_stock/models/sale_order.py:183
 #, python-format
 msgid "You are decreasing the ordered quantity! Do not forget to manually update the delivery order if needed."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:144
+#: code:addons/sale_stock/models/sale_order.py:160
 #, python-format
 msgid "You plan to sell %s %s but you only have %s %s available in %s warehouse."
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
 msgid "days"
 msgstr ""
 
 #. module: sale_stock
-#: model:ir.model,name:sale_stock.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale_stock
-#: model:ir.model,name:sale_stock.model_stock_config_settings
-msgid "stock.config.settings"
+#: model:ir.model,name:sale_stock.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot
index dc89413eb60..0865f27a991 100644
--- a/addons/sale_timesheet/i18n/sale_timesheet.pot
+++ b/addons/sale_timesheet/i18n/sale_timesheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/account_invoice.py:32
-#: code:addons/sale_timesheet/models/project.py:24
+#: code:addons/sale_timesheet/models/project.py:26
 #, python-format
 msgid "\n"
 "                <p class=\"oe_view_nocontent_create\">\n"
@@ -31,15 +31,14 @@ msgid "\n"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "<b>Total</b>"
+#: code:addons/sale_timesheet/controllers/main.py:24
+#, python-format
+msgid "%sh%s"
 msgstr ""
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "<span class=\"badge o_progress_billable_fixed\">Billable fixed</span>\n"
-"                                    <span class=\"badge o_progress_billable_time\">Billable time</span>\n"
-"                                    <span class=\"badge o_progress_non_billable\">Non billable</span>"
+msgid "<b>Total</b>"
 msgstr ""
 
 #. module: sale_timesheet
@@ -53,11 +52,6 @@ msgid "Analytic Line"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_procurement_id
-msgid "Assign to Order"
-msgstr ""
-
-#. module: sale_timesheet
 #: selection:account.analytic.line,timesheet_invoice_type:0
 msgid "Billable Fixed"
 msgstr ""
@@ -78,6 +72,16 @@ msgid "Billable Type"
 msgstr ""
 
 #. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Billable fixed"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Billable time"
+msgstr ""
+
+#. module: sale_timesheet
 #: model:ir.filters,name:sale_timesheet.timesheet_filter_billing
 msgid "Billing Rate"
 msgstr ""
@@ -85,23 +89,33 @@ msgstr ""
 #. module: sale_timesheet
 #: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_billing_report
 #: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_billing_analysis
-msgid "Billing Rate Analysis"
+msgid "By Billing Rate"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_res_company
-msgid "Companies"
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Cost"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "Cost"
+#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_report_cost_revenue
+#: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_report_cost_revenue
+msgid "Costs and Revenues"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_product_product_project_id
-#: model:ir.model.fields,help:sale_timesheet.field_product_template_project_id
-msgid "Create a task under this project on sales order validation. This setting must be set for each company."
+#: selection:product.template,service_tracking:0
+msgid "Create a new project but no task"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:product.template,service_tracking:0
+msgid "Create a task in a new project"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:product.template,service_tracking:0
+msgid "Create a task in an existing project"
 msgstr ""
 
 #. module: sale_timesheet
@@ -110,6 +124,11 @@ msgid "Currency"
 msgstr ""
 
 #. module: sale_timesheet
+#: selection:product.template,service_tracking:0
+msgid "Don't create task"
+msgstr ""
+
+#. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_hr_employee
 msgid "Employee"
 msgstr ""
@@ -141,6 +160,12 @@ msgid "Invoice"
 msgstr ""
 
 #. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_service_policy
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_template_service_policy
+msgid "Invoice based on"
+msgstr ""
+
+#. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_account_analytic_line_timesheet_invoice_id
 msgid "Invoice created from the timesheet"
 msgstr ""
@@ -151,55 +176,62 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.view_product_timesheet_form
-msgid "Keep empty to get a new project per order..."
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line_is_service
+msgid "Is service"
 msgstr ""
 
 #. module: sale_timesheet
-#: selection:account.analytic.line,timesheet_invoice_type:0
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "Non Billable"
+#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
+msgid "Milestone services"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
-msgid "Non Billable Hours"
+#: selection:product.template,service_policy:0
+msgid "Milestones (manually set quantities on order)"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_count
-msgid "Number of timesheets"
+#: selection:account.analytic.line,timesheet_invoice_type:0
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "No task found"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
-msgid "Order Line"
+#: selection:account.analytic.line,timesheet_invoice_type:0
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Non Billable"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
+msgid "Non Billable Hours"
 msgstr ""
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "Overview"
+msgid "Non billable"
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:43
-#, python-format
-msgid "Overview of %s"
+#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_count
+msgid "Number of timesheets"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_procurement_order
-msgid "Procurement"
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_service_tracking
+#: model:ir.model.fields,help:sale_timesheet.field_product_template_service_tracking
+msgid "On Sales order confirmation, this product can generate project and/or task. From thoses, you can track the service you are selling."
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_project_task_procurement_id
-msgid "Procurement of the sale order line on which the timesheets should be assigned"
+#: selection:product.template,service_policy:0
+msgid "Ordered quantities"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_product_product
-msgid "Product"
+#: code:addons/sale_timesheet/models/project.py:45
+#, python-format
+msgid "Overview"
 msgstr ""
 
 #. module: sale_timesheet
@@ -209,6 +241,7 @@ msgstr ""
 
 #. module: sale_timesheet
 #: model:ir.actions.act_window,name:sale_timesheet.product_template_action_fixed
+#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_milestone
 #: model:ir.actions.act_window,name:sale_timesheet.product_template_action_time_based
 msgid "Products"
 msgstr ""
@@ -222,7 +255,6 @@ msgstr ""
 #: model:ir.model,name:sale_timesheet.model_project_project
 #: model:ir.model.fields,field_description:sale_timesheet.field_product_product_project_id
 #: model:ir.model.fields,field_description:sale_timesheet.field_product_template_project_id
-#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
 msgid "Project"
 msgstr ""
 
@@ -232,6 +264,23 @@ msgid "Project associated to this sale"
 msgstr ""
 
 #. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
+msgid "Project(s) Overview"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/sale_order.py:107
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_project_ids
+#, python-format
+msgid "Projects"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_sale_order_project_ids
+msgid "Projects used in this sales order."
+msgstr ""
+
+#. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Rates"
 msgstr ""
@@ -242,46 +291,83 @@ msgid "Revenue"
 msgstr ""
 
 #. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_project_project_sale_line_id
+msgid "Sale order line from which the project has been created. Used for tracability."
+msgstr ""
+
+#. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_sale_order
 #: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
 msgid "Sales Order"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_sale_order_line
 #: model:ir.model.fields,field_description:sale_timesheet.field_project_task_sale_line_id
+#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
+msgid "Sales Order Item"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_sale_order_line
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_project_sale_line_id
 msgid "Sales Order Line"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
-#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
-#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_sale_order_line_is_service
+msgid "Sales Order item should generate a task and/or a project, depending on the product settings."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_project_id
+#: model:ir.model.fields,help:sale_timesheet.field_product_template_project_id
+msgid "Select a non billable project on which tasks can be created. This setting must be set for each company."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_service_tracking
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_template_service_tracking
+msgid "Service Tracking"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
 msgid "Setup your fixed price services"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
-#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
-#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
+msgid "Setup your milestone services"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
 msgid "Setup your time-based services"
 msgstr ""
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_project_task
-#: model:ir.model.fields,field_description:sale_timesheet.field_procurement_order_task_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line_task_id
 msgid "Task"
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/procurement.py:84
+#: code:addons/sale_timesheet/models/sale_order.py:234
 #, python-format
 msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
 msgstr ""
 
 #. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_sale_order_line_task_id
+msgid "Task generated by the sales order item"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:112
+#: code:addons/sale_timesheet/controllers/main.py:144
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_tasks_count
 #: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
+#, python-format
 msgid "Tasks"
 msgstr ""
 
@@ -296,18 +382,12 @@ msgid "There is no timesheet for now."
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/procurement.py:88
+#: code:addons/sale_timesheet/models/sale_order.py:237
 #, python-format
 msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.project_time_mode_id_duplicate_xmlid
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
-msgstr ""
-
-#. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Time and material"
 msgstr ""
@@ -324,10 +404,11 @@ msgstr ""
 
 #. module: sale_timesheet
 #. openerp-web
-#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:141
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:143
 #: model:ir.actions.act_window,name:sale_timesheet.action_timesheet_from_invoice
 #: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_from_plan
 #: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_plan_pivot
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_pivot_revenue
 #, python-format
 msgid "Timesheet"
 msgstr ""
@@ -338,11 +419,6 @@ msgid "Timesheet Cost"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.project_time_mode_id_duplicate_xmlid
-msgid "Timesheet UoM"
-msgstr ""
-
-#. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_timesheet_count
 msgid "Timesheet activities"
 msgstr ""
@@ -353,6 +429,8 @@ msgid "Timesheet activities associated to this sale"
 msgstr ""
 
 #. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:104
+#: code:addons/sale_timesheet/controllers/main.py:133
 #: code:addons/sale_timesheet/models/account_invoice.py:26
 #: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_ids
 #: model:ir.ui.view,arch_db:sale_timesheet.account_invoice_view_form_inherit_sale_timesheet
@@ -362,40 +440,34 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:18
+#: code:addons/sale_timesheet/models/project.py:20
 #, python-format
 msgid "Timesheets of %s"
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "To invoice"
+#: selection:product.template,service_policy:0
+msgid "Timesheets on tasks"
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/account.py:32
-#, python-format
-msgid "You can not modify already invoiced timesheets."
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "To invoice"
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:55
+#: code:addons/sale_timesheet/models/account.py:32
 #, python-format
-msgid "You can use only one product on timesheet within the same sales order. You should split your order to include only one contract based on time and material."
+msgid "You can not modify already invoiced timesheets (linked to a Sales order items invoiced on Time and material)."
 msgstr ""
 
 #. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:63
+#: code:addons/sale_timesheet/models/project.py:74
 #, python-format
 msgid "You cannot delete a task related to a Sales Order. You can only archive this task."
 msgstr ""
 
 #. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "hours"
-msgstr ""
-
-#. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
 msgid "per hour"
 msgstr ""
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index 3f83ca68144..356a649ae22 100644
--- a/addons/sales_team/i18n/sales_team.pot
+++ b/addons/sales_team/i18n/sales_team.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,34 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:91
-#, python-format
-msgid "3 exp. closing"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:139
-#, python-format
-msgid "35,029.39€"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:125
-#, python-format
-msgid "78,140.03€"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:171
-#, python-format
-msgid "80.000€"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
 msgid "<span>New</span>"
 msgstr ""
@@ -59,71 +31,32 @@ msgid "<span>View</span>"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_account_accountant
-msgid "Accounting"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_active
 msgid "Active"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:114
-#, python-format
-msgid "Activities Done"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.actions.act_window,name:sales_team.mail_activity_type_action_config_sales
-#: model:ir.ui.menu,name:sales_team.sales_team_menu_config_activity_types
 msgid "Activity Types"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
-msgid "Add to My Favorites"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
 msgid "Archived"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_action_res_partner_bank_form
-#: model:ir.ui.menu,name:sales_team.menu_config_bank_accounts
-msgid "Bank Accounts"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_action_res_bank_form
-msgid "Banks"
-msgstr ""
-
-#. module: sales_team
 #: selection:crm.team,dashboard_graph_type:0
 msgid "Bar"
 msgstr ""
 
 #. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:262
+#: code:addons/sales_team/models/crm_team.py:269
 #, python-format
 msgid "Big Pretty Button :)"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_crm
-msgid "CRM"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Cancel"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_user_id
 msgid "Channel Leader"
 msgstr ""
@@ -139,38 +72,18 @@ msgid "Channel Type"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.actions.act_window,help:sales_team.crm_team_act
 #: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
 #: model:ir.actions.act_window,help:sales_team.sales_team_config_action
 msgid "Click here to define a new sales channel."
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
-msgid "Click to add/remove from favorite"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:150
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:154
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:163
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:167
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:176
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:180
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:184
-#, python-format
-msgid "Click to set"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_color
 msgid "Color Index"
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_company_id
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_company_id
 msgid "Company"
 msgstr ""
 
@@ -180,87 +93,32 @@ msgid "Configuration"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.actions.act_window,name:sales_team.action_sale_config
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Configure Sales"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model,name:sales_team.model_res_partner
 msgid "Contact"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_partner_category_form
-msgid "Contact Tags"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_partner_title_contact
-msgid "Contact Titles"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_config_address_book
-msgid "Contacts"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_model
 msgid "Content"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_country_partner
-msgid "Countries"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_country_group
-msgid "Country Group"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:219
-#, python-format
-msgid "Create a few opportunities in it."
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_create_uid
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_create_date
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_action_currency_form
-msgid "Currencies"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_currency_id
 msgid "Currency"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_partner_form
-msgid "Customers"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:246
-#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
-#: model:ir.ui.menu,name:sales_team.menu_sales_team_act
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
-#, python-format
 msgid "Dashboard"
 msgstr ""
 
@@ -281,7 +139,6 @@ msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_display_name
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -296,11 +153,6 @@ msgid "Favorite teams to display them in the dashboard and access them easily."
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_country_state_partner
-msgid "Fed. States"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
 msgid "Follow this salesteam to automatically track the events associated to users of this team."
 msgstr ""
@@ -311,13 +163,6 @@ msgid "Graph"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:218
-#, python-format
-msgid "Great sales journeys start with a clean pipeline."
-msgstr ""
-
-#. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
 msgid "Group By..."
 msgstr ""
@@ -328,25 +173,12 @@ msgid "Group by"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_helpdesk
-msgid "Helpdesk"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:217
-#, python-format
-msgid "Hi there!"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_group
 msgid "How this channel's dashboard graph will group the results."
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_id
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_id
 msgid "ID"
 msgstr ""
 
@@ -362,45 +194,27 @@ msgid "If the active field is set to false, it will allow you to hide the sales
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Integrations"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:142
-#, python-format
-msgid "Invoiced"
-msgstr ""
-
-#. module: sales_team
 #: selection:crm.team,dashboard_graph_model:0
 msgid "Invoices"
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team___last_update
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:190
 #: selection:crm.team,dashboard_graph_period:0
-#, python-format
 msgid "Last Month"
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_write_uid
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_write_date
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -420,28 +234,11 @@ msgid "Line"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_localisation
-msgid "Localization"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Manage leads, opportunities, meetings and activities"
-msgstr ""
-
-#. module: sales_team
 #: model:res.groups,name:sales_team.group_sale_manager
 msgid "Manager"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:25
-#, python-format
-msgid "Meetings"
-msgstr ""
-
-#. module: sales_team
 #: selection:crm.team,dashboard_graph_group:0
 msgid "Month"
 msgstr ""
@@ -452,49 +249,12 @@ msgid "My Favorites"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:42
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:44
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:220
-#, python-format
-msgid "My Pipeline"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:50
-#, python-format
-msgid "Next 7 days"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:38
-#, python-format
-msgid "Next Activities"
-msgstr ""
-
-#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:248
+#: code:addons/sales_team/models/crm_team.py:255
 #, python-format
 msgid "Not Defined"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
-#, python-format
-msgid "Only Integer Value should be valid."
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
-#, python-format
-msgid "Performance"
-msgstr ""
-
-#. module: sales_team
 #: selection:crm.team,dashboard_graph_model:0
 msgid "Pipeline"
 msgstr ""
@@ -505,32 +265,14 @@ msgid "Point of Sale"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Recommended Apps"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
-msgid "Remove from My Favorites"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_reply_to
 msgid "Reply-To"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_sale_report
-msgid "Reporting"
-msgstr ""
-
-#. module: sales_team
 #: selection:crm.team,dashboard_graph_model:0
 #: model:crm.team,name:sales_team.team_sales_department
 #: selection:crm.team,team_type:0
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale
-#: model:ir.ui.menu,name:sales_team.menu_base_partner
-#: model:ir.ui.menu,name:sales_team.menu_sales
 msgid "Sales"
 msgstr ""
 
@@ -551,9 +293,8 @@ msgid "Sales Channel the user is member of. Used to compute the members of a sal
 msgstr ""
 
 #. module: sales_team
-#: model:ir.actions.act_window,name:sales_team.crm_team_act
+#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
 #: model:ir.actions.act_window,name:sales_team.sales_team_config_action
-#: model:ir.ui.menu,name:sales_team.sales_team_config
 msgid "Sales Channels"
 msgstr ""
 
@@ -573,37 +314,11 @@ msgid "Salesteams Search"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Save"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_period
 msgid "Scale"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.ui.menu,name:sales_team.res_partner_industry_menu
-msgid "Sectors of Activity"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Sell recurring services with automated billing"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Send quotations and manage invoicing"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Send, sign and approve documents online"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.menu,name:sales_team.menu_sale_general_settings
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
 msgid "Settings"
 msgstr ""
@@ -614,18 +329,6 @@ msgid "Show on dashboard"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale_contract
-msgid "Subscriptions"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:148
-#, python-format
-msgid "Target"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
 msgid "Team Leader"
 msgstr ""
@@ -667,93 +370,18 @@ msgid "The type of this channel, it will define the resources this channel uses.
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
-#, python-format
-msgid "This Month"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:29
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:61
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:76
-#, python-format
-msgid "To Activities"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:105
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:191
-#, python-format
-msgid "To Activity Report"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:16
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:51
-#, python-format
-msgid "To Calendar"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:132
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:202
-#, python-format
-msgid "To Invoice Report"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:86
-#, python-format
-msgid "To Opportunities"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:118
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:196
-#, python-format
-msgid "To Opportunity Report"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:13
-#, python-format
-msgid "To do"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:13
-#, python-format
-msgid "Today"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
-msgid "Track after-sales tickets"
-msgstr ""
-
-#. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_type
 msgid "Type"
 msgstr ""
 
 #. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:139
-#: code:addons/sales_team/models/crm_team.py:166
+#: code:addons/sales_team/models/crm_team.py:146
+#: code:addons/sales_team/models/crm_team.py:173
 #, python-format
 msgid "Undefined graph model for Sales Channel: %s"
 msgstr ""
 
 #. module: sales_team
-#: model:ir.actions.act_window,help:sales_team.crm_team_act
 #: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
 #: model:ir.actions.act_window,help:sales_team.sales_team_config_action
 msgid "Use sales channels to organize your sales departments. \n"
@@ -787,44 +415,6 @@ msgid "Week"
 msgstr ""
 
 #. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:128
-#, python-format
-msgid "Won in Opportunities"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
-#, python-format
-msgid "Wrong value entered!"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_website_sign
-msgid "eSign"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:89
-#, python-format
-msgid "exp. closing"
-msgstr ""
-
-#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:79
-#, python-format
-msgid "overdue"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model,name:sales_team.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sales_team
 #: model:res.groups,comment:sales_team.group_sale_salesman_all_leads
 msgid "the user will have access to all records of everyone in the sales application."
 msgstr ""
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 0653df5098f..4587faf8dd5 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:214
+#: code:addons/stock/models/stock_move.py:279
 #, python-format
 msgid " (%s reserved)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:217
+#: code:addons/stock/models/stock_move.py:282
 #, python-format
 msgid " (reserved)"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_state
 #: model:ir.model.fields,help:stock.field_stock_picking_state
 msgid " * Draft: not confirmed yet and will not be scheduled until confirmed\n"
 " * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
@@ -45,7 +44,7 @@ msgid "#Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:483
+#: code:addons/stock/models/stock_warehouse.py:480
 #, python-format
 msgid "%s: Supply Product from %s"
 msgstr ""
@@ -57,6 +56,7 @@ msgid "%s: Transit Location"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_line_state
 #: model:ir.model.fields,help:stock.field_stock_move_state
 msgid "* New: When the stock move is created and not yet confirmed.\n"
 "* Waiting Another Move: This state can be seen when a move is waiting for another one, for example in a chained flow.\n"
@@ -133,6 +133,11 @@ msgid "<span class=\"label label-default text-center odoo_purple\">Validate the
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_inventory_form
+msgid "<span class=\"o_stat_text\">Details</span>"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
 #: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
 msgid "<span class=\"o_stat_text\">Forecasted</span>"
@@ -259,6 +264,16 @@ msgid "<span>You need to install the Sales Management app for this flow.</span>"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
+msgid "<span>kg</span>"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
+msgid "<span>m³</span>"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Activate <i>Track lots or serial numbers</i></strong> in your"
 msgstr ""
@@ -355,6 +370,16 @@ msgid "<strong>Manufacture:</strong> the product is manufactured internally or t
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_warehouse_orderpoint_kanban
+msgid "<strong>Max qty :</strong>"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_warehouse_orderpoint_kanban
+msgid "<strong>Min qty :</strong>"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>No address defined on the supplier partner:</strong> you have to complete an address for the default supplier for the product concerned."
 msgstr ""
@@ -408,6 +433,11 @@ msgid "<strong>Production Lot</strong>"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_move_kanban
+msgid "<strong>Qty: </strong>"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Quantity</strong>"
@@ -470,6 +500,12 @@ msgid "A classic sales flow looks like the following:"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_move_line.py:83
+#, python-format
+msgid "A done move line should never have a reserved quantity."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "A good inventory management aims to optimize stock levels: not too low (or\n"
 "                        you may find yourself out of stock) and not too high (your products occupy\n"
@@ -477,6 +513,20 @@ msgid "A good inventory management aims to optimize stock levels: not too low (o
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_quant.py:71
+#, python-format
+msgid "A serial number should only be linked to a single product."
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_product_type
+msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+"A consumable product, on the other hand, is a product for which stock is not managed.\n"
+"A service is a non-material product you provide.\n"
+"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
+msgstr ""
+
+#. module: stock
 #: model:res.groups,name:stock.group_warning_stock
 msgid "A warning can be set on a partner (Stock)"
 msgstr ""
@@ -492,6 +542,12 @@ msgid "Accurate visibility on all your operations"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_action
+msgid "Action"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_active
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_active
 #: model:ir.model.fields,field_description:stock.field_stock_location_active
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_active
@@ -503,18 +559,13 @@ msgid "Active"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Add an internal note that will be printed on the Picking Operations sheet"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_adv_location
+#: model:ir.model.fields,help:stock.field_res_config_settings_group_stock_adv_location
 msgid "Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. \n"
 " You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks)."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks)."
 msgstr ""
 
@@ -540,7 +591,7 @@ msgid "Advanced"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Advanced Scheduling"
 msgstr ""
 
@@ -555,23 +606,17 @@ msgid "All"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_children_quant_ids
-msgid "All Bulk Content"
-msgstr ""
-
-#. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_type_list
 msgid "All Operations"
 msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.stock_picking_action_picking_type
-#: model:ir.ui.menu,name:stock.all_picking
 msgid "All Transfers"
 msgstr ""
 
 #. module: stock
-#: selection:stock.picking,move_type:0
+#: selection:procurement.group,move_type:0
 msgid "All at once"
 msgstr ""
 
@@ -592,20 +637,15 @@ msgid "All returned moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/procurement.py:221
-#, python-format
-msgid "All stock moves have been cancelled for this procurement."
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_entire_packs
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_entire_packs
 msgid "Allow moving packs"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_ancestor_ids
-msgid "Ancestors"
+#: code:addons/stock/models/stock_quant.py:77
+#, python-format
+msgid "An incoming date cannot be set to an untracked product."
 msgstr ""
 
 #. module: stock
@@ -629,7 +669,7 @@ msgid "Applicable on Warehouse"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
 msgid "Applied On"
 msgstr ""
 
@@ -640,13 +680,14 @@ msgstr ""
 #: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
 #: model:ir.ui.view,arch_db:stock.view_location_search
 #: model:ir.ui.view,arch_db:stock.view_pickingtype_filter
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
 #: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
 msgid "Archived"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
-msgid "Ask New Products"
+#: selection:stock.picking,move_type:0
+msgid "As soon as possible"
 msgstr ""
 
 #. module: stock
@@ -666,16 +707,11 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_attribute_action
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Attributes"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_product_variant
-msgid "Attributes & Variants"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_auto
 msgid "Automatic Move"
 msgstr ""
@@ -686,11 +722,6 @@ msgid "Automatic No Step Added"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_procurement
-msgid "Automatic Procurements"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_string_availability_info
 msgid "Availability"
 msgstr ""
@@ -707,11 +738,6 @@ msgid "Available Products"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Avoid stock-outs with purchase requests based on demand and stock levels"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_backorder_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_backorder_id
 msgid "Back Order of"
@@ -723,13 +749,13 @@ msgid "Back Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_backorder_confirmation.py:30
+#: code:addons/stock/wizard/stock_backorder_confirmation.py:26
 #, python-format
 msgid "Back order <em>%s</em> <b>cancelled</b>."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:987
+#: code:addons/stock/models/stock_picking.py:660
 #, python-format
 msgid "Back order <em>%s</em> <b>created</b>."
 msgstr ""
@@ -745,7 +771,7 @@ msgid "Backorder creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:66
+#: code:addons/stock/models/stock_picking.py:73
 #, python-format
 msgid "Backorder exists"
 msgstr ""
@@ -772,11 +798,16 @@ msgid "Barcode Nomenclatures"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_barcode
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_stock_barcode
 msgid "Barcode Scanner"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_stock_picking_batch
+msgid "Batch Pickings"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Before creating your products, here are a few concepts your should understand:"
 msgstr ""
@@ -793,11 +824,15 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_quant_ids
-#: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Bulk Content"
 msgstr ""
 
 #. module: stock
+#: selection:procurement.rule,action:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock
 #: selection:product.template,tracking:0
 msgid "By Lots"
 msgstr ""
@@ -808,7 +843,7 @@ msgid "By Unique Serial Number"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:386
+#: code:addons/stock/models/stock_move.py:555
 #, python-format
 msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order."
 msgstr ""
@@ -859,13 +894,13 @@ msgid "Calendar View"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:430
+#: code:addons/stock/models/stock_warehouse.py:428
 #, python-format
 msgid "Can't find any customer or supplier location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:478
+#: code:addons/stock/models/stock_warehouse.py:475
 #, python-format
 msgid "Can't find any generic Make To Order route."
 msgstr ""
@@ -873,10 +908,8 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
 #: model:ir.ui.view,arch_db:stock.view_immediate_transfer
-#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 #: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 #: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
 msgid "Cancel"
 msgstr ""
@@ -894,7 +927,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:349
+#: code:addons/stock/models/stock_move.py:430
 #, python-format
 msgid "Cannot unreserve a done move"
 msgstr ""
@@ -916,22 +949,27 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Change must be higher than"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_line_move_id
+msgid "Change to a better name"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Check Availability"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_quant_reserved_exist
-msgid "Check the existance of quants linked to this picking"
+#: model:ir.model.fields,help:stock.field_stock_picking_has_packages
+msgid "Check the existence of destination packages on move lines"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_pack_operation_exist
+#: model:ir.model.fields,help:stock.field_stock_picking_move_line_exist
 msgid "Check the existence of pack operation on the picking"
 msgstr ""
 
@@ -952,11 +990,6 @@ msgid "Checked Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_partially_available
-msgid "Checks if the move has some stock reserved"
-msgstr ""
-
-#. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_form
 #: model:ir.actions.act_window,help:stock.action_picking_tree_all
 #: model:ir.actions.act_window,help:stock.action_picking_tree_backorder
@@ -970,8 +1003,8 @@ msgid "Click here to create a new transfer."
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_deliver_move
-msgid "Click to add a delivery order for this product."
+#: model:ir.actions.act_window,help:stock.action_stock_scrap
+msgid "Click here to scrap products."
 msgstr ""
 
 #. module: stock
@@ -1030,16 +1063,6 @@ msgid "Click to register a product receipt."
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_receive_move
-msgid "Click to register a receipt for this product."
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_scrap
-msgid "Click to scrap products."
-msgstr ""
-
-#. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
 msgid "Click to start an inventory."
 msgstr ""
@@ -1060,7 +1083,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_company_id
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_company_id
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_company_id
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_company_id
 #: model:ir.model.fields,field_description:stock.field_stock_location_company_id
@@ -1083,16 +1106,6 @@ msgid "Completion Date of Transfer"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_procurement_orderpoint_compute
-msgid "Compute Minimum Stock Rules"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
-msgid "Compute Stock"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
 msgid "Conditions"
 msgstr ""
@@ -1104,11 +1117,15 @@ msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 msgid "Configure Warehouse"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Confirmed"
 msgstr ""
@@ -1124,19 +1141,18 @@ msgid "Congratulations!"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_owner
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_tracking_owner
 msgid "Consignment"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_res_partner
-msgid "Contact"
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_consume_line_ids
+msgid "Consume Line"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_children_ids
-#: model:ir.ui.view,arch_db:stock.view_quant_package_form
-msgid "Contained Packages"
+#: model:ir.model,name:stock.model_res_partner
+msgid "Contact"
 msgstr ""
 
 #. module: stock
@@ -1155,7 +1171,7 @@ msgid "Corridor (X)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_immediate_transfer.py:30
+#: code:addons/stock/wizard/stock_immediate_transfer.py:29
 #, python-format
 msgid "Could not reserve all requested products. Please use the 'Mark as Todo' button to handle the reservation manually."
 msgstr ""
@@ -1191,12 +1207,17 @@ msgid "Count Picking Waiting"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
+msgid "Counterpart Locations"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "Create Backorder"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:821
+#: code:addons/stock/models/stock_picking.py:607
 #, python-format
 msgid "Create Backorder?"
 msgstr ""
@@ -1254,18 +1275,12 @@ msgid "Created Moves"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_procurement_ids
-msgid "Created Procurements"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_create_uid
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_create_uid
+#: model:ir.model.fields,field_description:stock.field_procurement_group_create_uid
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_create_uid
 #: model:ir.model.fields,field_description:stock.field_product_putaway_create_uid
 #: model:ir.model.fields,field_description:stock.field_product_removal_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_create_uid
@@ -1275,9 +1290,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_move_create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_picking_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_create_uid
@@ -1285,20 +1298,21 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_create_uid
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_create_date
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_create_date
+#: model:ir.model.fields,field_description:stock.field_procurement_group_create_date
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_create_date
 #: model:ir.model.fields,field_description:stock.field_product_putaway_create_date
 #: model:ir.model.fields,field_description:stock.field_product_removal_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_create_date
@@ -1307,22 +1321,23 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_create_date
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_picking_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_create_date
+#: model:ir.model.fields,field_description:stock.field_stock_quant_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_create_date
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_create_date
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
 msgid "Creates"
 msgstr ""
 
@@ -1335,7 +1350,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_move_create_date
 #: model:ir.model.fields,field_description:stock.field_stock_picking_date
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_quant_create_date
 msgid "Creation Date"
 msgstr ""
 
@@ -1345,7 +1359,7 @@ msgid "Creation Date, usually the time of the order"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:435
+#: code:addons/stock/models/stock_warehouse.py:433
 #, python-format
 msgid "Cross-Dock"
 msgstr ""
@@ -1361,6 +1375,16 @@ msgid "Cumulative Quantity"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_current_picking_id
+msgid "Current Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_current_picking_move_line_ids
+msgid "Current Picking Move Line"
+msgstr ""
+
+#. module: stock
 #: model:ir.actions.act_window,name:stock.location_open_quants
 #: model:ir.ui.view,arch_db:stock.view_location_form
 msgid "Current Stock"
@@ -1376,18 +1400,13 @@ msgid "Current quantity of products.\n"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:103
+#: code:addons/stock/models/stock_picking.py:111
 #: model:ir.ui.view,arch_db:stock.view_location_search
 #, python-format
 msgid "Customer"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_order_partner_dest_id
-msgid "Customer Address"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_sale_delay
 #: model:ir.model.fields,field_description:stock.field_product_template_sale_delay
 msgid "Customer Lead Time"
@@ -1412,6 +1431,12 @@ msgid "Customers"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "DATE"
+msgstr ""
+
+#. module: stock
 #: model:stock.incoterms,name:stock.incoterm_DAF
 msgid "DELIVERED AT FRONTIER"
 msgstr ""
@@ -1447,8 +1472,8 @@ msgid "DELIVERED EX SHIP"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_dhl
-msgid "DHL"
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_dhl
+msgid "DHL USA"
 msgstr ""
 
 #. module: stock
@@ -1465,7 +1490,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_date
 #: model:ir.model.fields,field_description:stock.field_stock_move_date
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_date
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_date
 #: model:ir.ui.view,arch_db:stock.stock_move_tree
 msgid "Date"
 msgstr ""
@@ -1564,7 +1589,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
 msgid "Delay"
 msgstr ""
 
@@ -1574,32 +1599,25 @@ msgid "Delay (days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:346
+#: code:addons/stock/models/product.py:332
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_deliver_move
-#: model:ir.ui.view,arch_db:stock.product_kanban_stock_view
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 msgid "Deliveries"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_product_product_delivery_count
-#: model:ir.ui.view,arch_db:stock.product_kanban_stock_view
-msgid "Delivery"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:210
+#: code:addons/stock/models/stock_warehouse.py:209
 #: model:stock.picking.type,name:stock.picking_type_out
 #, python-format
 msgid "Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_tracking_lot
 msgid "Delivery Packages"
 msgstr ""
 
@@ -1609,11 +1627,16 @@ msgid "Delivery Route"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_delivery
+#: model:ir.actions.report,name:stock.action_report_delivery
 msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_group_move_type
+msgid "Delivery Type"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,help:stock.field_product_product_route_ids
 #: model:ir.model.fields,help:stock.field_product_template_route_ids
 msgid "Depending on the modules installed, this will allow you to define the route of the product: whether it will be bought, manufactured, MTO/MTS,..."
@@ -1641,11 +1664,6 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
-msgid "Description for Internal Transfers (Rack, Row and Case Information)"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "Description for Receptions"
 msgstr ""
 
@@ -1681,25 +1699,17 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_location_dest_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_location_dest_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_location_dest_id
-msgid "Destination Location"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_destination_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_location_dest_id
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
-msgid "Destination Location Zone"
+msgid "Destination Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_order_move_dest_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_move_dest_id
-msgid "Destination Move"
+#: model:ir.model.fields,field_description:stock.field_stock_move_move_dest_ids
+msgid "Destination Moves"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_result_package_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_result_package_id
 msgid "Destination Package"
 msgstr ""
 
@@ -1709,30 +1719,40 @@ msgid "Destination route"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_move.py:408
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+#, python-format
+msgid "Detailed Operations"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
 msgid "Details"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_show_details_visible
+msgid "Details Visible"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_procure_method
 msgid "Determines the procurement method of the stock move that will be generated: whether it will need to 'take from the available stock' in its source location or needs to ignore its stock and create a procurement over there."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form_save
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form
+#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
 msgid "Discard"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_display_name
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_display_name
+#: model:ir.model.fields,field_description:stock.field_procurement_group_display_name
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_display_name
 #: model:ir.model.fields,field_description:stock.field_product_putaway_display_name
 #: model:ir.model.fields,field_description:stock.field_product_removal_display_name
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_display_name
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_display_name
@@ -1742,9 +1762,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_move_display_name
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_display_name
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_display_name
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_display_name
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_picking_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_display_name
@@ -1752,7 +1770,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_display_name
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_display_name
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_display_name
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_display_name
 msgid "Display Name"
@@ -1764,11 +1784,11 @@ msgid "Do not hesitate to send us an email to describe your experience or to sug
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_is_done
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_qty
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_qty_done
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_qty_done
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
 #: model:ir.ui.view,arch_db:stock.view_move_search
+#: model:ir.ui.view,arch_db:stock.view_picking_form
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
@@ -1787,7 +1807,7 @@ msgid "Done Transfers by Date"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Don’t propagate scheduling changes through chains of operations"
 msgstr ""
 
@@ -1797,6 +1817,13 @@ msgid "Download the"
 msgstr ""
 
 #. module: stock
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_line.xml:78
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 #: selection:stock.inventory,state:0
 #: selection:stock.picking,state:0
@@ -1825,8 +1852,10 @@ msgid "End"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Engage successfully with your customers thanks to an integrated supply chain"
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_backend.xml:14
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: stock
@@ -1839,7 +1868,7 @@ msgid "Every stock operation in Odoo moves the products from one\n"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:672
+#: code:addons/stock/models/stock_quant.py:389
 #, python-format
 msgid "Everything inside a package should be in the same location"
 msgstr ""
@@ -1862,7 +1891,7 @@ msgid "Expected Date"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_product_expiry
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_product_expiry
 msgid "Expiration Dates"
 msgstr ""
 
@@ -1872,12 +1901,6 @@ msgid "External note..."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:961
-#, python-format
-msgid "Extra Move: "
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_product_removal_method
 msgid "FIFO, LIFO..."
 msgstr ""
@@ -1898,7 +1921,7 @@ msgid "FREE ON BOARD"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_fedex
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_fedex
 msgid "FedEx"
 msgstr ""
 
@@ -1908,6 +1931,11 @@ msgid "Filters"
 msgstr ""
 
 #. module: stock
+#: selection:procurement.rule,group_propagation_option:0
+msgid "Fixed"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_putaway
 msgid "Fixed Locations Per Categories"
 msgstr ""
@@ -1918,6 +1946,11 @@ msgid "Fixed Locations Per Product Category"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_group_id
+msgid "Fixed Procurement Group"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "For the Odoo Team,<br/>\n"
 "                            Fabien Pinckaers, Founder"
@@ -1947,7 +1980,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:341
+#: code:addons/stock/models/product.py:327
 #: model:ir.model.fields,field_description:stock.field_product_template_virtual_available
 #: model:ir.model.fields,field_description:stock.field_stock_move_availability
 #, python-format
@@ -1955,52 +1988,67 @@ msgid "Forecasted Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_from_loc
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_location_id
 msgid "From"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_from_loc
+msgid "From Loc"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_show_reserved_availability
+msgid "From Supplier"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_complete_name
 msgid "Full Location Name"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:344
+#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
+msgid "Future Activities"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:330
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:349
+#: code:addons/stock/models/product.py:335
 #, python-format
 msgid "Future P&L"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:359
+#: code:addons/stock/models/product.py:345
 #, python-format
 msgid "Future Productions"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:354
+#: code:addons/stock/models/product.py:340
 #, python-format
 msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:336
+#: code:addons/stock/models/product.py:322
 #, python-format
 msgid "Future Receipts"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Get a full traceability from vendors to customers"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Get informative or blocking warnings on partners"
 msgstr ""
 
@@ -2011,6 +2059,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_filter
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
 msgid "Global"
 msgstr ""
 
@@ -2026,6 +2075,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.search_product_lot_filter
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
 #: model:ir.ui.view,arch_db:stock.view_inventory_filter
 #: model:ir.ui.view,arch_db:stock.view_move_search
@@ -2042,13 +2092,13 @@ msgid "Group by..."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_form_stock_inherit
-msgid "Group's Pickings"
+#: model:ir.model.fields,field_description:stock.field_stock_picking_move_line_exist
+msgid "Has Pack Operations"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_exist
-msgid "Has Pack Operations"
+#: model:ir.model.fields,field_description:stock.field_stock_picking_has_packages
+msgid "Has Packages"
 msgstr ""
 
 #. module: stock
@@ -2057,11 +2107,6 @@ msgid "Has Scrap Moves"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_quant_reserved_exist
-msgid "Has quants already reserved"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_posz
 msgid "Height (Z)"
 msgstr ""
@@ -2087,38 +2132,18 @@ msgid "Here you can receive individual products, no matter what\n"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_deliver_move
-msgid "Here you will find the history of all past deliveries related to\n"
-"                this product, as well as all the products you must deliver to\n"
-"                customers."
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_receive_move
-msgid "Here you will find the history of all receipts related to\n"
-"                this product, as well as all future receipts you are waiting\n"
-"                from your suppliers."
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
-msgid "History"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "How to use Lot Tracking:"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_id
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_id
+#: model:ir.model.fields,field_description:stock.field_procurement_group_id
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_id
 #: model:ir.model.fields,field_description:stock.field_product_putaway_id
 #: model:ir.model.fields,field_description:stock.field_product_removal_id
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_id
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_id
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_id
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_id
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_id
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_id
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_id
@@ -2128,40 +2153,35 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_id
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_id
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_id
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8797
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_6870
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_id
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_id
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_id
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_id
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_id
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_id
 msgid "ID"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_inventory.py:392
+#: code:addons/stock/models/stock_inventory.py:406
 #, python-format
 msgid "INV:"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:94
 #, python-format
 msgid "INV: %s"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_name
-msgid "Identifier"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "If a product is not at the right place, set the checked quantity to 0 and create a new line with correct location."
 msgstr ""
@@ -2188,7 +2208,7 @@ msgid "If checked, when this move is cancelled, cancel the linked move too"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_result_package_id
+#: model:ir.model.fields,help:stock.field_stock_move_line_result_package_id
 msgid "If set, the operations are packed into this package"
 msgstr ""
 
@@ -2203,13 +2223,26 @@ msgid "If the active field is set to False, it will allow you to hide the route
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "If the picking is unlocked you can edit initial demand (for a draft picking) or done quantities (for a done picking)."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_filter
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
 msgid "If the route is global"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_negative_move_id
-msgid "If this is a negative quant, this will be the move that caused this negative quant."
+#: model:ir.model.fields,help:stock.field_stock_picking_type_show_reserved
+msgid "If this checkbox is ticked, Odoo will show which products are reserved (lot/serial number, source location, source package)."
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_show_operations
+#: model:ir.model.fields,help:stock.field_stock_picking_show_operations
+#: model:ir.model.fields,help:stock.field_stock_picking_type_show_operations
+msgid "If this checkbox is ticked, the pickings lines will represent detailed stock operations. If not, the picking lines will represent an aggregate of detailed stock operations."
 msgstr ""
 
 #. module: stock
@@ -2229,6 +2262,11 @@ msgid "If this shipment was split, then this field links to the shipment which c
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,help:stock.field_procurement_rule_active
+msgid "If unchecked, it will allow you to hide the rule without removing it."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "If you are a developer <strong>you can use our\n"
 "                        API</strong> to load data automatically through\n"
@@ -2265,7 +2303,7 @@ msgid "Immediate Transfer"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:803
+#: code:addons/stock/models/stock_picking.py:585
 #, python-format
 msgid "Immediate Transfer?"
 msgstr ""
@@ -2276,7 +2314,7 @@ msgid "Immediate transfer?"
 msgstr ""
 
 #. module: stock
-#: selection:stock.config.settings,module_procurement_jit:0
+#: selection:res.config.settings,module_procurement_jit:0
 msgid "Immediately after sales order confirmation"
 msgstr ""
 
@@ -2303,11 +2341,6 @@ msgid "In Type"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_order_partner_dest_id
-msgid "In case of dropshipping, we need to know the destination address more precisely"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "In case of unique serial numbers, each serial number corresponds\n"
 "                        to exactly one piece.  In case of lots, you need to supply the quantity\n"
@@ -2328,6 +2361,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_incoming_qty
 #: model:ir.model.fields,field_description:stock.field_product_template_incoming_qty
+#: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Incoming"
 msgstr ""
 
@@ -2367,6 +2401,7 @@ msgid "Incoterms are series of sales terms. They are used to divide transaction
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_product_uom_qty
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Initial Demand"
 msgstr ""
@@ -2394,6 +2429,7 @@ msgid "Inter Company Transit"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.view_location_search
 #: selection:stock.picking.type,code:0
 msgid "Internal"
@@ -2416,7 +2452,7 @@ msgid "Internal Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:232
+#: code:addons/stock/models/stock_warehouse.py:231
 #: model:stock.picking.type,name:stock.picking_type_internal
 #, python-format
 msgid "Internal Transfers"
@@ -2438,19 +2474,19 @@ msgid "Internal reference number in case it differs from the manufacturer's lot/
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:258
+#: code:addons/stock/models/product.py:240
 #, python-format
 msgid "Invalid domain left operand %s"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:260
+#: code:addons/stock/models/product.py:242
 #, python-format
 msgid "Invalid domain operator %s"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:262
+#: code:addons/stock/models/product.py:244
 #, python-format
 msgid "Invalid domain right operand %s"
 msgstr ""
@@ -2496,11 +2532,13 @@ msgid "Inventories Month"
 msgstr ""
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.quantsact
 #: model:ir.actions.act_window,name:stock.stock_picking_type_action
-#: model:ir.actions.report.xml,name:stock.action_report_inventory
+#: model:ir.actions.report,name:stock.action_report_inventory
 #: model:ir.model,name:stock.model_stock_inventory
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_inventory_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_inventory_id
+#: model:ir.ui.menu,name:stock.menu_quants
 #: model:ir.ui.menu,name:stock.menu_stock_root
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_pivot
 msgid "Inventory"
@@ -2534,6 +2572,7 @@ msgid "Inventory Date"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_inventory_line_tree2
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "Inventory Details"
 msgstr ""
@@ -2544,6 +2583,11 @@ msgid "Inventory Line"
 msgstr ""
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_line_tree
+msgid "Inventory Lines"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_property_stock_inventory
 #: model:ir.model.fields,field_description:stock.field_product_template_property_stock_inventory
 msgid "Inventory Location"
@@ -2586,21 +2630,12 @@ msgid "Inventory Settings"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.quantsact
-#: model:ir.ui.menu,name:stock.menu_quants
-#: model:ir.ui.view,arch_db:stock.quant_search_view
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_form
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_graph_value
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
 msgid "Inventory Valuation"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_inventory_value
-msgid "Inventory Value"
-msgstr ""
-
-#. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory adjustment"
 msgstr ""
@@ -2617,6 +2652,13 @@ msgid "Inventory of"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_is_locked
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_is_locked
+#: model:ir.model.fields,field_description:stock.field_stock_picking_is_locked
+msgid "Is Locked"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_return_location
 msgid "Is a Return Location?"
 msgstr ""
@@ -2627,12 +2669,30 @@ msgid "Is a Scrap Location?"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_is_initial_demand_editable
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_is_initial_demand_editable
+msgid "Is initial demand editable"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "It is also possible to import your initial inventory from an Excel or CSV file.\n"
 "                        If you want to do that, contact your Odoo project manager."
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_quant.py:240
+#, python-format
+msgid "It is not possible to reserve more products than you have in stock."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_quant.py:242
+#, python-format
+msgid "It is not possible to unreserve more products than you have in stock."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "It is therefore a good idea to check and try to resolve those procurement\n"
 "                        exceptions. These are accessible from the Schedulers menu (you need the Stock\n"
@@ -2655,19 +2715,30 @@ msgid "It specifies goods to be deliver partially or all at once"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "LOCATION"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "LOT/SERIAL NUMBER"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_last_done_picking
 msgid "Last 10 Done Pickings"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement___last_update
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute___last_update
+#: model:ir.model.fields,field_description:stock.field_procurement_group___last_update
+#: model:ir.model.fields,field_description:stock.field_procurement_rule___last_update
 #: model:ir.model.fields,field_description:stock.field_product_putaway___last_update
 #: model:ir.model.fields,field_description:stock.field_product_removal___last_update
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty___last_update
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms___last_update
@@ -2677,9 +2748,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_location_route___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_move___last_update
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link___last_update
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation___last_update
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot___last_update
+#: model:ir.model.fields,field_description:stock.field_stock_move_line___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_picking___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot___last_update
@@ -2687,20 +2756,21 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line___last_update
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_scrap___last_update
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse___last_update
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_write_uid
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_write_uid
+#: model:ir.model.fields,field_description:stock.field_procurement_group_write_uid
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_write_uid
 #: model:ir.model.fields,field_description:stock.field_product_putaway_write_uid
 #: model:ir.model.fields,field_description:stock.field_product_removal_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_write_uid
@@ -2709,10 +2779,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_location_write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_move_write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_picking_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_write_uid
@@ -2720,20 +2788,21 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_quant_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_write_uid
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_write_date
-#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_write_date
+#: model:ir.model.fields,field_description:stock.field_procurement_group_write_date
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_write_date
 #: model:ir.model.fields,field_description:stock.field_product_putaway_write_date
 #: model:ir.model.fields,field_description:stock.field_product_removal_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_write_date
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_write_date
@@ -2742,10 +2811,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_location_write_date
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_write_date
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_move_write_date
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_write_date
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_picking_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_write_date
@@ -2753,14 +2820,16 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_stock_quant_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_write_date
+#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_write_date
+#: model:ir.model.fields,field_description:stock.field_stock_traceability_report_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_write_date
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:64
+#: code:addons/stock/models/stock_picking.py:71
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 #, python-format
@@ -2768,13 +2837,13 @@ msgid "Late"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree_late
-msgid "Late Transfers"
+#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
+msgid "Late Activities"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_launch_pack_operations
-msgid "Launch Pack Operations"
+#: model:ir.actions.act_window,name:stock.action_picking_tree_late
+msgid "Late Transfers"
 msgstr ""
 
 #. module: stock
@@ -2788,6 +2857,11 @@ msgid "Lead Type"
 msgstr ""
 
 #. module: stock
+#: selection:procurement.rule,group_propagation_option:0
+msgid "Leave Empty"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_company_id
 msgid "Leave this field empty if this route is shared between all companies"
 msgstr ""
@@ -2799,6 +2873,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_company_id
+#: model:ir.model.fields,help:stock.field_stock_quant_company_id
 msgid "Let this field empty if this location is shared between companies"
 msgstr ""
 
@@ -2809,18 +2884,8 @@ msgid "Like with the sales flow, Odoo inventory management is\n"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_linked_move_operation_ids
-msgid "Linked Moves"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_linked_move_operation_ids
-msgid "Linked Operations"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_propagated_from_id
-msgid "Linked Quant"
+#: model:ir.ui.view,arch_db:stock.view_inventory_form
+msgid "List view of lines"
 msgstr ""
 
 #. module: stock
@@ -2839,6 +2904,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_product_template_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_fixed_location_id
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_inventory_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_location_id
@@ -2854,7 +2920,7 @@ msgid "Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_location_barcode
+#: model:ir.actions.report,name:stock.action_report_location_barcode
 msgid "Location BarCode"
 msgstr ""
 
@@ -2888,39 +2954,40 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
 #: model:ir.ui.view,arch_db:stock.view_picking_type_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 #: model:ir.ui.view,arch_db:stock.view_warehouse
 msgid "Locations"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Lock"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.product_category_form_view_inherit
 #: model:ir.ui.view,arch_db:stock.view_location_form
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "Logistics"
 msgstr ""
 
 #. module: stock
 #: code:addons/stock/models/barcode.py:13
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_lot_id
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_lot_id
 #, python-format
 msgid "Lot"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_lot_barcode
+#: model:ir.actions.report,name:stock.action_report_lot_barcode
 msgid "Lot BarCode"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Lot Split"
-msgstr ""
-
-#. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 msgid "Lot/Serial"
 msgstr ""
@@ -2928,11 +2995,11 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_lot_id
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prod_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_restrict_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_lot_name
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_lot_name
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_name
 #: model:ir.model.fields,field_description:stock.field_stock_quant_lot_id
+#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
+#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
 #: model:ir.ui.view,arch_db:stock.quant_search_view
 #: model:ir.ui.view,arch_db:stock.report_lot_barcode
 #: model:ir.ui.view,arch_db:stock.report_package_barcode
@@ -2941,34 +3008,17 @@ msgid "Lot/Serial Number"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:198
-#, python-format
-msgid "Lot/Serial Number Details"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_tree
 msgid "Lot/Serial Number Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:280
-#, python-format
-msgid "Lot/Serial Number required"
-msgstr ""
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_pack_operation_lot
-msgid "Lot/Serial number for pack ops"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_production_lot
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_production_lot
 msgid "Lots & Serial Numbers"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_lots_visible
 msgid "Lots Visible"
 msgstr ""
 
@@ -2982,7 +3032,6 @@ msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model.fields,field_description:stock.field_stock_move_lot_ids
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:ir.ui.view,arch_db:stock.view_production_lot_form
 #: model:ir.ui.view,arch_db:stock.view_production_lot_tree
@@ -2990,11 +3039,6 @@ msgid "Lots/Serial Numbers"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_pack_lot_ids
-msgid "Lots/Serial Numbers Used"
-msgstr ""
-
-#. module: stock
 #: code:addons/stock/models/stock_warehouse.py:534
 #, python-format
 msgid "MTO"
@@ -3006,12 +3050,7 @@ msgid "MTO rule"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_make_procurement
-msgid "Make Procurements"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:476
+#: code:addons/stock/models/stock_warehouse.py:473
 #: model:stock.location.route,name:stock.route_warehouse0_mto
 #, python-format
 msgid "Make To Order"
@@ -3063,17 +3102,12 @@ msgid "Manage product manufacturing chains"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Manage quality control points, checks and measures"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Manage several warehouses"
 msgstr ""
 
@@ -3088,12 +3122,17 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: selection:stock.config.settings,module_procurement_jit:0
+#: selection:res.config.settings,module_procurement_jit:0
 msgid "Manually or based on automatic scheduler"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_mrp
+#: selection:procurement.rule,action:0
+msgid "Manufacture"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 msgid "Manufacturing"
 msgstr ""
 
@@ -3108,13 +3147,13 @@ msgid "Mark as Todo"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_max_date
-msgid "Max. Expected Date"
+#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_product_max_qty
+msgid "Maximum Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_product_max_qty
-msgid "Maximum Quantity"
+#: model:ir.actions.server,name:stock.quant_merge_action
+msgid "Merge duplicate quants"
 msgstr ""
 
 #. module: stock
@@ -3124,7 +3163,6 @@ msgid "Message for Stock Picking"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_product_putaway_method
 #: model:ir.model.fields,field_description:stock.field_product_removal_method
 msgid "Method"
 msgstr ""
@@ -3145,11 +3183,6 @@ msgid "Minimum Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_order_orderpoint_id
-msgid "Minimum Stock Rule"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_orderpoint_ids
 msgid "Minimum Stock Rules"
 msgstr ""
@@ -3160,11 +3193,6 @@ msgid "Misc"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Modify"
-msgstr ""
-
-#. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
 msgid "Most operations are prepared automatically by Odoo according\n"
 "                to your preconfigured logistics rules, but you can also record\n"
@@ -3172,25 +3200,35 @@ msgid "Most operations are prepared automatically by Odoo according\n"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_move_id
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_move_id
 msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/procurement.py:54
-#, python-format
+#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
+msgid "Move Detail"
+msgstr ""
+
+#. module: stock
+#: selection:procurement.rule,action:0
 msgid "Move From Another Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_negative_move_id
-msgid "Move Negative Quant"
+#: model:ir.model.fields,field_description:stock.field_stock_move_move_line_ids
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_move_line_ids
+msgid "Move Line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_move_line_nosuggest_ids
+msgid "Move Line Nosuggest"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_split_from
-msgid "Move Split From"
+#: model:ir.ui.view,arch_db:stock.view_move_line_form
+#: model:ir.ui.view,arch_db:stock.view_move_line_tree
+msgid "Move Lines"
 msgstr ""
 
 #. module: stock
@@ -3209,21 +3247,7 @@ msgid "Move that created the return move"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_order_move_dest_id
-msgid "Move which caused (created) the procurement"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_quant_ids
-#: model:ir.ui.view,arch_db:stock.view_move_form
-#: model:ir.ui.view,arch_db:stock.view_move_picking_form
-msgid "Moved Quants"
-msgstr ""
-
-#. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.model.fields,field_description:stock.field_procurement_order_move_ids
-#: model:ir.model.fields,field_description:stock.field_stock_quant_history_ids
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_product_return_moves
 #: model:ir.ui.view,arch_db:stock.stock_move_tree
 #: model:ir.ui.view,arch_db:stock.view_move_tree
@@ -3233,32 +3257,17 @@ msgid "Moves"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_order_move_ids
-msgid "Moves created by the procurement"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_group_id
 msgid "Moves created through this orderpoint will be put in this procurement group. If none is given, the moves generated by procurement rules will be grouped into one big picking."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_linked_move_operation_ids
-msgid "Moves impacted by this operation for the computation of the remaining quantities"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_history_ids
-msgid "Moves that operate(d) on this quant"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_adv_location
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_adv_location
 msgid "Multi-Step Routes"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_warehouses
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_multi_warehouses
 msgid "Multi-Warehouses"
 msgstr ""
 
@@ -3268,6 +3277,7 @@ msgid "My Activities"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_name
 #: model:ir.model.fields,field_description:stock.field_product_putaway_name
 #: model:ir.model.fields,field_description:stock.field_product_removal_name
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_name
@@ -3276,17 +3286,8 @@ msgid "Name"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.quant_search_view
-msgid "Negative"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_negative_dest_location_id
-msgid "Negative Destination Location"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.product_template_search_form_view_stock
+#: model:ir.ui.view,arch_db:stock.quant_search_view
 msgid "Negative Stock"
 msgstr ""
 
@@ -3300,6 +3301,12 @@ msgid "New"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_picking.py:510
+#, python-format
+msgid "New Move:"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_new_quantity
 msgid "New Quantity on Hand"
 msgstr ""
@@ -3310,11 +3317,6 @@ msgid "New Transfer"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_fresh_record
-msgid "Newly created pack operation"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "No Backorder"
 msgstr ""
@@ -3325,8 +3327,8 @@ msgid "No Message"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_default_new_propagation_minimum_delta
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_propagation_minimum_delta
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_propagation_minimum_delta
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_use_propagation_minimum_delta
 msgid "No Rescheduling Propagation"
 msgstr ""
 
@@ -3336,26 +3338,32 @@ msgid "No Tracking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:834
+#: code:addons/stock/models/stock_move_line.py:299
 #, python-format
 msgid "No negative quantities allowed"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:60
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "No operation made on this lot."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/procurement.py:185
 #, python-format
-msgid "No products to return (only lines in Done state and not fully returned yet can be returned)!"
+msgid "No procurement rule found. Please verify the configuration of your routes"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/procurement.py:182
+#: code:addons/stock/wizard/stock_picking_return.py:55
 #, python-format
-msgid "No source location defined!"
+msgid "No products to return (only lines in Done state and not fully returned yet can be returned)!"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_product_ids
-msgid "Non pack"
+#: code:addons/stock/models/procurement.py:67
+#, python-format
+msgid "No source location defined on procurement rule: %s!"
 msgstr ""
 
 #. module: stock
@@ -3378,7 +3386,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:468
+#: code:addons/stock/models/stock_picking.py:458
 #, python-format
 msgid "Nothing to check the availability for."
 msgstr ""
@@ -3404,7 +3412,7 @@ msgid "Number of days needed to transfer the goods"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:68
+#: code:addons/stock/models/stock_picking.py:75
 #, python-format
 msgid "OK"
 msgstr ""
@@ -3440,6 +3448,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
 #: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
 msgid "On Hand"
 msgstr ""
 
@@ -3489,18 +3498,6 @@ msgid "One product only"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_operation_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_operation_id
-msgid "Operation"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:214
-#, python-format
-msgid "Operation Details"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_name
 msgid "Operation Name"
 msgstr ""
@@ -3539,9 +3536,11 @@ msgid "Operation Types Name"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_move_line_ids
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:stock.view_picking_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "Operations"
 msgstr ""
 
@@ -3551,11 +3550,6 @@ msgid "Operations Types"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_linked_move_operation_ids
-msgid "Operations that impact this move for the computation of the remaining quantities"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_partner_id
 msgid "Optional address where goods are to be delivered, specifically used for allotment"
 msgstr ""
@@ -3573,7 +3567,7 @@ msgid "Optional: all returned moves created from this move"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_move_dest_id
+#: model:ir.model.fields,help:stock.field_stock_move_move_dest_ids
 msgid "Optional: next stock move when chaining them"
 msgstr ""
 
@@ -3588,8 +3582,8 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_ordered_qty
 #: model:ir.model.fields,field_description:stock.field_stock_move_ordered_qty
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_ordered_qty
 msgid "Ordered Quantity"
 msgstr ""
 
@@ -3620,12 +3614,6 @@ msgid "Original Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:226
-#, python-format
-msgid "Otherwise make sure the right stock/owner is set."
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_out_type_id
 msgid "Out Type"
 msgstr ""
@@ -3633,6 +3621,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_outgoing_qty
 #: model:ir.model.fields,field_description:stock.field_product_template_outgoing_qty
+#: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Outgoing"
 msgstr ""
 
@@ -3654,14 +3643,9 @@ msgid "Output Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_partner_id
 #: model:ir.model.fields,field_description:stock.field_stock_location_partner_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_owner_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_owner_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_owner_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_owner_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_owner_id
@@ -3681,32 +3665,34 @@ msgid "Owner of the location if not internal"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_owner_id
+#: model:ir.model.fields,help:stock.field_stock_move_line_owner_id
 msgid "Owner of the quants"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:351
+#: code:addons/stock/models/product.py:337
 #, python-format
 msgid "P&L Qty"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:217
-#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_package_id
-#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_pack_ids
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_backend.xml:6
 #, python-format
-msgid "Pack"
+msgid "PRINT"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.pack_details
-msgid "Pack Details"
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "PRODUCT"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_operation_link
-msgid "Pack Operation / Moves Link"
+#: code:addons/stock/models/stock_warehouse.py:216
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_package_id
+#, python-format
+msgid "Pack"
 msgstr ""
 
 #. module: stock
@@ -3727,12 +3713,12 @@ msgid "Package"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_quant_package_barcode_small
+#: model:ir.actions.report,name:stock.action_report_quant_package_barcode_small
 msgid "Package BarCode"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_quant_package_barcode
+#: model:ir.actions.report,name:stock.action_report_quant_package_barcode
 msgid "Package BarCode with Contents"
 msgstr ""
 
@@ -3748,11 +3734,6 @@ msgid "Package Reference"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Package To Move"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Package Transfers"
 msgstr ""
@@ -3766,7 +3747,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_package_view
 #: model:ir.ui.menu,name:stock.menu_package
 #: model:ir.ui.menu,name:stock.menu_packages_config
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
+#: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Packages"
 msgstr ""
 
@@ -3786,7 +3767,7 @@ msgid "Packing Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_pack_operation
+#: model:ir.model,name:stock.model_stock_move_line
 msgid "Packing Operation"
 msgstr ""
 
@@ -3815,17 +3796,12 @@ msgid "Parent Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_parent_id
-msgid "Parent Package"
-msgstr ""
-
-#. module: stock
-#: selection:stock.picking,move_type:0
+#: selection:procurement.group,move_type:0
 msgid "Partial"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_partially_available
+#: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Partially Available"
 msgstr ""
@@ -3876,7 +3852,7 @@ msgid "Physical Packages"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:225
+#: code:addons/stock/models/stock_warehouse.py:224
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_pick_id
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_pick_id
 #, python-format
@@ -3884,13 +3860,13 @@ msgid "Pick"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:437
+#: code:addons/stock/models/stock_warehouse.py:435
 #, python-format
 msgid "Pick + Pack + Ship"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:436
+#: code:addons/stock/models/stock_warehouse.py:434
 #, python-format
 msgid "Pick + Ship"
 msgstr ""
@@ -3901,6 +3877,7 @@ msgid "Pick Type"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_return_picking_picking_id
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_picking_id
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Picking"
@@ -3917,13 +3894,13 @@ msgid "Picking Lists"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.action_report_picking
-msgid "Picking Operations"
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
+msgid "Picking Moves"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_picking_wave
-msgid "Picking Waves"
+#: model:ir.actions.report,name:stock.action_report_picking
+msgid "Picking Operations"
 msgstr ""
 
 #. module: stock
@@ -3932,7 +3909,7 @@ msgid "Picking list"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.procurement_group_form_view_herited
+#: model:ir.ui.view,arch_db:stock.procurement_group_form_view
 msgid "Pickings"
 msgstr ""
 
@@ -3957,41 +3934,31 @@ msgid "Pivot"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_date_planned
-msgid "Planned Date"
-msgstr ""
-
-#. module: stock
 #: model:ir.model,name:stock.model_web_planner
 msgid "Planner"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:790
+#: code:addons/stock/models/stock_picking.py:562
 #, python-format
-msgid "Please create some Initial Demand or Mark as Todo and create some Operations. "
+msgid "Please add some lines to move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:1026
+#: code:addons/stock/models/stock_picking.py:691
 #, python-format
 msgid "Please process some quantities to put in the pack first!"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:139
+#: code:addons/stock/wizard/stock_picking_return.py:126
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_plus_visible
-msgid "Plus Visible"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_search_view
-msgid "Positive"
+msgid "Positive Stock"
 msgstr ""
 
 #. module: stock
@@ -4000,19 +3967,8 @@ msgid "Preferred Packaging"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_route_ids
-#: model:ir.model.fields,field_description:stock.field_procurement_order_route_ids
-msgid "Preferred Routes"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_route_ids
-msgid "Preferred route to be followed by the procurement order"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_order_route_ids
-msgid "Preferred route to be followed by the procurement order. Usually copied from the generating document (SO) but could be set up manually."
+msgid "Preferred route"
 msgstr ""
 
 #. module: stock
@@ -4038,24 +3994,21 @@ msgid "Priority for this picking. Setting manually a value here would set it as
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Process operations faster with barcodes"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Process picking in batch per worker"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_procurement_order
-#: model:ir.model.fields,field_description:stock.field_stock_move_procurement_id
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_procurement_action
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Procurement Exceptions"
 msgstr ""
@@ -4069,23 +4022,11 @@ msgid "Procurement Group"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_order_location_id
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_location_id
-#: model:ir.model.fields,field_description:stock.field_product_product_property_stock_procurement
-#: model:ir.model.fields,field_description:stock.field_product_template_property_stock_procurement
 msgid "Procurement Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_make_procurement
-#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
-#: model:ir.ui.view,arch_db:stock.product_product_view_form_easy_inherit_stock
-#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
-#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
-msgid "Procurement Request"
-msgstr ""
-
-#. module: stock
 #: model:ir.model,name:stock.model_procurement_group
 msgid "Procurement Requisition"
 msgstr ""
@@ -4093,37 +4034,52 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_procurement_rule
 #: model:ir.model.fields,field_description:stock.field_stock_move_rule_id
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
 msgid "Procurement Rule"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.procrules
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_pull_ids
 #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_tree
 msgid "Procurement Rules"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.do_view_procurement_op
-#: model:ir.ui.view,arch_db:stock.view_warehouse_orderpoint_form
+#: model:ir.ui.view,arch_db:stock.procurement_group_form_view
+msgid "Procurement group"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.server,name:stock.ir_cron_scheduler_action_ir_actions_server
+#: model:ir.cron,cron_name:stock.ir_cron_scheduler_action
+#: model:ir.cron,name:stock.ir_cron_scheduler_action
+msgid "Procurement: run MRP scheduler"
+msgstr ""
+
+#. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:361
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_produce_line_ids
+msgid "Produce Line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:347
 #, python-format
 msgid "Produced Qty"
 msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
-#: model:ir.model.fields,field_description:stock.field_make_procurement_product_id
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_product_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_product_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_product_id
@@ -4140,7 +4096,7 @@ msgid "Product"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_location.py:163
+#: code:addons/stock/models/stock_location.py:170
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_categ_ids
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
@@ -4170,14 +4126,21 @@ msgid "Product Lots Filter"
 msgstr ""
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.stock_move_line_action
+#: model:ir.ui.menu,name:stock.stock_move_line_menu
+#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
+#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
+msgid "Product Moves"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_product_name
 msgid "Product Name"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
 #: model:ir.ui.menu,name:stock.menu_product_packagings
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Product Packages"
 msgstr ""
 
@@ -4185,10 +4148,16 @@ msgstr ""
 #: model:ir.model,name:stock.model_product_template
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_product_tmpl_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_product_tmpl_id
+#: model:ir.model.fields,field_description:stock.field_stock_quant_product_tmpl_id
 msgid "Product Template"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_product_type
+msgid "Product Type"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Product Types"
 msgstr ""
@@ -4210,6 +4179,11 @@ msgid "Product this lot/serial number contains. You cannot change it anymore if
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_has_tracking
+msgid "Product with Tracking"
+msgstr ""
+
+#. module: stock
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
@@ -4222,30 +4196,28 @@ msgid "Production Location"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_location.py:152
+#: code:addons/stock/models/stock_location.py:160
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 #: model:ir.actions.act_window,name:stock.product_template_action_product
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_product_ids
 #: model:ir.ui.menu,name:stock.menu_product_in_config_stock
 #: model:ir.ui.menu,name:stock.menu_product_variant_config_stock
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
 #: model:ir.ui.view,arch_db:stock.view_location_form
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
-#: model:ir.ui.view,arch_db:stock.view_production_lot_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 #, python-format
 msgid "Products"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_scrap
-msgid "Products you scrap will be removed from the stock and moved to a specific scrap location, for reporting purposes."
+#: code:addons/stock/models/product.py:310
+#, python-format
+msgid "Products: "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:324
-#, python-format
-msgid "Products: "
+#: selection:procurement.rule,group_propagation_option:0
+msgid "Propagate"
 msgstr ""
 
 #. module: stock
@@ -4256,8 +4228,13 @@ msgid "Propagate cancel and split"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_purchase
-msgid "Purchase"
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
+msgid "Propagation Options"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_group_propagation_option
+msgid "Propagation of Procurement Group"
 msgstr ""
 
 #. module: stock
@@ -4294,7 +4271,7 @@ msgid "Put Away Strategy"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Put your products in packs (e.g. parcels, boxes) and track them"
 msgstr ""
 
@@ -4304,6 +4281,12 @@ msgid "Putaway"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+msgid "QUANTITY"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_qty_multiple
 msgid "Qty Multiple"
 msgstr ""
@@ -4315,7 +4298,6 @@ msgstr ""
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:98
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_quality
 #, python-format
 msgid "Quality Control"
 msgstr ""
@@ -4326,25 +4308,25 @@ msgid "Quality Control Location"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:261
-#, python-format
-msgid "Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_qty
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_quantity
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_qty
-#: model:ir.model.fields,field_description:stock.field_stock_move_product_uom_qty
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_qty
-#: model:ir.model.fields,field_description:stock.field_stock_quant_qty
+#: model:ir.model.fields,field_description:stock.field_stock_quant_quantity
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_quantity
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_scrap_qty
 #: model:ir.ui.view,arch_db:stock.report_package_barcode
+#: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Quantity"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_quantity_done
+#: model:ir.ui.view,arch_db:stock.view_move_line_form
+#: model:ir.ui.view,arch_db:stock.view_move_line_tree
+#: model:ir.ui.view,arch_db:stock.view_stock_move_line_kanban
+msgid "Quantity Done"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_warehouse_orderpoint_form
 msgid "Quantity Multiple"
 msgstr ""
@@ -4352,16 +4334,19 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_qty_available
 #: model:ir.model.fields,field_description:stock.field_product_template_qty_available
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
 msgid "Quantity On Hand"
 msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_reserved_availability
+#: model:ir.ui.view,arch_db:stock.view_move_line_form
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
 msgid "Quantity Reserved"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_product_qty.py:77
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -4377,12 +4362,7 @@ msgid "Quantity in the default UoM of the product"
 msgstr ""
 
 #. module: stock
-#: sql_constraint:stock.pack.operation.lot:0
-msgid "Quantity must be greater than or equal to 0.0!"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_qty
+#: model:ir.model.fields,help:stock.field_stock_quant_quantity
 msgid "Quantity of products in this quant, in the default unit of measure of the product"
 msgstr ""
 
@@ -4403,8 +4383,8 @@ msgid "Quantity of products that are planned to leave.\n"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_operation_link_qty
-msgid "Quantity of products to consider when talking about the contribution of this pack operation towards the remaining quantity of the move (and inverse). Given in the product main uom."
+#: model:ir.model.fields,help:stock.field_stock_quant_reserved_quantity
+msgid "Quantity of reserved products in this quant, in the default unit of measure of the product"
 msgstr ""
 
 #. module: stock
@@ -4416,11 +4396,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.lot_open_quants
 #: model:ir.model,name:stock.model_stock_quant
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_quant_ids
-#: model:ir.ui.view,arch_db:stock.view_quant_package_form
+#: model:ir.ui.view,arch_db:stock.quant_search_view
 msgid "Quants"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_quant.py:65
+#, python-format
+msgid "Quants cannot be created for consumables or services."
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_rate_picking_backorders
 msgid "Rate Picking Backorders"
 msgstr ""
@@ -4439,14 +4425,14 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_product_qty
+#: model:ir.ui.view,arch_db:stock.stock_inventory_line_tree2
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "Real Quantity"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_product_product_reception_count
-#: model:ir.ui.view,arch_db:stock.product_kanban_stock_view
-msgid "Receipt"
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_product_qty
+msgid "Real Reserved Quantity"
 msgstr ""
 
 #. module: stock
@@ -4455,27 +4441,25 @@ msgid "Receipt Route"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:434
+#: code:addons/stock/models/stock_warehouse.py:432
 #, python-format
 msgid "Receipt in 1 step"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:434
+#: code:addons/stock/models/stock_warehouse.py:432
 #, python-format
 msgid "Receipt in 2 steps"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:435
+#: code:addons/stock/models/stock_warehouse.py:433
 #, python-format
 msgid "Receipt in 3 steps"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:203
-#: model:ir.actions.act_window,name:stock.action_receive_move
-#: model:ir.ui.view,arch_db:stock.product_kanban_stock_view
+#: code:addons/stock/models/stock_warehouse.py:202
 #: model:stock.picking.type,name:stock.picking_type_in
 #, python-format
 msgid "Receipts"
@@ -4487,34 +4471,28 @@ msgid "Receive goods directly in stock (1 step)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:338
+#: code:addons/stock/models/product.py:324
 #, python-format
 msgid "Received Qty"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Recheck Availability"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Recommended Apps"
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
+msgid "Receptions"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Recompute"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_recompute_pack_op
-msgid "Recompute pack operation?"
+msgid "Recheck Availability"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_group_name
 #: model:ir.model.fields,field_description:stock.field_stock_picking_name
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_name
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
+#: model:ir.ui.view,arch_db:stock.view_move_line_form
+#: model:ir.ui.view,arch_db:stock.view_move_line_tree
 #: model:ir.ui.view,arch_db:stock.view_move_search
 #: model:ir.ui.view,arch_db:stock.view_move_tree
 #: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking
@@ -4538,23 +4516,8 @@ msgid "Reference of the document"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_ids
-msgid "Related Packing Operations"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_remaining_qty
-msgid "Remaining Qty"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_remaining_qty
-msgid "Remaining Quantity"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_remaining_qty
-msgid "Remaining Quantity in default UoM according to operations matched with this move"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Register lots, packs, location"
 msgstr ""
 
 #. module: stock
@@ -4563,11 +4526,6 @@ msgid "Remaining parts of picking partially processed"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_remaining_qty
-msgid "Remaining quantity in default UoM according to moves matched with this operation."
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_removal
 msgid "Removal"
 msgstr ""
@@ -4579,7 +4537,7 @@ msgid "Removal Strategy"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:470
+#: code:addons/stock/models/stock_quant.py:100
 #, python-format
 msgid "Removal strategy %s not implemented."
 msgstr ""
@@ -4621,34 +4579,37 @@ msgid "Reporting"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_res_model
-msgid "Res Model"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_default_new_propagation_minimum_delta
+#: model:ir.model.fields,help:stock.field_res_config_settings_use_propagation_minimum_delta
 msgid "Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n"
 " This option allows to not propagate the rescheduling if the change is not critical."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. This option allows to not propagate the rescheduling if the change is not critical."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_procurement_jit
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_procurement_jit
 msgid "Reservation"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.quant_search_view
+msgid "Reservations"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_product_uom_qty
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
 msgid "Reserved"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_reserved_quant_id
-msgid "Reserved Quant"
+#: model:ir.model.fields,field_description:stock.field_stock_quant_reserved_quantity
+msgid "Reserved Quantity"
 msgstr ""
 
 #. module: stock
@@ -4657,28 +4618,19 @@ msgid "Reserved Quants"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_reservation_id
-msgid "Reserved for Move"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_reserved_quant_ids
-msgid "Reserved quants"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_module_procurement_jit
+#: model:ir.model.fields,help:stock.field_res_config_settings_module_procurement_jit
 msgid "Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Reset Operations"
+#: model:ir.ui.view,arch_db:stock.inventory_planner
+msgid "Resolve Procurement Exceptions"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.inventory_planner
-msgid "Resolve Procurement Exceptions"
+#: model:ir.model.fields,field_description:stock.field_product_product_responsible_id
+#: model:ir.model.fields,field_description:stock.field_product_template_responsible_id
+msgid "Responsible"
 msgstr ""
 
 #. module: stock
@@ -4708,7 +4660,13 @@ msgid "Return Picking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:161
+#: code:addons/stock/wizard/stock_picking_return.py:97
+#, python-format
+msgid "Return of %s"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_picking_return.py:147
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -4772,50 +4730,27 @@ msgid "Rules"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_procurement_compute
-#: model:ir.ui.menu,name:stock.menu_procurement_compute
-msgid "Run Reordering Rules"
+#: model:ir.model,name:stock.model_stock_scheduler_compute
+msgid "Run Scheduler Manually"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_proc_schedulers
+#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
 msgid "Run Schedulers"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_template_property_form
-msgid "Sale Conditions"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_sale
-msgid "Sales"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Sales Flow"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form_save
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Save"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Scheduled"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_min_date
+#: model:ir.model.fields,field_description:stock.field_stock_picking_scheduled_date
 msgid "Scheduled Date"
 msgstr ""
 
@@ -4825,29 +4760,19 @@ msgid "Scheduled date for the processing of this move"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_module_stock_calendar
-msgid "Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).\n"
-"By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_min_date
+#: model:ir.model.fields,help:stock.field_stock_picking_scheduled_date
 msgid "Scheduled time for the first part of the shipment to be processed. Setting manually a value here would set it as expected date for all the stock moves."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_max_date
-msgid "Scheduled time for the last part of the shipment to be processed"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_sched
-msgid "Schedulers"
+#: model:ir.actions.act_window,name:stock.action_procurement_compute
+#: model:ir.ui.menu,name:stock.menu_procurement_compute
+msgid "Scheduler"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:1038
-#: model:ir.actions.act_window,name:stock.action_stock_scrap
+#: code:addons/stock/models/stock_picking.py:700
+#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_ids
 #: model:ir.ui.menu,name:stock.menu_stock_scrap
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
@@ -4868,12 +4793,23 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_scrap
+msgid "Scrap Orders"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_scrapped
 #: model:stock.location,name:stock.stock_location_scrapped
 msgid "Scrapped"
 msgstr ""
 
 #. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_scrap
+msgid "Scrapping a product will remove it from your stock. The product will\n"
+"                end up in a scrap location that can be used for reporting purpose."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Scraps"
 msgstr ""
@@ -4884,6 +4820,16 @@ msgid "Search Inventory"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_inventory_line_search
+msgid "Search Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
+msgid "Search Procurement"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
 msgid "Search Scrap"
 msgstr ""
@@ -4911,11 +4857,12 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Sell and purchase products in different units of measure"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_procurement_rule_sequence
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_sequence
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_sequence
 #: model:ir.model.fields,field_description:stock.field_stock_move_sequence
@@ -4925,31 +4872,31 @@ msgid "Sequence"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:680
+#: code:addons/stock/models/stock_warehouse.py:678
 #, python-format
 msgid "Sequence in"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:684
+#: code:addons/stock/models/stock_warehouse.py:682
 #, python-format
 msgid "Sequence internal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:681
+#: code:addons/stock/models/stock_warehouse.py:679
 #, python-format
 msgid "Sequence out"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:682
+#: code:addons/stock/models/stock_warehouse.py:680
 #, python-format
 msgid "Sequence packing"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:683
+#: code:addons/stock/models/stock_warehouse.py:681
 #, python-format
 msgid "Sequence picking"
 msgstr ""
@@ -4965,12 +4912,12 @@ msgid "Served Warehouse"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Set Putaway Strategies on Locations"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Set Warehouse Routes"
 msgstr ""
 
@@ -4980,17 +4927,17 @@ msgid "Set a specific removal strategy that will be used regardless of the sourc
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Set expiration dates on lots &amp; serial numbers"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Set owner on stored products"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Set product attributes (e.g. color, size) to manage variants"
 msgstr ""
 
@@ -5026,7 +4973,7 @@ msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:436
+#: code:addons/stock/models/stock_warehouse.py:434
 #, python-format
 msgid "Ship Only"
 msgstr ""
@@ -5037,27 +4984,32 @@ msgid "Ship directly from stock (Ship only)"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Ship with DHL"
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+msgid "Ship with DHL USA"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Ship with FedEx"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Ship with UPS"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Ship with USPS"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+msgid "Ship with bpost"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Shipping Connectors"
 msgstr ""
 
@@ -5067,7 +5019,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods."
 msgstr ""
 
@@ -5082,6 +5034,18 @@ msgid "Short name used to identify your warehouse"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_show_operations
+#: model:ir.model.fields,field_description:stock.field_stock_picking_show_operations
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_operations
+msgid "Show Detailed Operations"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_reserved
+msgid "Show Reserved"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Show all records which has next action date is before today"
 msgstr ""
@@ -5092,12 +5056,6 @@ msgid "Show various information on stock availability for this move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:798
-#, python-format
-msgid "Some products require lots/serial numbers, so you need to specify those first!"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Source"
 msgstr ""
@@ -5113,19 +5071,16 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_location_src_id
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_location_from_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_location_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_location_id
 msgid "Source Location"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_source_location_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_location_id
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
 msgid "Source Location Zone"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_package_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_package_id
 msgid "Source Package"
 msgstr ""
 
@@ -5160,11 +5115,6 @@ msgid "Specify Product to focus your inventory on a particular Product."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form_save
-msgid "Split"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "Start Inventory"
 msgstr ""
@@ -5172,10 +5122,11 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_state
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_state
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_state
 #: model:ir.model.fields,field_description:stock.field_stock_move_state
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_state
 #: model:ir.model.fields,field_description:stock.field_stock_picking_state
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_state
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.view_inventory_filter
 #: model:ir.ui.view,arch_db:stock.view_move_search
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -5226,6 +5177,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 #: model:ir.model.fields,field_description:stock.field_product_product_stock_move_ids
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_move_id
 msgid "Stock Move"
 msgstr ""
 
@@ -5233,12 +5185,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.stock_move_action
 #: model:ir.model.fields,field_description:stock.field_stock_picking_move_lines
 #: model:ir.ui.menu,name:stock.stock_move_menu
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 #: model:ir.ui.view,arch_db:stock.view_move_form
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
 #: model:ir.ui.view,arch_db:stock.view_move_picking_tree
 #: model:ir.ui.view,arch_db:stock.view_move_search
-#: model:ir.ui.view,arch_db:stock.view_production_lot_form
+#: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Stock Moves"
 msgstr ""
 
@@ -5267,12 +5220,13 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn
 #: model:ir.model.fields,field_description:stock.field_res_users_picking_warn
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_picking_id
 msgid "Stock Picking"
 msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_stock_quant_ids
+#: model:ir.ui.view,arch_db:stock.stock_quant_view_graph
 msgid "Stock Quant"
 msgstr ""
 
@@ -5292,22 +5246,17 @@ msgid "Stock moves that have been processed"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_stock_multi_locations
 msgid "Storage Locations"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_multi_locations
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.model.fields,help:stock.field_res_config_settings_group_stock_multi_locations
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Streamline your manufacturing operations with an integrated inventory management"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_supplied_wh_id
 msgid "Supplied Warehouse"
 msgstr ""
@@ -5338,11 +5287,6 @@ msgid "Technical Information"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_operation_link_reserved_quant_id
-msgid "Technical field containing the quant that created this link between an operation and a stock move. Used at the stock_move_obj.action_done() time to avoid seeking a matching quant again"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_warehouse_id
 msgid "Technical field depicting the warehouse to consider for the route selection on the next procurement (if any)."
 msgstr ""
@@ -5353,28 +5297,23 @@ msgid "Technical field used for resupply routes between warehouses that belong t
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_restrict_lot_id
-msgid "Technical field used to depict a restriction on the lot/serial number of quants to consider when marking this move as 'done'"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_restrict_partner_id
 msgid "Technical field used to depict a restriction on the ownership of quants to consider when marking this move as 'done'"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_negative_dest_location_id
-msgid "Technical field used to record the destination location of a move that created a negative quant"
+#: model:ir.model.fields,help:stock.field_stock_move_price_unit
+msgid "Technical field used to record the product cost set by the user during a picking confirmation (when costing method used is 'average price' or 'real'). Value given in company currency and in product uom."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_price_unit
-msgid "Technical field used to record the product cost set by the user during a picking confirmation (when costing method used is 'average price' or 'real'). Value given in company currency and in product uom."
+#: model:ir.model.fields,help:stock.field_stock_move_line_produce_line_ids
+msgid "Technical link to see which line was produced with this. "
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_split_from
-msgid "Technical field used to track the origin of a split move, which can be useful in case of debug"
+#: model:ir.model.fields,help:stock.field_stock_move_line_consume_line_ids
+msgid "Technical link to see who consumed what. "
 msgstr ""
 
 #. module: stock
@@ -5389,7 +5328,6 @@ msgid "Technical: used to compute quantities."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_product_tmpl_id
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_tmpl_id
 msgid "Template"
 msgstr ""
@@ -5431,17 +5369,12 @@ msgid "The company is automatically set from your user preferences."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_company_id
-msgid "The company to which the quants belong"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_inventory_date
 msgid "The date that will be used for the stock level check of the products and the validation of the stock move related to this inventory."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:144
+#: code:addons/stock/models/stock_warehouse.py:143
 #, python-format
 msgid "The default resupply warehouse should be different than the warehouse itself!"
 msgstr ""
@@ -5452,32 +5385,16 @@ msgid "The demand represented by a procurement from e.g. a sale order, a reorder
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:519
-#, python-format
-msgid "The destination location must be the same for all the moves of the picking."
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.product_category_form_view_inherit
 msgid "The following routes will apply to the products in this category taking into account parent categories:"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_reservation_id
-msgid "The move the quant is reserved for"
-msgstr ""
-
-#. module: stock
 #: sql_constraint:stock.warehouse:0
 msgid "The name of the warehouse must be unique per company!"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_propagated_from_id
-msgid "The negative quant this is coming from"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_path_location_dest_id
 msgid "The new location where the goods need to go"
 msgstr ""
@@ -5496,11 +5413,6 @@ msgid "The operation type system allows you to assign each stock\n"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_quant_package_parent_id
-msgid "The package containing this item"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_quant_package_id
 msgid "The package containing this quant"
 msgstr ""
@@ -5511,12 +5423,6 @@ msgid "The parent location that includes this location. Example : The 'Dispatch
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_picking.py:787
-#, python-format
-msgid "The pick is already validated"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_qty_multiple
 msgid "The procurement quantity will be rounded up to this multiple.  If it is 0, the exact quantity will be used."
 msgstr ""
@@ -5532,29 +5438,18 @@ msgid "The push rule that created this stock move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:170
-#, python-format
-msgid "The quantity to split should be smaller than the quantity To Do.  "
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "The quotation becomes a Sales Order and a Transfer Order is created"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:166
+#: code:addons/stock/models/stock_move.py:237
+#: code:addons/stock/models/stock_move_line.py:77
 #, python-format
 msgid "The requested operation cannot be processed because of a programming error setting the `product_qty` field instead of the `product_uom_qty`."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:828
-#, python-format
-msgid "The roundings of your unit of measure %s on the move vs. %s on the product don't allow to do these operations or you are not transferring the picking at once. "
-msgstr ""
-
-#. module: stock
 #: code:addons/stock/models/stock_inventory.py:144
 #: code:addons/stock/models/stock_inventory.py:146
 #: code:addons/stock/models/stock_inventory.py:148
@@ -5564,19 +5459,7 @@ msgid "The selected inventory options are not coherent."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:226
-#, python-format
-msgid "The serial number %s is already in stock."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_picking.py:517
-#, python-format
-msgid "The source location must be the same for all the moves of the picking."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_pack_operation_picking_id
+#: model:ir.model.fields,help:stock.field_stock_move_line_picking_id
 msgid "The stock operation where the packing has been made"
 msgstr ""
 
@@ -5602,11 +5485,15 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_quant_package_packaging_id
-#: model:ir.model.fields,help:stock.field_stock_quant_packaging_type_id
 msgid "This field should be completed only if everything inside the package share the same product, otherwise it doesn't really makes sense."
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,help:stock.field_procurement_rule_name
+msgid "This field will fill the packing origin and the name of its moves"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "This guide helps getting started with Odoo Inventory.\n"
 "                        Once you are done, you will benefit from:"
@@ -5657,12 +5544,17 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
-msgid "This note will be displayed on Delivery orders."
+msgid "This note will show up  on internal transfer orders (e.g. where to pick the product in the warehouse)."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
+msgid "This note will show up on delivery orders."
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
-msgid "This note will be displayed on the Receptions."
+msgid "This note will show up on the receipt orders (e.g. where to store the product in the warehouse)."
 msgstr ""
 
 #. module: stock
@@ -5704,32 +5596,30 @@ msgid "This stock location will be used, instead of the default one, as the sour
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_product_product_property_stock_procurement
-#: model:ir.model.fields,help:stock.field_product_template_property_stock_procurement
-msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_product_product_property_stock_inventory
 #: model:ir.model.fields,help:stock.field_product_template_property_stock_inventory
 msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_to_loc
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_location_dest_id
 msgid "To"
 msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_ready
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_qty_todo
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_product_qty
+#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "To Do"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_to_loc
+msgid "To Loc"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 msgid "To Receive"
 msgstr ""
@@ -5770,11 +5660,6 @@ msgid "Today Activities"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
-msgid "Total"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_total_qty
 msgid "Total Quantity"
 msgstr ""
@@ -5785,29 +5670,32 @@ msgid "Total routes"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_production_lot.py:52
+#: code:addons/stock/models/stock_production_lot.py:53
 #: model:ir.ui.view,arch_db:stock.inventory_planner
-#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
-#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
-#: model:ir.ui.view,arch_db:stock.view_production_lot_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:stock.view_template_property_form
 #, python-format
 msgid "Traceability"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_module_product_expiry
+#: model:ir.ui.view,arch_db:stock.report_stock_body_print
+msgid "Traceability Report"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_res_config_settings_module_product_expiry
 msgid "Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n"
 " Such dates are set automatically at lot/serial number creation based on values set on the product (in days)."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Track following dates on lots & serial numbers: best before, removal, end of life, alert. Such dates are set automatically at lot/serial number creation based on values set on the product (in days)."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Track product location in your warehouse"
 msgstr ""
 
@@ -5819,11 +5707,9 @@ msgid "Tracking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:969
 #: model:ir.model,name:stock.model_stock_picking
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 #: model:ir.ui.view,arch_db:stock.view_picking_form
-#, python-format
 msgid "Transfer"
 msgstr ""
 
@@ -5839,6 +5725,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.all_picking
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 msgid "Transfers"
 msgstr ""
@@ -5854,49 +5741,29 @@ msgid "Transit Locations"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_recompute_pack_op
-msgid "True if reserved quants changed, which mean we might need to recompute the package operations"
-msgstr ""
-
-#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_picking_code
 #: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_code
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_code
 msgid "Type of Operation"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_packaging_type_id
-msgid "Type of packaging"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_ups
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_ups
 msgid "UPS"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_usps
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_usps
 msgid "USPS"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:102
-#, python-format
-msgid "Under no circumstances should you delete or change quants yourselves!"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_inventory_line_prodlot_name
 #: model:ir.model.fields,help:stock.field_stock_production_lot_name
 msgid "Unique Lot/Serial Number"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_cost
-msgid "Unit Cost"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
 msgid "Unit Of Measure"
 msgstr ""
@@ -5907,46 +5774,44 @@ msgid "Unit Price"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_uom_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line_product_uom_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_product_uom
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_product_uom_id
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_uom_id
 #: model:ir.model.fields,field_description:stock.field_stock_quant_product_uom_id
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_product_uom_id
 #: model:ir.ui.view,arch_db:stock.stock_move_tree
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
+#: model:ir.ui.view,arch_db:stock.view_move_line_form
+#: model:ir.ui.view,arch_db:stock.view_move_line_tree
 #: model:ir.ui.view,arch_db:stock.view_move_picking_tree
 #: model:ir.ui.view,arch_db:stock.view_move_tree
 #: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking
 #: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking_board
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+#: model:ir.ui.view,arch_db:stock.view_stock_move_line_kanban
+#: model:ir.ui.view,arch_db:stock.view_stock_move_line_operation_tree
 msgid "Unit of Measure"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Units Of Measure"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_uom
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Units of Measure"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.menu,name:stock.product_uom_menu
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Units of Measures"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:569
+#: code:addons/stock/models/stock_quant.py:303
 #, python-format
 msgid "Unknown Pack"
 msgstr ""
@@ -5967,12 +5832,17 @@ msgid "Unload in input location, go through a quality control before being admit
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Unlock"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Unpack"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:356
+#: code:addons/stock/models/product.py:342
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
@@ -5983,13 +5853,21 @@ msgid "Unreserve"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+#: model:ir.ui.view,arch_db:stock.stock_inventory_line_tree2
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "UoM"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
-msgid "Upcoming Activities (7 days)"
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+#: model:ir.ui.view,arch_db:stock.view_production_lot_form
+msgid "Up/Down Traceability"
 msgstr ""
 
 #. module: stock
@@ -6006,6 +5884,15 @@ msgid "Update Qty On Hand"
 msgstr ""
 
 #. module: stock
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_line.xml:77
+#: model:ir.actions.client,name:stock.action_stock_report
+#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+#, python-format
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
 #: selection:stock.move,priority:0
 #: selection:stock.picking,priority:0
 msgid "Urgent"
@@ -6017,15 +5904,7 @@ msgid "Use Existing Lots/Serial Numbers"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
-msgid "Use this assistant to generate a procurement request for this\n"
-"                    product. According to the product configuration, this may\n"
-"                    trigger a draft purchase order, a manufacturing order or\n"
-"                    a new task."
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Use your own routes and putaway strategies"
 msgstr ""
 
@@ -6040,11 +5919,6 @@ msgid "User"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "VAT:"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Validate"
 msgstr ""
@@ -6065,21 +5939,11 @@ msgid "Variant Count"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_product_variant_count
-msgid "Variant Number"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_search
 msgid "Vendor"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_calendar
-msgid "Vendor Calendar for Reordering"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_supplier
 #: model:ir.model.fields,field_description:stock.field_res_users_property_stock_supplier
 #: selection:stock.location,usage:0
@@ -6109,11 +5973,6 @@ msgid "View"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_quant_package_form
-msgid "View Contained Packages content"
-msgstr ""
-
-#. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_view_location_id
 msgid "View Location"
 msgstr ""
@@ -6162,17 +6021,15 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.model.fields,field_description:stock.field_make_procurement_warehouse_id
-#: model:ir.model.fields,field_description:stock.field_procurement_order_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_product_product_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_product_template_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_stock_move_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_warehouse_id
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_warehouse_id
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
 #: model:ir.ui.view,arch_db:stock.view_partner_stock_form
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 #: model:ir.ui.view,arch_db:stock.view_warehouse
 #: model:ir.ui.view,arch_db:stock.view_warehouse_tree
 #: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
@@ -6200,12 +6057,7 @@ msgid "Warehouse to Propagate"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_order_warehouse_id
-msgid "Warehouse to consider for the route selection"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:710
+#: code:addons/stock/models/stock_warehouse.py:704
 #, python-format
 msgid "Warehouse's Routes"
 msgstr ""
@@ -6214,8 +6066,8 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_warehouse_ids
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 msgid "Warehouses"
 msgstr ""
 
@@ -6230,13 +6082,13 @@ msgid "Warning on the Picking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:317
+#: code:addons/stock/models/product.py:303
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_warning_stock
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_group_warning_stock
 msgid "Warnings"
 msgstr ""
 
@@ -6283,6 +6135,11 @@ msgid "When a warehouse is selected for this route, this route should be seen as
 msgstr ""
 
 #. module: stock
+#: selection:stock.picking,move_type:0
+msgid "When all products are ready"
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_product_selectable
 msgid "When checked, the route will be selectable in the Inventory tab of the Product form.  It will take priority over the Warehouse route. "
 msgstr ""
@@ -6303,6 +6160,13 @@ msgid "When the method is fixed, this location will be used to store the product
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_is_locked
+#: model:ir.model.fields,help:stock.field_stock_move_line_is_locked
+#: model:ir.model.fields,help:stock.field_stock_picking_is_locked
+msgid "When the picking is not done this allows changing the initial demand. When the picking is done this allows changing the done quantities."
+msgstr ""
+
+#. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_product_min_qty
 msgid "When the virtual stock goes below the Min Quantity specified for this field, Odoo generates a procurement to bring the forecasted quantity to the Max Quantity."
 msgstr ""
@@ -6313,19 +6177,25 @@ msgid "When the virtual stock goes below the Min Quantity, Odoo generates a proc
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
+msgid "When you run the schedulers, Odoo tries to reserve the available stock to fulfill the existing pickings\n"
+"                and verify if some reordering rules should be triggered."
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_change_product_quantity
 msgid "When you select a serial number (lot), the quantity is corrected with respect to\n"
 "                            the quantity of that serial number (lot) and not to the total quantity of the product."
 msgstr ""
 
 #. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_wizard_id
-msgid "Wizard"
+#: model:ir.model.fields,field_description:stock.field_stock_move_additional
+msgid "Whether the move was added after the picking's confirmation"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
-msgid "Wizard checks all the stock minimum rules and generate procurement order."
+#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_wizard_id
+msgid "Wizard"
 msgstr ""
 
 #. module: stock
@@ -6335,6 +6205,12 @@ msgid "You are not allowed to create a lot for this picking type"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/models/stock_move.py:577
+#, python-format
+msgid "You are using a unit of measure smaller than the one you are using in order to stock your product. This can lead to rounding problem on reserved quantity! You should use the smaller unit of measure possible in order to valuate your stock or change its rounding precision to a smaller value (example: 0.00001)."
+msgstr ""
+
+#. module: stock
 #: model:ir.actions.act_window,help:stock.action_routes_form
 msgid "You can define here the main routes that run through\n"
 "                    your warehouses and that define the flows of your products. These\n"
@@ -6367,25 +6243,25 @@ msgid "You can either do it immediately or mark it as Todo for future processing
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:506
+#: code:addons/stock/models/product.py:502
 #, python-format
 msgid "You can not change the unit of measure of a product that has already been used in a done stock move. If you need to change the unit of measure, you may deactivate this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:159
+#: code:addons/stock/models/stock_move_line.py:248
 #, python-format
-msgid "You can not delete pack operations of a done picking"
+msgid "You can not delete product moves if the picking is done. You can only correct the done quantities."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:147
+#: code:addons/stock/models/stock_inventory.py:392
 #, python-format
-msgid "You can not reserve a negative quantity or a negative quant."
+msgid "You can only adjust stockable products."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:912
+#: code:addons/stock/models/stock_move.py:960
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
@@ -6396,50 +6272,44 @@ msgid "You can review and edit the predefined units via the"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:659
+#: code:addons/stock/models/stock_move.py:858
 #, python-format
 msgid "You cannot cancel a stock move that has been set to 'Done'."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_scrap.py:72
+#: code:addons/stock/models/stock_scrap.py:71
 #, python-format
 msgid "You cannot delete a scrap which is done."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_inventory.py:375
+#: code:addons/stock/models/stock_inventory.py:380
 #, python-format
 msgid "You cannot have two inventory adjustements in state 'in Progess' with the same product(%s), same location(%s), same package, same owner and same lot. Please first validatethe first inventory adjustement with this product before creating another one."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_quant.py:180
-#, python-format
-msgid "You cannot move to a location of type view %s."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_scrap.py:91
+#: code:addons/stock/models/stock_scrap.py:89
 #, python-format
 msgid "You cannot scrap a move without having available stock for %s. You can correct it with an inventory adjustment."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_inventory.py:162
+#: code:addons/stock/models/stock_inventory.py:159
 #, python-format
 msgid "You cannot set a negative product quantity in an inventory line:\n"
 "	%s - qty: %s"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:930
+#: code:addons/stock/models/stock_move.py:986
 #, python-format
 msgid "You cannot split a draft move. It needs to be confirmed first."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:926
+#: code:addons/stock/models/stock_move.py:982
 #, python-format
 msgid "You cannot split a move done"
 msgstr ""
@@ -6451,23 +6321,7 @@ msgid "You do not have any products reserved for this picking.  Please click the
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:811
-#, python-format
-msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. "
-msgstr ""
-
-#. module: stock
-#: sql_constraint:stock.pack.operation.lot:0
-msgid "You have already mentioned this lot in another line"
-msgstr ""
-
-#. module: stock
-#: sql_constraint:stock.pack.operation.lot:0
-msgid "You have already mentioned this lot name in another line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:114
+#: code:addons/stock/wizard/stock_picking_return.py:106
 #, python-format
 msgid "You have manually created product lines, please delete them to proceed"
 msgstr ""
@@ -6478,25 +6332,25 @@ msgid "You have processed less products than the initial demand."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/product.py:318
+#: code:addons/stock/models/product.py:304
 #, python-format
 msgid "You have products in stock that have no lot number.  You can assign serial numbers by doing an inventory.  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_warehouse.py:790
+#: code:addons/stock/models/stock_warehouse.py:788
 #, python-format
 msgid "You have to select a product unit of measure in the same category than the default unit of measure of the product"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_immediate_transfer
-msgid "You haven't set processed (<i>done</i>) quantities. Click <i>apply</i> and\n"
-"                        Odoo will process all quantities to do."
+msgid "You haven't entered <i>done</i> quantities, by clicking on <i>apply</i>\n"
+"                        Odoo will process all the <i>reserved</i> quantities."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:43
+#: code:addons/stock/wizard/stock_picking_return.py:44
 #, python-format
 msgid "You may only return Done pickings"
 msgstr ""
@@ -6508,32 +6362,20 @@ msgid "You must define a warehouse for the company: %s."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:555
-#: code:addons/stock/models/stock_pack_operation.py:233
-#, python-format
-msgid "You need to provide a Lot/Serial Number for product %s"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_quant.py:264
+#: code:addons/stock/models/stock_move_line.py:297
+#: code:addons/stock/models/stock_picking.py:578
 #, python-format
-msgid "You should only receive by the piece with the same serial number"
+msgid "You need to supply a lot/serial number for %s."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:237
-#, python-format
-msgid "You should provide a different serial number for each piece"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/product.py:372
+#: code:addons/stock/models/product.py:369
 #, python-format
 msgid "You still have some active reordering rules on this product. Please archive or delete them first."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_move.py:223
+#: code:addons/stock/models/stock_move.py:289
 #, python-format
 msgid "You try to move a product using a UoM that is not compatible with the UoM of the product moved. Please use an UoM in the same UoM category."
 msgstr ""
@@ -6586,19 +6428,24 @@ msgid "barcode.rule"
 msgstr ""
 
 #. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_bpost
+msgid "bpost"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "configuration menu"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "days"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "days to be propagated"
 msgstr ""
 
@@ -6608,6 +6455,11 @@ msgid "e.g. Annual inventory"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
+msgid "e.g. Buy"
+msgstr ""
+
+#. module: stock
 #: model:ir.ui.view,arch_db:stock.view_production_lot_form
 msgid "e.g. LOT/0001/20121"
 msgstr ""
@@ -6654,22 +6506,6 @@ msgid "is displayed on the transfer if your products supply chain is properly co
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_template_property_form
-msgid "months"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "of"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "on"
-msgstr ""
-
-#. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "on the purchase order form or click on <i>Receive Products</i> to see the Transfer Order"
 msgstr ""
@@ -6685,8 +6521,8 @@ msgid "report.stock.forecast"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_config_settings
-msgid "stock.config.settings"
+#: model:ir.model,name:stock.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: stock
@@ -6705,18 +6541,18 @@ msgid "stock.scrap"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.inventory_planner
-msgid "the list of products"
+#: model:ir.model,name:stock.model_stock_traceability_report
+msgid "stock.traceability.report"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
-msgid "the list of vendors"
+msgid "the list of products"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "to"
+#: model:ir.ui.view,arch_db:stock.inventory_planner
+msgid "the list of vendors"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 29629a19bb1..6144f9b238c 100644
--- a/addons/stock_account/i18n/stock_account.pot
+++ b/addons/stock_account/i18n/stock_account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,26 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
-msgid "# of Products"
+#: model:ir.model.fields,help:stock_account.field_product_category_property_cost_method
+msgid "\"Standard Price: The products are valued at their standard cost defined on the product.\n"
+"        Average Cost (AVCO): The products are valued at weighted average cost.\n"
+"        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first.\n"
+"        "
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model,name:stock_account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_stock_move_account_move_ids
+msgid "Account Move"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_move_form_inherit
+msgid "Account Moves"
 msgstr ""
 
 #. module: stock_account
@@ -31,8 +49,8 @@ msgid "Accounting Information"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_stock_config_settings_module_stock_landed_costs
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
+#: model:ir.model.fields,help:stock_account.field_res_config_settings_module_stock_landed_costs
+#: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
 msgid "Affect landed costs on receipt operations and split them among products to update their cost price."
 msgstr ""
 
@@ -42,9 +60,14 @@ msgid "At a Specific Date"
 msgstr ""
 
 #. module: stock_account
+#: selection:product.category,property_valuation:0
+msgid "Automated"
+msgstr ""
+
+#. module: stock_account
 #: selection:product.category,property_cost_method:0
 #: selection:product.template,property_cost_method:0
-msgid "Average Price"
+msgid "Average Cost (AVCO)"
 msgstr ""
 
 #. module: stock_account
@@ -54,13 +77,13 @@ msgid "Cancel"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/stock.py:269
+#: code:addons/stock_account/models/stock.py:338
 #, python-format
 msgid "Cannot find a stock input account for the product %s. You must define one on the product category, or on the location, before processing this operation."
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/stock.py:271
+#: code:addons/stock_account/models/stock.py:340
 #, python-format
 msgid "Cannot find a stock output account for the product %s. You must define one on the product category, or on the location, before processing this operation."
 msgstr ""
@@ -98,9 +121,8 @@ msgid "Choose your date"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_company_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Company"
+#: model:ir.actions.act_window,help:stock_account.stock_move_valuation_action
+msgid "Click to create a stock movement."
 msgstr ""
 
 #. module: stock_account
@@ -109,7 +131,7 @@ msgid "Compute"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/stock.py:344
+#: code:addons/stock_account/models/stock.py:411
 #, python-format
 msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation."
 msgstr ""
@@ -126,7 +148,7 @@ msgid "Cost Method"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
+#: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
 msgid "Costing"
 msgstr ""
 
@@ -166,24 +188,23 @@ msgstr ""
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_display_name
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_display_name
 #: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history_display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_inventory_accounting_date
-msgid "Force Accounting Date"
+#: selection:product.category,property_cost_method:0
+#: selection:product.template,property_cost_method:0
+msgid "First In First Out (FIFO)"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Group By"
+#: model:ir.model.fields,field_description:stock_account.field_stock_inventory_accounting_date
+msgid "Force Accounting Date"
 msgstr ""
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_id
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_id
 #: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history_id
 msgid "ID"
 msgstr ""
@@ -195,18 +216,12 @@ msgid "If cost price is increased, stock variation account will be debited and s
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_category_property_valuation
-msgid "If perpetual valuation is enabled for a product, the system will automatically create journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'. The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
+#: model:ir.actions.act_window,help:stock_account.product_valuation_action
+msgid "If there are products, you will see its name and valuation."
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_property_valuation
-#: model:ir.model.fields,help:stock_account.field_product_template_property_valuation
-msgid "If perpetual valuation is enabled for a product, the system will automatically create journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
+#: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
 msgid "Include landed costs in product cost"
 msgstr ""
 
@@ -224,6 +239,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:stock_account.field_product_category_property_valuation
 #: model:ir.model.fields,field_description:stock_account.field_product_product_property_valuation
 #: model:ir.model.fields,field_description:stock_account.field_product_template_property_valuation
+#: model:ir.ui.menu,name:stock_account.menu_valuation
+#: model:ir.ui.view,arch_db:stock_account.product_template_valuation_form_view
+#: model:ir.ui.view,arch_db:stock_account.product_valuation_form_view
 #: model:ir.ui.view,arch_db:stock_account.view_category_property_form
 msgid "Inventory Valuation"
 msgstr ""
@@ -234,11 +252,6 @@ msgid "Inventory Valuation Report"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_inventory_value
-msgid "Inventory Value"
-msgstr ""
-
-#. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history_date
 msgid "Inventory at Date"
 msgstr ""
@@ -254,13 +267,12 @@ msgid "Invoice Line"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_config_settings_module_stock_landed_costs
+#: model:ir.model.fields,field_description:stock_account.field_res_config_settings_module_stock_landed_costs
 msgid "Landed Costs"
 msgstr ""
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price___last_update
-#: model:ir.model.fields,field_description:stock_account.field_stock_history___last_update
 #: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history___last_update
 msgid "Last Modified on"
 msgstr ""
@@ -278,36 +290,46 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_location_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Location"
+#: selection:product.category,property_valuation:0
+msgid "Manual"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model.fields,help:stock_account.field_product_product_property_valuation
+#: model:ir.model.fields,help:stock_account.field_product_template_property_valuation
+msgid "Manual: The accounting entries to value the inventory are not posted automatically.\n"
+"        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company."
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model.fields,help:stock_account.field_product_category_property_valuation
+msgid "Manual: The accounting entries to value the inventory are not posted automatically.\n"
+"        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.\n"
+"        "
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_serial_number
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Lot/Serial Number"
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+msgid "Moves"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/product.py:108
+#: code:addons/stock_account/models/product.py:119
 #, python-format
 msgid "No difference between standard price and new price!"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_date
-msgid "Operation Date"
+#: model:ir.model,name:stock_account.model_stock_move_line
+msgid "Packing Operation"
 msgstr ""
 
 #. module: stock_account
-#: selection:product.category,property_valuation:0
 #: selection:product.template,property_valuation:0
 msgid "Periodic (manual)"
 msgstr ""
 
 #. module: stock_account
-#: selection:product.category,property_valuation:0
 #: selection:product.template,property_valuation:0
 msgid "Perpetual (automated)"
 msgstr ""
@@ -319,64 +341,63 @@ msgstr ""
 
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_product_product
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_product_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
+#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
 msgid "Product"
 msgstr ""
 
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_product_category
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_product_categ_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
 msgid "Product Category"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_quantity
-msgid "Product Quantity"
+#: model:ir.model,name:stock_account.model_product_template
+msgid "Product Template"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model,name:stock_account.model_product_template
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_product_template_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Product Template"
+#: model:ir.actions.act_window,name:stock_account.product_valuation_action
+msgid "Product Valuation"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model,name:stock_account.model_stock_quant
-msgid "Quants"
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+msgid "Qty"
 msgstr ""
 
 #. module: stock_account
-#: selection:product.category,property_cost_method:0
-#: selection:product.template,property_cost_method:0
-msgid "Real Price"
+#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
+msgid "Quantity on Hand"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_wizard_valuation_history
-msgid "Retrieve the Inventory Value"
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+msgid "Reference"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model,name:stock_account.model_stock_return_picking
-msgid "Return Picking"
+#: model:ir.model.fields,field_description:stock_account.field_stock_move_remaining_qty
+msgid "Remaining Qty"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
-msgid "Save this page and come back here to set up the feature."
+#: model:ir.model.fields,field_description:stock_account.field_stock_move_remaining_value
+msgid "Remaining Value"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
-msgid "Set standard cost"
+#: model:ir.ui.view,arch_db:stock_account.view_wizard_valuation_history
+msgid "Retrieve the Inventory Value"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model,name:stock_account.model_stock_return_picking
+msgid "Return Picking"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_source
-msgid "Source"
+#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
+msgid "Set standard cost"
 msgstr ""
 
 #. module: stock_account
@@ -386,30 +407,18 @@ msgid "Standard Price"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/product.py:125
-#: code:addons/stock_account/models/product.py:130
+#: code:addons/stock_account/models/product.py:136
+#: code:addons/stock_account/models/product.py:141
 #, python-format
-msgid "Standard Price changed"
+msgid "Standard Price changed  - %s"
 msgstr ""
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_product_product_property_cost_method
 #: model:ir.model.fields,help:stock_account.field_product_template_property_cost_method
-msgid "Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).\n"
-"                Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
-"                Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_category_property_cost_method
-msgid "Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).\n"
-"Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
-"Real Price: The cost price displayed is the price of the last outgoing product (will be used in case of inventory loss for example)."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.actions.act_window,name:stock_account.action_stock_history
-msgid "Stock History"
+msgid "Standard Price: The products are valued at their standard cost defined on the product.\n"
+"        Average Cost (AVCO): The products are valued at weighted average cost.\n"
+"        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first."
 msgstr ""
 
 #. module: stock_account
@@ -428,12 +437,16 @@ msgstr ""
 
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_stock_move
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_move_id
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
+#: model:ir.model.fields,field_description:stock_account.field_account_move_stock_move_id
 msgid "Stock Move"
 msgstr ""
 
 #. module: stock_account
+#: model:ir.actions.act_window,name:stock_account.stock_move_valuation_action
+msgid "Stock Moves"
+msgstr ""
+
+#. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_product_category_property_stock_account_output_categ_id
 #: model:ir.model.fields,field_description:stock_account.field_product_product_property_stock_account_output
 #: model:ir.model.fields,field_description:stock_account.field_product_template_property_stock_account_output
@@ -441,6 +454,13 @@ msgid "Stock Output Account"
 msgstr ""
 
 #. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
+msgid "Stock Valuation"
+msgstr ""
+
+#. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_product_category_property_stock_valuation_account_id
 msgid "Stock Valuation Account"
 msgstr ""
@@ -456,11 +476,7 @@ msgid "Stock Valuation Account (Outgoing)"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/wizard/wizard_valuation_history.py:39
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_graph
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_pivot
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
+#: code:addons/stock_account/wizard/wizard_valuation_history.py:45
 #, python-format
 msgid "Stock Value At Date"
 msgstr ""
@@ -471,7 +487,7 @@ msgid "Templates for Account Chart"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/stock.py:298
+#: code:addons/stock_account/models/stock.py:365
 #, python-format
 msgid "The found valuation amount for product %s is zero. Which means there is probably a configuration error. Check the costing method and the standard price"
 msgstr ""
@@ -483,7 +499,7 @@ msgid "To Refund (update SO/PO)"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
+#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
 msgid "Total Value"
 msgstr ""
 
@@ -494,6 +510,11 @@ msgid "Trigger a decrease of the delivered/received quantity in the associated S
 msgstr ""
 
 #. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_template_property_form
 msgid "Update Cost"
 msgstr ""
@@ -515,7 +536,8 @@ msgid "Valuation"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_price_unit_on_quant
+#: model:ir.model.fields,field_description:stock_account.field_product_product_stock_value
+#: model:ir.model.fields,field_description:stock_account.field_stock_move_value
 msgid "Value"
 msgstr ""
 
@@ -557,14 +579,14 @@ msgid "Wizard that opens the stock valuation history table"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/stock.py:267
+#: code:addons/stock_account/models/stock.py:336
 #, python-format
 msgid "You don't have any stock journal defined on your product category, check if you have installed a chart of accounts"
 msgstr ""
 
 #. module: stock_account
-#: code:addons/stock_account/models/product.py:110
-#: code:addons/stock_account/models/stock.py:273
+#: code:addons/stock_account/models/product.py:121
+#: code:addons/stock_account/models/stock.py:342
 #, python-format
 msgid "You don't have any stock valuation account defined on your product category. You must define one before processing this operation."
 msgstr ""
@@ -575,13 +597,8 @@ msgid "_Apply"
 msgstr ""
 
 #. module: stock_account
-#: model:ir.model,name:stock_account.model_stock_config_settings
-msgid "stock.config.settings"
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model,name:stock_account.model_stock_history
-msgid "stock.history"
+#: model:ir.model,name:stock_account.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: stock_account
diff --git a/addons/stock_dropshipping/i18n/stock_dropshipping.pot b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
index 0cc4d1cfe30..5f09f547763 100644
--- a/addons/stock_dropshipping/i18n/stock_dropshipping.pot
+++ b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,21 @@ msgid "Dropship"
 msgstr ""
 
 #. module: stock_dropshipping
+#: model:ir.model,name:stock_dropshipping.model_procurement_rule
+msgid "Procurement Rule"
+msgstr ""
+
+#. module: stock_dropshipping
+#: model:ir.model,name:stock_dropshipping.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: stock_dropshipping
+#: model:ir.model.fields,field_description:stock_dropshipping.field_purchase_order_line_sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: stock_dropshipping
 #: model:procurement.rule,name:stock_dropshipping.procurement_rule_drop_shipping
 msgid "Vendor → Customer"
 msgstr ""
diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
index c0a2a4810d4..6c400921f13 100644
--- a/addons/stock_landed_costs/i18n/stock_landed_costs.pot
+++ b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-09-20 09:52+0000\n"
+"PO-Revision-Date: 2017-09-20 09:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:354
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:358
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:375
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:379
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:328
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:332
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:349
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:353
 #, python-format
 msgid " already out"
 msgstr ""
@@ -105,7 +105,7 @@ msgid "Cost Lines"
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:79
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:90
 #, python-format
 msgid "Cost and adjustments lines do not match. You should maybe recompute the landed costs."
 msgstr ""
@@ -161,6 +161,7 @@ msgid "Equal"
 msgstr ""
 
 #. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_product_product_split_method
 #: model:ir.model.fields,help:stock_landed_costs.field_product_template_split_method
 msgid "Equal : Cost will be equally divided.\n"
 "By Quantity : Cost will be divided according to product's quantity.\n"
@@ -202,6 +203,12 @@ msgid "Information"
 msgstr ""
 
 #. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_product_product_landed_cost_ok
+#: model:ir.model.fields,field_description:stock_landed_costs.field_product_template_landed_cost_ok
+msgid "Is a Landed Cost"
+msgstr ""
+
+#. module: stock_landed_costs
 #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_description
 msgid "Item Description"
 msgstr ""
@@ -213,6 +220,7 @@ msgstr ""
 
 #. module: stock_landed_costs
 #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines_cost_id
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_move_landed_cost_value
 #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_cost_id
 msgid "Landed Cost"
 msgstr ""
@@ -228,14 +236,14 @@ msgid "Landed Cost Type"
 msgstr ""
 
 #. module: stock_landed_costs
-#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_config_settings_inherit_landed_cost
+#: model:ir.ui.view,arch_db:stock_landed_costs.res_config_settings_view_form
 msgid "Landed Cost Types"
 msgstr ""
 
 #. module: stock_landed_costs
 #: model:ir.actions.act_window,name:stock_landed_costs.action_stock_landed_cost
-#: model:ir.model.fields,field_description:stock_landed_costs.field_product_template_landed_cost_ok
 #: model:ir.ui.menu,name:stock_landed_costs.menu_stock_landed_cost
+#: model:ir.ui.view,arch_db:stock_landed_costs.view_product_landed_cost_form
 #: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
 #: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_search
 #: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_tree
@@ -286,13 +294,13 @@ msgid "Name"
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:77
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:88
 #, python-format
 msgid "No valuation adjustments lines. You should maybe recompute the landed costs."
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:75
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:86
 #, python-format
 msgid "Only draft landed costs can be validated"
 msgstr ""
@@ -303,7 +311,7 @@ msgid "Pickings"
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:321
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:295
 #, python-format
 msgid "Please configure Stock Expense Account for product: %s."
 msgstr ""
@@ -341,6 +349,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_product_product_split_method
 #: model:ir.model.fields,field_description:stock_landed_costs.field_product_template_split_method
 #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines_split_method
 msgid "Split Method"
@@ -367,6 +376,7 @@ msgid "Stock Landed Cost Lines"
 msgstr ""
 
 #. module: stock_landed_costs
+#: model:ir.model,name:stock_landed_costs.model_stock_move
 #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_move_id
 msgid "Stock Move"
 msgstr ""
@@ -377,7 +387,7 @@ msgid "Stock Valuation Adjustment Lines"
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:172
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:147
 #, python-format
 msgid "The selected picking does not contain any move that would be impacted by landed costs. Landed costs are only possible for products configured in real time valuation with real price costing method. Please make sure it is the case, or you selected the correct picking"
 msgstr ""
@@ -388,12 +398,17 @@ msgid "Total"
 msgstr ""
 
 #. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_move_total_value
+msgid "Total Value"
+msgstr ""
+
+#. module: stock_landed_costs
 #: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
 msgid "Validate"
 msgstr ""
 
 #. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:69
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:80
 #, python-format
 msgid "Validated landed costs cannot be cancelled, but you could create negative landed costs to reverse them"
 msgstr ""
diff --git a/addons/stock_picking_batch/i18n/stock_picking_batch.pot b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
index 3612d2e951a..dbdfc6ce7ac 100644
--- a/addons/stock_picking_batch/i18n/stock_picking_batch.pot
+++ b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* stock_picking_wave
+#	* stock_picking_batch
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,255 +15,255 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: stock_picking_wave
-#: model:ir.model,name:stock_picking_wave.model_stock_picking_to_wave
-msgid "Add pickings to a picking wave"
+#. module: stock_picking_batch
+#: model:ir.model,name:stock_picking_batch.model_stock_picking_to_batch
+msgid "Add pickings to a batch picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
-msgid "Add pickings to wave"
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
+msgid "Add pickings to batch"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.actions.act_window,name:stock_picking_wave.action_picking_to_wave
-#: model:ir.actions.act_window,name:stock_picking_wave.picking_to_wave_act
-#: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
-msgid "Add to Wave"
+#. module: stock_picking_batch
+#: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_to_batch_action
+#: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_to_batch_action_stock_picking
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
+msgid "Add to Batch"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.view_picking_internal_search_inherit_stock_picking_batch
+msgid "Batch"
+msgstr ""
+
+#. module: stock_picking_batch
+#: code:addons/stock_picking_batch/models/stock_picking_batch.py:64
+#: model:ir.model,name:stock_picking_batch.model_stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_id_8881
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_batch_id
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
+#, python-format
+msgid "Batch Picking"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_name
+msgid "Batch Picking Name"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_batch_action
+#: model:ir.ui.menu,name:stock_picking_batch.stock_picking_batch_menu
+msgid "Batch Pickings"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
+msgid "Batch Pickings not finished"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_id_8881
+msgid "Batch associated to this picking"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
 msgid "Cancel"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Cancel picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: selection:stock.picking.wave,state:0
+#. module: stock_picking_batch
+#: selection:stock.picking.batch,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.actions.act_window,help:stock_picking_wave.action_picking_wave
-msgid "Click to create a Picking Wave."
+#. module: stock_picking_batch
+#: model:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action
+msgid "Click to create a Batch Picking."
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Confirm"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Confirm picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_create_uid
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_create_uid
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_create_uid
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_create_date
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_create_date
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_create_date
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_create_date
 msgid "Created on"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_display_name
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_display_name
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_display_name
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
-#: selection:stock.picking.wave,state:0
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
+#: selection:stock.picking.batch,state:0
 msgid "Done"
 msgstr ""
 
-#. module: stock_picking_wave
-#: selection:stock.picking.wave,state:0
+#. module: stock_picking_batch
+#: selection:stock.picking.batch,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Force availability"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "Group By"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_id
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_id
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_id
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_id
 msgid "ID"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "In Progress"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave___last_update
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave___last_update
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch___last_update
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch___last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_write_uid
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_write_uid
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_write_uid
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_write_date
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_write_date
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_write_date
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch_write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_picking_ids
-msgid "List of picking associated to this wave"
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_picking_ids
+msgid "List of picking associated to this batch"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_name
-msgid "Name of the picking wave"
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_name
+msgid "Name of the batch picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/models/stock_picking_wave.py:52
+#. module: stock_picking_batch
+#: code:addons/stock_picking_batch/models/stock_picking_batch.py:52
 #, python-format
 msgid "Nothing to print."
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_user_id
-msgid "Person responsible for this wave"
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_user_id
+msgid "Person responsible for this batch picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/models/stock_picking_wave.py:64
-#: model:ir.model,name:stock_picking_wave.model_stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_wave_id
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_id_10088
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
-#, python-format
-msgid "Picking Wave"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_name
-msgid "Picking Wave Name"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.actions.act_window,name:stock_picking_wave.action_picking_wave
-#: model:ir.ui.menu,name:stock_picking_wave.menu_action_picking_wave
-msgid "Picking Waves"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
-msgid "Picking Waves not finished"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_id_10088
-msgid "Picking wave associated to this picking"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_picking_ids
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_picking_ids
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Pickings"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 msgid "Print"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_user_id
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_user_id
 msgid "Responsible"
 msgstr ""
 
-#. module: stock_picking_wave
-#: selection:stock.picking.wave,state:0
+#. module: stock_picking_batch
+#: selection:stock.picking.batch,state:0
 msgid "Running"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
-msgid "Search Picking Waves"
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
+msgid "Search Batch Picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
-msgid "Select a wave"
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
+msgid "Select a batch"
 msgstr ""
 
-#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/models/stock_picking_wave.py:59
+#. module: stock_picking_batch
+#: code:addons/stock_picking_batch/models/stock_picking_batch.py:59
 #, python-format
-msgid "Some pickings are still waiting for goods. Please check or force their availability before setting this wave to done."
+msgid "Some pickings are still waiting for goods. Please check or force their availability before setting this batch to done."
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:mail.message.subtype,description:stock_picking_wave.mt_wave_state
-#: model:mail.message.subtype,name:stock_picking_wave.mt_wave_state
+#. module: stock_picking_batch
+#: model:mail.message.subtype,description:stock_picking_batch.mt_batch_state
+#: model:mail.message.subtype,name:stock_picking_batch.mt_batch_state
 msgid "Stage Changed"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_state
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_state
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "State"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_tree
-msgid "Stock Picking Waves"
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_tree
+msgid "Stock Batch Picking"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.actions.act_window,help:stock_picking_wave.action_picking_wave
-msgid "The goal of the picking waves is to group operations that may\n"
-"                (needs to) be done together in order to increase their efficiency.\n"
-"                It may also be useful to assign jobs (one person = one wave) or\n"
-"                help the timing management of operations (tasks to be done at 1pm)."
+#. module: stock_picking_batch
+#: model:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action
+msgid "The goal of the batch picking is to group operations that may\n"
+"            (needs to) be done together in order to increase their efficiency.\n"
+"            It may also be useful to assign jobs (one person = one batch) or\n"
+"            help the timing management of operations (tasks to be done at 1pm)."
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.model,name:stock_picking_wave.model_stock_picking
+#. module: stock_picking_batch
+#: model:ir.model,name:stock_picking_batch.model_stock_picking
 msgid "Transfer"
 msgstr ""
 
-#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/models/stock_picking_wave.py:63
+#. module: stock_picking_batch
+#: code:addons/stock_picking_batch/models/stock_picking_batch.py:63
 #, python-format
 msgid "Transferred by"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "User"
 msgstr ""
 
-#. module: stock_picking_wave
-#: model:ir.ui.view,arch_db:stock_picking_wave.view_stock_picking_wave_search_inherit
-msgid "Wave"
-msgstr ""
-
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index d8dbf85c098..dd730b7fda5 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgid "#Questions"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:125
+#: code:addons/survey/models/survey.py:122
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -181,7 +181,7 @@ msgid "A problem has occured"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:809
+#: code:addons/survey/models/survey.py:806
 #, python-format
 msgid "A question cannot be unanswered and skipped"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Choose..."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:113
+#: code:addons/survey/models/survey.py:110
 #, python-format
 msgid "Click here to start survey"
 msgstr ""
@@ -306,6 +306,11 @@ msgid "Closed"
 msgstr ""
 
 #. module: survey
+#: model:ir.ui.view,arch_db:survey.survey_kanban
+msgid "Color"
+msgstr ""
+
+#. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_survey_color
 msgid "Color Index"
 msgstr ""
@@ -392,16 +397,12 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: survey
+#: selection:survey.question,type:0
 #: selection:survey.user_input_line,answer_type:0
 msgid "Date"
 msgstr ""
 
 #. module: survey
-#: selection:survey.question,type:0
-msgid "Date and Time"
-msgstr ""
-
-#. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_user_input_line_value_date
 msgid "Date answer"
 msgstr ""
@@ -577,7 +578,7 @@ msgid "If closed, people won't be able to answer to surveys in this column."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:474
+#: code:addons/survey/models/survey.py:471
 #, python-format
 msgid "If other, please specify:"
 msgstr ""
@@ -593,7 +594,7 @@ msgid "In progress"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:66
+#: code:addons/survey/wizard/survey_email_compose_message.py:68
 #, python-format
 msgid "Incorrect Email Address: %s"
 msgstr ""
@@ -671,6 +672,11 @@ msgid "Last displayed page"
 msgstr ""
 
 #. module: survey
+#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
+msgid "Late Activities"
+msgstr ""
+
+#. module: survey
 #: selection:survey.user_input,type:0
 msgid "Link"
 msgstr ""
@@ -880,11 +886,6 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_user_input_line_page_id
 #: model:ir.ui.view,arch_db:survey.page
 #: model:ir.ui.view,arch_db:survey.survey_page_search
@@ -1382,19 +1383,19 @@ msgid "Thanks Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:822
+#: code:addons/survey/models/survey.py:819
 #, python-format
 msgid "The answer must be in the right type"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:488
+#: code:addons/survey/models/survey.py:485
 #, python-format
 msgid "The answer you entered has an invalid format."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:138
+#: code:addons/survey/wizard/survey_email_compose_message.py:139
 #, python-format
 msgid "The content of the text don't contain '__URL__'.                     __URL__ is automaticaly converted into the special url of the survey."
 msgstr ""
@@ -1405,21 +1406,21 @@ msgid "The deadline cannot be in the past"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:547
+#: code:addons/survey/models/survey.py:544
 #: code:addons/survey/tests/test_survey.py:86
 #, python-format
 msgid "This answer must be an email address"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:591
+#: code:addons/survey/models/survey.py:588
 #: code:addons/survey/tests/test_survey.py:107
 #, python-format
-msgid "This is not a date/time"
+msgid "This is not a date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:568
+#: code:addons/survey/models/survey.py:565
 #: code:addons/survey/tests/test_survey.py:97
 #, python-format
 msgid "This is not a number"
@@ -1436,7 +1437,7 @@ msgid "This message will be displayed when survey is completed"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:492
+#: code:addons/survey/models/survey.py:489
 #, python-format
 msgid "This question requires an answer."
 msgstr ""
@@ -1489,7 +1490,7 @@ msgstr ""
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_survey_view_search
-msgid "Upcoming Activities (7 days)"
+msgid "Upcoming Activities"
 msgstr ""
 
 #. module: survey
@@ -1576,13 +1577,8 @@ msgid "Vote"
 msgstr ""
 
 #. module: survey
-#: model:ir.ui.view,arch_db:survey.datetime
-msgid "YYYY-MM-DD hh:mm:ss"
-msgstr ""
-
-#. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_question_form
-msgid "YYYY-MM-DD hh:mm:ss\n"
+msgid "YYYY-MM-DD\n"
 "                                            <i class=\"fa fa-calendar fa-2x\"/>"
 msgstr ""
 
@@ -1597,13 +1593,13 @@ msgid "You can share your survey web public link and/or send private invitations
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:319
+#: code:addons/survey/models/survey.py:316
 #, python-format
 msgid "You cannot send an invitation for a survey that has no questions."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/models/survey.py:322
+#: code:addons/survey/models/survey.py:319
 #, python-format
 msgid "You cannot send invitations for closed surveys."
 msgstr ""
diff --git a/addons/survey_crm/i18n/survey_crm.pot b/addons/survey_crm/i18n/survey_crm.pot
index 2b0834542be..27c92494e33 100644
--- a/addons/survey_crm/i18n/survey_crm.pot
+++ b/addons/survey_crm/i18n/survey_crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/utm/i18n/utm.pot b/addons/utm/i18n/utm.pot
index 60ca729ae95..51e41060a73 100644
--- a/addons/utm/i18n/utm.pot
+++ b/addons/utm/i18n/utm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index c460b8ece07..17cd3086d83 100644
--- a/addons/web/i18n/web.pot
+++ b/addons/web/i18n/web.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:479
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:481
 #, python-format
 msgid " [Me]"
 msgstr ""
@@ -38,7 +38,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:566
+#: code:addons/web/static/src/js/chrome/search_inputs.js:565
 #: code:addons/web/static/src/js/chrome/search_view.js:203
 #, python-format
 msgid " or "
@@ -46,22 +46,22 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:247
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:222
+#: code:addons/web/static/src/js/fields/field_utils.js:246
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:242
 #, python-format
 msgid " records"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/view_manager.js:311
+#: code:addons/web/static/src/js/chrome/view_manager.js:313
 #, python-format
 msgid " view couldn't be loaded"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:587
+#: code:addons/web/static/src/xml/base.xml:649
 #, python-format
 msgid "# Code editor"
 msgstr ""
@@ -83,35 +83,35 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/view_manager.js:106
+#: code:addons/web/static/src/js/chrome/view_manager.js:107
 #, python-format
 msgid "%(view_type)s view"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:103
+#: code:addons/web/static/src/js/core/translation.js:114
 #, python-format
 msgid "%d days ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:101
+#: code:addons/web/static/src/js/core/translation.js:112
 #, python-format
 msgid "%d hours ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:99
+#: code:addons/web/static/src/js/core/translation.js:110
 #, python-format
 msgid "%d minutes ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:105
+#: code:addons/web/static/src/js/core/translation.js:116
 #, python-format
 msgid "%d months ago"
 msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:107
+#: code:addons/web/static/src/js/core/translation.js:118
 #, python-format
 msgid "%d years ago"
 msgstr ""
@@ -138,8 +138,13 @@ msgid "&lt;!--[if lt IE 10]&gt;\n"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.minimal_layout
+msgid "&lt;!DOCTYPE html&gt;"
+msgstr ""
+
+#. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:375
+#: code:addons/web/static/src/js/fields/field_utils.js:371
 #, python-format
 msgid "'%s' is not a correct date"
 msgstr ""
@@ -153,28 +158,28 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:422
+#: code:addons/web/static/src/js/fields/field_utils.js:418
 #, python-format
 msgid "'%s' is not a correct datetime"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:433
+#: code:addons/web/static/src/js/fields/field_utils.js:429
 #, python-format
 msgid "'%s' is not a correct float"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:503
+#: code:addons/web/static/src/js/fields/field_utils.js:499
 #, python-format
 msgid "'%s' is not a correct integer"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:469
+#: code:addons/web/static/src/js/fields/field_utils.js:465
 #, python-format
 msgid "'%s' is not a correct monetary field"
 msgstr ""
@@ -188,21 +193,21 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:101
+#: code:addons/web/static/src/xml/base.xml:77
 #, python-format
 msgid "(no string)"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:34
+#: code:addons/web/static/src/xml/base.xml:10
 #, python-format
 msgid "(nolabel)"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:245
+#: code:addons/web/static/src/js/fields/field_utils.js:244
 #, python-format
 msgid "1 record"
 msgstr ""
@@ -219,14 +224,14 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:626
 #, python-format
 msgid "ALL"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:565
+#: code:addons/web/static/src/xml/base.xml:627
 #, python-format
 msgid "ANY"
 msgstr ""
@@ -247,7 +252,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1265
+#: code:addons/web/static/src/xml/base.xml:1336
 #, python-format
 msgid "Access to all Enterprise Apps"
 msgstr ""
@@ -261,77 +266,75 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:135
+#: code:addons/web/static/src/xml/base.xml:111
 #, python-format
 msgid "Action ID:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1481
+#: code:addons/web/static/src/js/fields/basic_fields.js:1570
 #, python-format
 msgid "Activate"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:121
+#: code:addons/web/static/src/xml/base.xml:230
 #, python-format
 msgid "Activate Assets Debugging"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1480
-#: code:addons/web/static/src/js/fields/basic_fields.js:1484
-#: code:addons/web/static/src/js/fields/basic_fields.js:1488
+#: code:addons/web/static/src/js/fields/basic_fields.js:1569
+#: code:addons/web/static/src/js/fields/basic_fields.js:1573
+#: code:addons/web/static/src/js/fields/basic_fields.js:1577
 #, python-format
 msgid "Active"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1114
-#: code:addons/web/static/src/xml/base.xml:1121
-#: code:addons/web/static/src/xml/kanban.xml:51
-#: code:addons/web/static/src/xml/kanban.xml:52
-#: code:addons/web/static/src/xml/kanban.xml:60
-#: code:addons/web/static/src/xml/kanban.xml:61
+#: code:addons/web/static/src/js/fields/relational_fields.js:1157
+#: code:addons/web/static/src/xml/base.xml:1183
+#: code:addons/web/static/src/xml/kanban.xml:54
+#: code:addons/web/static/src/xml/kanban.xml:64
 #, python-format
 msgid "Add"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:943
+#: code:addons/web/static/src/xml/base.xml:1005
 #, python-format
 msgid "Add Custom Filter"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:947
+#: code:addons/web/static/src/xml/base.xml:1009
 #, python-format
 msgid "Add a condition"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:384
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:463
 #, python-format
 msgid "Add an item"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1056
+#: code:addons/web/static/src/xml/base.xml:1118
 #, python-format
 msgid "Add custom group"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:572
+#: code:addons/web/static/src/xml/base.xml:634
 #, python-format
 msgid "Add filter"
 msgstr ""
@@ -345,137 +348,138 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:632
+#: code:addons/web/static/src/xml/base.xml:694
 #, python-format
 msgid "Add new value"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:250
+#: code:addons/web/static/src/js/fields/basic_fields.js:1494
+#, python-format
+msgid "Add to Favorites"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:358
 #, python-format
 msgid "Add..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1137
+#: code:addons/web/static/src/js/fields/relational_fields.js:1180
 #, python-format
 msgid "Add: "
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:920
+#: code:addons/web/static/src/xml/base.xml:982
 #, python-format
 msgid "Advanced Search..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:177
+#: code:addons/web/static/src/js/core/dialog.js:209
 #, python-format
 msgid "Alert"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:554
-#: code:addons/web/static/src/xml/base.xml:559
+#: code:addons/web/static/src/xml/base.xml:616
+#: code:addons/web/static/src/xml/base.xml:621
 #, python-format
 msgid "All"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:363
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:367
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:351
 #, python-format
 msgid "All day"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:328
-#, python-format
-msgid "All the day"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:380
+#: code:addons/web/static/src/xml/base.xml:488
 #, python-format
 msgid "All users"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:37
+#: code:addons/web/static/src/xml/base.xml:146
 #, python-format
 msgid "An error occurred"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1270
+#: code:addons/web/static/src/xml/base.xml:1341
 #, python-format
 msgid "And more"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:555
-#: code:addons/web/static/src/xml/base.xml:560
+#: code:addons/web/static/src/xml/base.xml:617
+#: code:addons/web/static/src/xml/base.xml:622
 #, python-format
 msgid "Any"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:946
-#: code:addons/web/static/src/xml/base.xml:1067
+#: code:addons/web/static/src/xml/base.xml:1008
+#: code:addons/web/static/src/xml/base.xml:1129
 #, python-format
 msgid "Apply"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1485
-#: code:addons/web/static/src/js/views/list/list_controller.js:127
+#: code:addons/web/static/src/js/fields/basic_fields.js:1574
+#: code:addons/web/static/src/js/views/list/list_controller.js:138
 #, python-format
 msgid "Archive"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:25
+#: code:addons/web/static/src/xml/kanban.xml:26
 #, python-format
 msgid "Archive Records"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1484
+#: code:addons/web/static/src/js/fields/basic_fields.js:1573
 #, python-format
 msgid "Archived"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:275
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:296
 #, python-format
 msgid "Are you sure that you want to remove this column ?"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:251
+#: code:addons/web/static/src/js/chrome/search_menus.js:259
 #, python-format
 msgid "Are you sure that you want to remove this filter?"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:288
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:289
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:287
 #, python-format
 msgid "Are you sure you want to delete this record ?"
@@ -483,42 +487,42 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:223
+#: code:addons/web/static/src/xml/base.xml:331
 #, python-format
 msgid "Attachment :"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1117
+#: code:addons/web/static/src/xml/base.xml:1179
 #, python-format
 msgid "Available fields"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:447
+#: code:addons/web/static/src/xml/base.xml:509
 #, python-format
 msgid "Bar Chart"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1269
+#: code:addons/web/static/src/xml/base.xml:1340
 #, python-format
 msgid "Bugfixes guarantee"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:98
+#: code:addons/web/static/src/xml/base.xml:74
 #, python-format
 msgid "Button"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:127
+#: code:addons/web/static/src/xml/base.xml:103
 #, python-format
 msgid "Button Type:"
 msgstr ""
@@ -539,21 +543,22 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_view.js:36
+#: code:addons/web/static/src/js/views/calendar/calendar_view.js:38
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:191
+#: code:addons/web/static/src/js/core/dialog.js:223
+#: code:addons/web/static/src/js/core/dialog.js:275
 #: code:addons/web/static/src/js/fields/relational_fields.js:66
 #: code:addons/web/static/src/js/fields/upgrade_fields.js:75
-#: code:addons/web/static/src/js/services/crash_manager.js:201
+#: code:addons/web/static/src/js/services/crash_manager.js:203
 #: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:56
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:269
-#: code:addons/web/static/src/js/views/view_dialogs.js:353
-#: code:addons/web/static/src/xml/base.xml:67
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:290
+#: code:addons/web/static/src/js/views/view_dialogs.js:364
+#: code:addons/web/static/src/xml/base.xml:176
 #, python-format
 msgid "Cancel"
 msgstr ""
@@ -567,116 +572,125 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/controllers/main.py:772
-#: code:addons/web/controllers/main.py:774
-#: code:addons/web/controllers/main.py:779
+#: code:addons/web/controllers/main.py:773
+#: code:addons/web/controllers/main.py:775
 #: code:addons/web/controllers/main.py:780
+#: code:addons/web/controllers/main.py:781
 #: code:addons/web/static/src/js/widgets/change_password.js:27
-#: code:addons/web/static/src/xml/base.xml:66
+#: code:addons/web/static/src/xml/base.xml:175
 #, python-format
 msgid "Change Password"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:73
+#: code:addons/web/static/src/xml/base.xml:49
 #, python-format
 msgid "Change default:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:823
-#: code:addons/web/static/src/xml/base.xml:854
+#: code:addons/web/static/src/xml/base.xml:885
+#: code:addons/web/static/src/xml/base.xml:916
 #, python-format
 msgid "Clear"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:118
+#: code:addons/web/static/src/xml/base.xml:227
 #, python-format
 msgid "Clear Events"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1489
+#: code:addons/web/static/src/js/fields/basic_fields.js:1578
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:298
 #: code:addons/web/static/src/js/views/view_dialogs.js:111
 #: code:addons/web/static/src/js/widgets/data_export.js:203
-#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:21
+#: code:addons/web/static/src/js/widgets/debug_manager.js:428
+#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:24
 #, python-format
 msgid "Close"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1488
+#: code:addons/web/static/src/js/fields/basic_fields.js:1577
 #, python-format
 msgid "Closed"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:354
+#: code:addons/web/static/src/xml/kanban.xml:52
+#, python-format
+msgid "Column title"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:462
 #, python-format
 msgid "Condition:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:61
+#: code:addons/web/static/src/xml/base.xml:170
 #, python-format
 msgid "Confirm New Password"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:202
+#: code:addons/web/static/src/js/core/dialog.js:234
+#: code:addons/web/static/src/js/core/dialog.js:284
 #, python-format
 msgid "Confirmation"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:260
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:268
 #, python-format
 msgid "Connection lost"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:269
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:277
 #, python-format
 msgid "Connection restored"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:61
-#: code:addons/web/static/src/xml/base_common.xml:114
+#: code:addons/web/static/src/xml/base.xml:37
+#: code:addons/web/static/src/xml/base.xml:90
 #, python-format
 msgid "Context:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:127
+#: code:addons/web/static/src/js/services/crash_manager.js:132
 #, python-format
 msgid "Copied !"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:35
+#: code:addons/web/static/src/xml/base.xml:144
 #, python-format
 msgid "Copy the full error to clipboard"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1115
+#: code:addons/web/static/src/js/fields/basic_fields.js:1152
 #, python-format
 msgid "Could not display the selected image."
 msgstr ""
@@ -690,12 +704,12 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_view.js:35
-#: code:addons/web/static/src/js/views/graph/graph_view.js:48
+#: code:addons/web/static/src/js/views/graph/graph_view.js:43
+#: code:addons/web/static/src/js/views/graph/graph_view.js:56
 #: code:addons/web/static/src/js/views/pivot/pivot_view.js:39
 #: code:addons/web/static/src/js/views/pivot/pivot_view.js:58
-#: code:addons/web/static/src/xml/base.xml:443
-#: code:addons/web/static/src/xml/base.xml:470
+#: code:addons/web/static/src/xml/base.xml:505
+#: code:addons/web/static/src/xml/base.xml:532
 #, python-format
 msgid "Count"
 msgstr ""
@@ -706,24 +720,24 @@ msgstr ""
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:212
 #: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:45
 #: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:80
-#: code:addons/web/static/src/js/views/kanban/kanban_controller.js:321
-#: code:addons/web/static/src/js/views/view_dialogs.js:359
-#: code:addons/web/static/src/xml/base.xml:296
-#: code:addons/web/static/src/xml/base.xml:316
+#: code:addons/web/static/src/js/views/kanban/kanban_controller.js:312
+#: code:addons/web/static/src/js/views/view_dialogs.js:370
+#: code:addons/web/static/src/xml/base.xml:404
+#: code:addons/web/static/src/xml/base.xml:424
 #, python-format
 msgid "Create"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:468
+#: code:addons/web/static/src/js/views/form/form_controller.js:473
 #, python-format
 msgid "Create "
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:357
+#: code:addons/web/static/src/js/fields/relational_fields.js:367
 #, python-format
 msgid "Create \"<strong>%s</strong>\""
 msgstr ""
@@ -737,7 +751,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:366
+#: code:addons/web/static/src/js/fields/relational_fields.js:376
 #, python-format
 msgid "Create and Edit..."
 msgstr ""
@@ -751,7 +765,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:395
+#: code:addons/web/static/src/js/fields/relational_fields.js:405
 #: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:85
 #, python-format
 msgid "Create: "
@@ -759,28 +773,28 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:228
+#: code:addons/web/static/src/xml/base.xml:336
 #, python-format
 msgid "Created by :"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:182
+#: code:addons/web/static/src/xml/base.xml:290
 #, python-format
 msgid "Creation Date:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:178
+#: code:addons/web/static/src/xml/base.xml:286
 #, python-format
 msgid "Creation User:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:179
+#: code:addons/web/static/src/js/chrome/search_menus.js:180
 #, python-format
 msgid "Custom Filter"
 msgstr ""
@@ -792,7 +806,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:488
+#: code:addons/web/static/src/xml/base.xml:550
 #: code:addons/web/static/src/xml/web_calendar.xml:71
 #, python-format
 msgid "Day"
@@ -800,14 +814,14 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1481
+#: code:addons/web/static/src/js/fields/basic_fields.js:1570
 #, python-format
 msgid "Deactivate"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:337
+#: code:addons/web/static/src/xml/base.xml:445
 #, python-format
 msgid "Default:"
 msgstr ""
@@ -815,24 +829,24 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:285
-#: code:addons/web/static/src/js/views/form/form_controller.js:152
-#: code:addons/web/static/src/js/views/list/list_controller.js:137
-#: code:addons/web/static/src/xml/base.xml:1162
-#: code:addons/web/static/src/xml/kanban.xml:22
+#: code:addons/web/static/src/js/views/form/form_controller.js:155
+#: code:addons/web/static/src/js/views/list/list_controller.js:148
+#: code:addons/web/static/src/xml/base.xml:1224
+#: code:addons/web/static/src/xml/kanban.xml:23
 #, python-format
 msgid "Delete"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:239
+#: code:addons/web/static/src/xml/base.xml:347
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:901
+#: code:addons/web/static/src/xml/base.xml:963
 #, python-format
 msgid "Delete this file"
 msgstr ""
@@ -840,11 +854,11 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/view_dialogs.js:111
-#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:28
-#: code:addons/web/static/src/xml/base.xml:303
-#: code:addons/web/static/src/xml/base.xml:326
-#: code:addons/web/static/src/xml/kanban.xml:53
-#: code:addons/web/static/src/xml/kanban.xml:62
+#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:31
+#: code:addons/web/static/src/xml/base.xml:411
+#: code:addons/web/static/src/xml/base.xml:434
+#: code:addons/web/static/src/xml/kanban.xml:66
+#: code:addons/web/static/src/xml/report.xml:18
 #, python-format
 msgid "Discard"
 msgstr ""
@@ -865,14 +879,14 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1250
+#: code:addons/web/static/src/xml/base.xml:1312
 #, python-format
 msgid "Documentation"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:33
+#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:36
 #, python-format
 msgid "Domain"
 msgstr ""
@@ -886,7 +900,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:65
+#: code:addons/web/static/src/xml/base.xml:41
 #, python-format
 msgid "Domain:"
 msgstr ""
@@ -900,14 +914,14 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:476
+#: code:addons/web/static/src/xml/base.xml:538
 #, python-format
 msgid "Download xls"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:158
+#: code:addons/web/static/src/js/views/form/form_controller.js:161
 #, python-format
 msgid "Duplicate"
 msgstr ""
@@ -916,46 +930,48 @@ msgstr ""
 #. openerp-web
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:279
 #: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:50
-#: code:addons/web/static/src/xml/base.xml:158
-#: code:addons/web/static/src/xml/base.xml:312
-#: code:addons/web/static/src/xml/base.xml:822
+#: code:addons/web/static/src/xml/base.xml:266
+#: code:addons/web/static/src/xml/base.xml:420
+#: code:addons/web/static/src/xml/base.xml:884
+#: code:addons/web/static/src/xml/kanban.xml:65
+#: code:addons/web/static/src/xml/report.xml:14
 #, python-format
 msgid "Edit"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:127
+#: code:addons/web/static/src/xml/base.xml:236
 #, python-format
 msgid "Edit Action"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:301
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:322
 #, python-format
 msgid "Edit Column"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:159
+#: code:addons/web/static/src/xml/base.xml:602
 #, python-format
-msgid "Edit SearchView"
+msgid "Edit Domain"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:21
+#: code:addons/web/static/src/xml/base.xml:267
 #, python-format
-msgid "Edit Stage"
+msgid "Edit SearchView"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:540
+#: code:addons/web/static/src/xml/kanban.xml:22
 #, python-format
-msgid "Edit domain"
+msgid "Edit Stage"
 msgstr ""
 
 #. module: web
@@ -964,45 +980,50 @@ msgid "Email"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_standard
+msgid "Email:"
+msgstr ""
+
+#. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome/search_menus.js:86
 #: code:addons/web/static/src/js/chrome/search_menus.js:93
-#: code:addons/web/static/src/js/chrome/view_manager.js:311
-#: code:addons/web/static/src/js/services/crash_manager.js:130
+#: code:addons/web/static/src/js/chrome/view_manager.js:313
+#: code:addons/web/static/src/js/services/crash_manager.js:135
 #, python-format
 msgid "Error"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:780
+#: code:addons/web/controllers/main.py:781
 #, python-format
 msgid "Error, password not changed !"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:488
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:490
 #, python-format
 msgid "Everybody's calendars"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:488
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:490
 #, python-format
 msgid "Everything"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:475
+#: code:addons/web/static/src/xml/base.xml:537
 #, python-format
 msgid "Expand all"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/list/list_controller.js:122
+#: code:addons/web/static/src/js/views/list/list_controller.js:133
 #, python-format
 msgid "Export"
 msgstr ""
@@ -1016,7 +1037,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1110
+#: code:addons/web/static/src/xml/base.xml:1172
 #, python-format
 msgid "Export Formats :"
 msgstr ""
@@ -1030,50 +1051,50 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1103
+#: code:addons/web/static/src/xml/base.xml:1165
 #, python-format
 msgid "Export Type :"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1106
+#: code:addons/web/static/src/xml/base.xml:1168
 #, python-format
 msgid "Export all Data"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/view_manager.js:510
+#: code:addons/web/static/src/js/chrome/view_manager.js:512
 #, python-format
 msgid "Failed to evaluate search criterions"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:44
+#: code:addons/web/static/src/js/fields/field_utils.js:45
 #, python-format
 msgid "False"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1072
+#: code:addons/web/static/src/xml/base.xml:1134
 #, python-format
 msgid "Favorites"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:41
+#: code:addons/web/static/src/xml/base.xml:17
 #, python-format
 msgid "Field:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:354
-#: code:addons/web/static/src/xml/base.xml:156
+#: code:addons/web/static/src/js/widgets/debug_manager.js:465
+#: code:addons/web/static/src/xml/base.xml:264
 #, python-format
 msgid "Fields View Get"
 msgstr ""
@@ -1087,28 +1108,28 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1129
+#: code:addons/web/static/src/xml/base.xml:1191
 #, python-format
 msgid "Fields to export"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1034
+#: code:addons/web/static/src/js/fields/basic_fields.js:1071
 #, python-format
 msgid "File Upload"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1014
+#: code:addons/web/static/src/js/fields/basic_fields.js:1051
 #, python-format
 msgid "File upload"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:564
+#: code:addons/web/static/src/js/chrome/search_inputs.js:563
 #, python-format
 msgid "Filter"
 msgstr ""
@@ -1122,7 +1143,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:508
+#: code:addons/web/static/src/js/chrome/search_inputs.js:507
 #, python-format
 msgid "Filter on: %s"
 msgstr ""
@@ -1136,21 +1157,21 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:939
+#: code:addons/web/static/src/xml/base.xml:1001
 #, python-format
 msgid "Filters"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:474
+#: code:addons/web/static/src/xml/base.xml:536
 #, python-format
 msgid "Flip axis"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:19
+#: code:addons/web/static/src/xml/kanban.xml:20
 #, python-format
 msgid "Fold"
 msgstr ""
@@ -1173,7 +1194,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1262
+#: code:addons/web/static/src/xml/base.xml:1333
 #, python-format
 msgid "Get this feature and much more with Odoo Enterprise!"
 msgstr ""
@@ -1194,15 +1215,15 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:717
-#: code:addons/web/static/src/xml/base.xml:1051
+#: code:addons/web/static/src/js/chrome/search_inputs.js:716
+#: code:addons/web/static/src/xml/base.xml:1113
 #, python-format
 msgid "Group By"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:692
+#: code:addons/web/static/src/js/chrome/search_inputs.js:691
 #, python-format
 msgid "Group by: %s"
 msgstr ""
@@ -1214,28 +1235,35 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:166
+#: code:addons/web/static/src/js/core/dialog.js:250
+#, python-format
+msgid "I am sure about this"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
 #, python-format
 msgid "ID:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1115
+#: code:addons/web/static/src/js/fields/basic_fields.js:1152
 #, python-format
 msgid "Image"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1105
+#: code:addons/web/static/src/xml/base.xml:1167
 #, python-format
 msgid "Import-Compatible Export"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1480
+#: code:addons/web/static/src/js/fields/basic_fields.js:1569
 #, python-format
 msgid "Inactive"
 msgstr ""
@@ -1249,15 +1277,15 @@ msgid "Invalid data"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:676
-#: code:addons/web/controllers/main.py:690
+#: code:addons/web/controllers/main.py:677
+#: code:addons/web/controllers/main.py:691
 #, python-format
 msgid "Invalid database name. Only alphanumerical characters, underscore, hyphen and dot are allowed."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:538
+#: code:addons/web/static/src/xml/base.xml:600
 #, python-format
 msgid "Invalid domain"
 msgstr ""
@@ -1265,7 +1293,7 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/model_field_selector.js:392
-#: code:addons/web/static/src/xml/base.xml:669
+#: code:addons/web/static/src/xml/base.xml:731
 #, python-format
 msgid "Invalid field chain"
 msgstr ""
@@ -1286,41 +1314,41 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_view.js:15
+#: code:addons/web/static/src/js/views/kanban/kanban_view.js:16
 #, python-format
 msgid "Kanban"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:787
+#: code:addons/web/controllers/main.py:788
 #, python-format
 msgid "Languages"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:190
+#: code:addons/web/static/src/xml/base.xml:298
 #, python-format
 msgid "Latest Modification Date:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:186
+#: code:addons/web/static/src/xml/base.xml:294
 #, python-format
 msgid "Latest Modification by:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:122
+#: code:addons/web/static/src/xml/base.xml:231
 #, python-format
 msgid "Leave the Developer Tools"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:448
+#: code:addons/web/static/src/xml/base.xml:510
 #, python-format
 msgid "Line Chart"
 msgstr ""
@@ -1367,19 +1395,24 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1255
+#: code:addons/web/static/src/xml/base.xml:1317
 #, python-format
 msgid "Log out"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:457
+#: code:addons/web/static/src/js/chrome/search_inputs.js:456
 #, python-format
 msgid "M2O search fields do not currently handle multiple default values"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_boxed
+msgid "Mail:"
+msgstr ""
+
+#. module: web
 #: model:ir.ui.view,arch_db:web.login_layout
 msgid "Manage Databases"
 msgstr ""
@@ -1387,28 +1420,28 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/debug_manager.js:258
-#: code:addons/web/static/src/xml/base.xml:130
+#: code:addons/web/static/src/xml/base.xml:239
 #, python-format
 msgid "Manage Filters"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:571
+#: code:addons/web/static/src/xml/base.xml:633
 #, python-format
 msgid "Match"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:578
+#: code:addons/web/static/src/xml/base.xml:640
 #, python-format
 msgid "Match records with"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:576
+#: code:addons/web/static/src/xml/base.xml:638
 #, python-format
 msgid "Match records with the following rule:"
 msgstr ""
@@ -1422,8 +1455,8 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:435
-#: code:addons/web/static/src/xml/base.xml:462
+#: code:addons/web/static/src/xml/base.xml:497
+#: code:addons/web/static/src/xml/base.xml:524
 #, python-format
 msgid "Measures"
 msgstr ""
@@ -1437,7 +1470,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:131
+#: code:addons/web/static/src/xml/base.xml:107
 #, python-format
 msgid "Method:"
 msgstr ""
@@ -1451,29 +1484,29 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1267
+#: code:addons/web/static/src/xml/base.xml:1338
 #, python-format
 msgid "Mobile support"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:233
+#: code:addons/web/static/src/xml/base.xml:341
 #, python-format
 msgid "Modified by :"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:69
-#: code:addons/web/static/src/xml/base_common.xml:118
+#: code:addons/web/static/src/xml/base.xml:45
+#: code:addons/web/static/src/xml/base.xml:94
 #, python-format
 msgid "Modifiers:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:490
+#: code:addons/web/static/src/xml/base.xml:552
 #: code:addons/web/static/src/xml/web_calendar.xml:73
 #, python-format
 msgid "Month"
@@ -1481,8 +1514,8 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form/form_renderer.js:290
-#: code:addons/web/static/src/xml/base.xml:805
+#: code:addons/web/static/src/js/views/form/form_renderer.js:275
+#: code:addons/web/static/src/xml/base.xml:867
 #, python-format
 msgid "More"
 msgstr ""
@@ -1494,56 +1527,56 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1125
+#: code:addons/web/static/src/xml/base.xml:1187
 #, python-format
 msgid "Move Down"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1124
+#: code:addons/web/static/src/xml/base.xml:1186
 #, python-format
 msgid "Move Up"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1254
+#: code:addons/web/static/src/xml/base.xml:1316
 #, python-format
 msgid "My Odoo.com account"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:566
+#: code:addons/web/static/src/xml/base.xml:628
 #, python-format
 msgid "NONE"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1179
+#: code:addons/web/static/src/xml/base.xml:1241
 #, python-format
 msgid "Name:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_model.js:439
+#: code:addons/web/static/src/js/views/basic/basic_model.js:491
 #, python-format
 msgid "New"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:57
+#: code:addons/web/static/src/xml/base.xml:166
 #, python-format
 msgid "New Password"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1266
+#: code:addons/web/static/src/xml/base.xml:1337
 #, python-format
 msgid "New design"
 msgstr ""
@@ -1557,7 +1590,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:174
+#: code:addons/web/static/src/xml/base.xml:282
 #, python-format
 msgid "No Update:"
 msgstr ""
@@ -1571,7 +1604,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:506
+#: code:addons/web/static/src/xml/base.xml:568
 #, python-format
 msgid "No data available for this pivot table.  Try to add some records, or make sure\n"
 "        that there is at least one measure and no active filter in the search bar."
@@ -1586,7 +1619,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:505
+#: code:addons/web/static/src/xml/base.xml:567
 #, python-format
 msgid "No data to display."
 msgstr ""
@@ -1600,21 +1633,21 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:243
+#: code:addons/web/static/src/js/fields/field_utils.js:242
 #, python-format
 msgid "No records"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:372
+#: code:addons/web/static/src/js/fields/relational_fields.js:382
 #, python-format
 msgid "No results to show..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:556
+#: code:addons/web/static/src/xml/base.xml:618
 #, python-format
 msgid "None"
 msgstr ""
@@ -1628,22 +1661,22 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:776
+#: code:addons/web/static/src/xml/base.xml:838
 #, python-format
 msgid "Not shown in kanban"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:45
-#: code:addons/web/static/src/xml/base_common.xml:110
+#: code:addons/web/static/src/xml/base.xml:21
+#: code:addons/web/static/src/xml/base.xml:86
 #, python-format
 msgid "Object:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:37
+#: code:addons/web/static/src/js/core/dialog.js:51
 #, python-format
 msgid "Odoo"
 msgstr ""
@@ -1657,8 +1690,8 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:165
-#: code:addons/web/static/src/js/services/crash_manager.js:154
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:172
+#: code:addons/web/static/src/js/services/crash_manager.js:156
 #, python-format
 msgid "Odoo Client Error"
 msgstr ""
@@ -1687,109 +1720,129 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/services/crash_manager.js:108
-#: code:addons/web/static/src/js/services/crash_manager.js:195
+#: code:addons/web/static/src/js/services/crash_manager.js:197
 #, python-format
 msgid "Odoo Warning"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1497
+#: code:addons/web/static/src/js/fields/basic_fields.js:1586
 #, python-format
 msgid "Off"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:41
-#: code:addons/web/static/src/js/core/dialog.js:167
-#: code:addons/web/static/src/js/core/dialog.js:185
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:264
-#: code:addons/web/static/src/xml/base.xml:1152
+#: code:addons/web/static/src/js/core/dialog.js:55
+#: code:addons/web/static/src/js/core/dialog.js:199
+#: code:addons/web/static/src/js/core/dialog.js:217
+#: code:addons/web/static/src/js/core/dialog.js:268
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:285
+#: code:addons/web/static/src/xml/base.xml:1214
 #, python-format
 msgid "Ok"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:53
+#: code:addons/web/static/src/xml/base.xml:162
 #, python-format
 msgid "Old Password"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1496
+#: code:addons/web/static/src/js/fields/basic_fields.js:1585
 #, python-format
 msgid "On"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:77
+#: code:addons/web/static/src/xml/base.xml:53
 #, python-format
 msgid "On change:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1698
+#: code:addons/web/static/src/js/fields/basic_fields.js:1832
 #, python-format
 msgid "Only Integer Value should be valid."
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:488
+#: code:addons/web/controllers/main.py:486
 #, python-format
 msgid "Only employee can access this database. Please contact the administrator."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:373
+#: code:addons/web/static/src/xml/base.xml:481
 #, python-format
 msgid "Only you"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1489
+#: code:addons/web/static/src/js/fields/basic_fields.js:1578
 #, python-format
 msgid "Open"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:105
+#: code:addons/web/static/src/xml/base.xml:215
 #, python-format
 msgid "Open Developer Tools"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:114
+#: code:addons/web/static/src/xml/base.xml:223
 #, python-format
 msgid "Open View"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:460
+#: code:addons/web/static/src/js/fields/relational_fields.js:470
 #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:265
-#: code:addons/web/static/src/js/views/form/form_controller.js:468
-#: code:addons/web/static/src/js/views/form/form_controller.js:487
+#: code:addons/web/static/src/js/views/form/form_controller.js:473
+#: code:addons/web/static/src/js/views/form/form_controller.js:492
 #, python-format
 msgid "Open: "
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_background
+msgid "Page:\n"
+"                    <span class=\"page\"/>\n"
+"                    of\n"
+"                    <span class=\"topage\"/>"
+msgstr ""
+
+#. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_boxed
+#: model:ir.ui.view,arch_db:web.external_layout_standard
+msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
+msgstr ""
+
+#. module: web
 #: model:ir.ui.view,arch_db:web.login
 msgid "Password"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_standard
+msgid "Phone:"
+msgstr ""
+
+#. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:449
+#: code:addons/web/static/src/xml/base.xml:511
 #, python-format
 msgid "Pie Chart"
 msgstr ""
@@ -1824,14 +1877,14 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1140
+#: code:addons/web/static/src/xml/base.xml:1202
 #, python-format
 msgid "Please note that only the selected ids will be exported."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1139
+#: code:addons/web/static/src/xml/base.xml:1201
 #, python-format
 msgid "Please pay attention that all records matching your search filter will be exported. Not only the selected ids."
 msgstr ""
@@ -1852,7 +1905,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:38
+#: code:addons/web/static/src/xml/base.xml:147
 #, python-format
 msgid "Please use the copy button to report the error to your support service."
 msgstr ""
@@ -1869,28 +1922,32 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1253
+#: code:addons/web/static/src/xml/base.xml:1315
 #, python-format
 msgid "Preferences"
 msgstr ""
 
 #. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/chrome/sidebar.js:33
-#, python-format
-msgid "Print"
+#: model:ir.actions.report,name:web.action_report_externalpreview
+msgid "Preview External Report"
+msgstr ""
+
+#. module: web
+#: model:ir.actions.report,name:web.action_report_internalpreview
+msgid "Preview Internal Report"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:153
+#: code:addons/web/static/src/js/chrome/sidebar.js:33
+#: code:addons/web/static/src/xml/report.xml:11
 #, python-format
-msgid "Print Workflow"
+msgid "Print"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:491
+#: code:addons/web/static/src/xml/base.xml:553
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -1904,27 +1961,34 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:81
+#: code:addons/web/static/src/xml/base.xml:57
 #, python-format
 msgid "Relation:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1122
+#: code:addons/web/static/src/xml/base.xml:1184
 #, python-format
 msgid "Remove"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1123
+#: code:addons/web/static/src/xml/base.xml:1185
 #, python-format
 msgid "Remove All"
 msgstr ""
 
 #. module: web
 #. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1494
+#, python-format
+msgid "Remove from Favorites"
+msgstr ""
+
+#. module: web
+#. openerp-web
 #: code:addons/web/static/src/xml/web_calendar.xml:57
 #, python-format
 msgid "Remove this favorite from the list"
@@ -1932,21 +1996,28 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1485
+#: code:addons/web/static/src/js/report/qwebactionmanager.js:94
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1574
 #, python-format
 msgid "Restore"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:26
+#: code:addons/web/static/src/xml/kanban.xml:27
 #, python-format
 msgid "Restore Records"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:113
+#: code:addons/web/static/src/xml/base.xml:222
 #, python-format
 msgid "Run JS Tests"
 msgstr ""
@@ -1954,10 +2025,11 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/view_dialogs.js:125
-#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:25
-#: code:addons/web/static/src/xml/base.xml:300
-#: code:addons/web/static/src/xml/base.xml:322
-#: code:addons/web/static/src/xml/base.xml:1090
+#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:28
+#: code:addons/web/static/src/xml/base.xml:408
+#: code:addons/web/static/src/xml/base.xml:430
+#: code:addons/web/static/src/xml/base.xml:1152
+#: code:addons/web/static/src/xml/report.xml:17
 #, python-format
 msgid "Save"
 msgstr ""
@@ -1971,42 +2043,49 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1170
+#: code:addons/web/static/src/js/fields/basic_fields.js:1207
 #, python-format
 msgid "Save As..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1152
+#: code:addons/web/static/src/xml/base.xml:1214
 #, python-format
 msgid "Save as:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1078
+#: code:addons/web/static/src/xml/base.xml:1140
 #, python-format
 msgid "Save current search"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1129
+#: code:addons/web/static/src/js/widgets/debug_manager.js:429
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1191
 #, python-format
 msgid "Save fields list"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1155
+#: code:addons/web/static/src/xml/base.xml:1217
 #, python-format
 msgid "Saved exports:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:362
+#: code:addons/web/static/src/js/chrome/search_inputs.js:361
 #, python-format
 msgid "Search %(field)s at: %(value)s"
 msgstr ""
@@ -2015,44 +2094,44 @@ msgstr ""
 #. openerp-web
 #: code:addons/web/static/src/js/chrome/search_inputs.js:194
 #: code:addons/web/static/src/js/chrome/search_inputs.js:213
-#: code:addons/web/static/src/js/chrome/search_inputs.js:403
+#: code:addons/web/static/src/js/chrome/search_inputs.js:402
 #, python-format
 msgid "Search %(field)s for: %(value)s"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:333
+#: code:addons/web/static/src/js/fields/relational_fields.js:343
 #, python-format
 msgid "Search More..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:922
+#: code:addons/web/static/src/xml/base.xml:984
 #, python-format
 msgid "Search..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:395
+#: code:addons/web/static/src/js/fields/relational_fields.js:405
 #, python-format
 msgid "Search: "
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:42
+#: code:addons/web/static/src/xml/base.xml:151
 #, python-format
 msgid "See details"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:366
-#: code:addons/web/static/src/xml/base.xml:852
-#: code:addons/web/static/src/xml/base.xml:853
+#: code:addons/web/static/src/js/views/view_dialogs.js:377
+#: code:addons/web/static/src/xml/base.xml:914
+#: code:addons/web/static/src/xml/base.xml:915
 #, python-format
 msgid "Select"
 msgstr ""
@@ -2064,7 +2143,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:542
+#: code:addons/web/static/src/xml/base.xml:604
 #, python-format
 msgid "Select a model to add a filter."
 msgstr ""
@@ -2078,28 +2157,35 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:2099
+#: code:addons/web/static/src/js/fields/basic_fields.js:2242
 #, python-format
 msgid "Selected records"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:85
+#: code:addons/web/static/src/xml/base.xml:61
 #, python-format
 msgid "Selection:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:150
+#: code:addons/web/static/src/js/widgets/debug_manager.js:426
+#, python-format
+msgid "Set Default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:259
 #, python-format
 msgid "Set Defaults"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1087
+#: code:addons/web/static/src/xml/base.xml:1149
 #, python-format
 msgid "Share with all users"
 msgstr ""
@@ -2113,20 +2199,20 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:57
+#: code:addons/web/static/src/xml/base.xml:33
 #, python-format
 msgid "Size:"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:1084
+#: code:addons/web/controllers/main.py:1089
 #, python-format
 msgid "Something horrible happened"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:122
+#: code:addons/web/static/src/xml/base.xml:98
 #, python-format
 msgid "Special:"
 msgstr ""
@@ -2154,21 +2240,21 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1313
 #, python-format
 msgid "Support"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1498
+#: code:addons/web/static/src/js/fields/basic_fields.js:1587
 #, python-format
 msgid "Switch Off"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1499
+#: code:addons/web/static/src/js/fields/basic_fields.js:1588
 #, python-format
 msgid "Switch On"
 msgstr ""
@@ -2189,12 +2275,25 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:131
+#: code:addons/web/static/src/js/widgets/switch_company_menu.js:38
+#, python-format
+msgid "Tap on the list to change company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:240
 #, python-format
 msgid "Technical Translation"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_boxed
+#: model:ir.ui.view,arch_db:web.external_layout_clean
+msgid "Tel:"
+msgstr ""
+
+#. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:502
 #: code:addons/web/static/src/js/widgets/domain_selector.js:548
@@ -2211,68 +2310,84 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1170
+#: code:addons/web/static/src/js/fields/basic_fields.js:1207
 #, python-format
 msgid "The field is empty, there's nothing to save !"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:391
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:379
 #, python-format
 msgid "The following fields are invalid:"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:774
+#: code:addons/web/controllers/main.py:775
 #, python-format
 msgid "The new password and its confirmation must be identical."
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:779
+#: code:addons/web/controllers/main.py:780
 #, python-format
 msgid "The old password you provided is incorrect, your password was not changed."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:77
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:74
 #, python-format
 msgid "The record has been modified, your changes will be discarded. Are you sure you want to ?"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1013
+#: code:addons/web/static/src/js/fields/basic_fields.js:1050
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1200
+#: code:addons/web/static/src/js/fields/relational_fields.js:1244
 #, python-format
 msgid "The type of the field '%s' must be a many2many field with a relation to 'ir.attachment' model."
 msgstr ""
 
 #. module: web
+#: code:addons/web/controllers/main.py:1426
+#, python-format
+msgid "There are too many rows (%s rows, limit: 65535) to export as Excel 97-2003 (.xls) format. Consider splitting the export."
+msgstr ""
+
+#. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1034
+#: code:addons/web/static/src/js/fields/basic_fields.js:1071
 #, python-format
 msgid "There was a problem while uploading your file"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:250
+#: code:addons/web/static/src/js/chrome/search_menus.js:258
 #, python-format
 msgid "This filter is global and will be removed for everybody if you continue."
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.preview_externalreport
+msgid "This is a sample of an external report."
+msgstr ""
+
+#. module: web
+#: model:ir.ui.view,arch_db:web.preview_internalreport
+msgid "This is a sample of an internal report."
+msgstr ""
+
+#. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1096
+#: code:addons/web/static/src/xml/base.xml:1158
 #, python-format
 msgid "This wizard will export all data that matches the current search criteria to a CSV file.\n"
 "        You can export all data or only the fields that can be reimported after modification."
@@ -2287,6 +2402,13 @@ msgstr ""
 
 #. module: web
 #. openerp-web
+#: code:addons/web/static/src/xml/kanban.xml:63
+#, python-format
+msgid "Title"
+msgstr ""
+
+#. module: web
+#. openerp-web
 #: code:addons/web/static/src/xml/web_calendar.xml:67
 #, python-format
 msgid "Today"
@@ -2294,69 +2416,78 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:117
+#: code:addons/web/static/src/xml/base.xml:226
 #, python-format
 msgid "Toggle Timelines"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:447
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:557
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:453
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:563
 #, python-format
 msgid "Total"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:167
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:174
 #, python-format
 msgid "Traceback:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:44
+#: code:addons/web/static/src/js/fields/field_utils.js:45
 #, python-format
 msgid "True"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:261
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:269
 #, python-format
 msgid "Trying to reconnect..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:49
+#: code:addons/web/static/src/xml/base.xml:25
 #, python-format
 msgid "Type:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/list/list_controller.js:131
+#: code:addons/web/static/src/js/report/qwebactionmanager.js:17
+#, python-format
+msgid "Unable to find Wkhtmltopdf on this \n"
+"system. The report will be shown in html.<br><br><a href=\"http://wkhtmltopdf.org/\" target=\"_blank\">\n"
+"wkhtmltopdf.org</a>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/list/list_controller.js:142
 #, python-format
 msgid "Unarchive"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_model.js:172
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:64
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:67
-#: code:addons/web/static/src/js/views/list/list_renderer.js:379
-#: code:addons/web/static/src/js/views/list/list_renderer.js:382
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:660
+#: code:addons/web/static/src/js/views/graph/graph_model.js:179
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:75
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:78
+#: code:addons/web/static/src/js/views/list/list_renderer.js:385
+#: code:addons/web/static/src/js/views/list/list_renderer.js:388
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:689
 #, python-format
 msgid "Undefined"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:512
+#: code:addons/web/static/src/xml/base.xml:574
 #, python-format
 msgid "Unhandled widget"
 msgstr ""
@@ -2370,7 +2501,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/_deprecated/data.js:736
+#: code:addons/web/static/src/js/_deprecated/data.js:737
 #, python-format
 msgid "Unnamed"
 msgstr ""
@@ -2384,7 +2515,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1238
+#: code:addons/web/static/src/xml/base.xml:1300
 #, python-format
 msgid "Update translations"
 msgstr ""
@@ -2398,37 +2529,37 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1268
+#: code:addons/web/static/src/xml/base.xml:1339
 #, python-format
 msgid "Upgrade to future versions"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:852
+#: code:addons/web/static/src/xml/base.xml:914
 #, python-format
 msgid "Upload your file"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1358
+#: code:addons/web/static/src/js/fields/relational_fields.js:1402
 #, python-format
 msgid "Uploading Error"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:825
-#: code:addons/web/static/src/xml/base.xml:856
-#: code:addons/web/static/src/xml/base.xml:911
+#: code:addons/web/static/src/xml/base.xml:887
+#: code:addons/web/static/src/xml/base.xml:918
+#: code:addons/web/static/src/xml/base.xml:973
 #, python-format
 msgid "Uploading..."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1084
+#: code:addons/web/static/src/xml/base.xml:1146
 #, python-format
 msgid "Use by default"
 msgstr ""
@@ -2442,21 +2573,21 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:158
+#: code:addons/web/static/src/xml/base.xml:266
 #, python-format
 msgid "View"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:129
+#: code:addons/web/static/src/xml/base.xml:238
 #, python-format
 msgid "View Fields"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:152
+#: code:addons/web/static/src/xml/base.xml:261
 #, python-format
 msgid "View Metadata"
 msgstr ""
@@ -2465,7 +2596,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/web/static/src/js/services/crash_manager.js:13
 #: code:addons/web/static/src/js/services/crash_manager.js:14
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:80
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:77
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2481,8 +2612,14 @@ msgid "Web Tests"
 msgstr ""
 
 #. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_boxed
+#: model:ir.ui.view,arch_db:web.external_layout_standard
+msgid "Web:"
+msgstr ""
+
+#. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:489
+#: code:addons/web/static/src/xml/base.xml:551
 #: code:addons/web/static/src/xml/web_calendar.xml:72
 #, python-format
 msgid "Week"
@@ -2490,34 +2627,41 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:53
+#: code:addons/web/static/src/js/widgets/rainbow_man.js:32
+#, python-format
+msgid "Well Done!"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:29
 #, python-format
 msgid "Widget:"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:485
+#: code:addons/web/controllers/main.py:483
 #, python-format
 msgid "Wrong login/password"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1698
+#: code:addons/web/static/src/js/fields/basic_fields.js:1832
 #, python-format
 msgid "Wrong value entered!"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:170
+#: code:addons/web/static/src/xml/base.xml:278
 #, python-format
 msgid "XML ID:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:492
+#: code:addons/web/static/src/xml/base.xml:554
 #, python-format
 msgid "Year"
 msgstr ""
@@ -2525,14 +2669,14 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome/search_inputs.js:332
-#: code:addons/web/static/src/xml/base_common.xml:73
+#: code:addons/web/static/src/xml/base.xml:49
 #, python-format
 msgid "Yes"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:270
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:278
 #, python-format
 msgid "You are back online"
 msgstr ""
@@ -2552,14 +2696,14 @@ msgid "You cannot follow relations for this field chain construction"
 msgstr ""
 
 #. module: web
-#: code:addons/web/controllers/main.py:772
+#: code:addons/web/controllers/main.py:773
 #, python-format
 msgid "You cannot leave any password empty."
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1236
+#: code:addons/web/static/src/xml/base.xml:1298
 #, python-format
 msgid "You have updated"
 msgstr ""
@@ -2573,6 +2717,24 @@ msgstr ""
 
 #. module: web
 #. openerp-web
+#: code:addons/web/static/src/js/report/qwebactionmanager.js:18
+#, python-format
+msgid "You need to start OpenERP with at least two \n"
+"workers to print a pdf version of the reports."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/report/qwebactionmanager.js:19
+#, python-format
+msgid "You should upgrade your version of\n"
+"Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\n"
+"support for table-breaking between pages.<br><br><a href=\"http://wkhtmltopdf.org/\" \n"
+"target=\"_blank\">wkhtmltopdf.org</a>"
+msgstr ""
+
+#. module: web
+#. openerp-web
 #: code:addons/web/static/src/js/services/crash_manager.js:58
 #, python-format
 msgid "Your Odoo session expired. Please refresh the current web page."
@@ -2580,54 +2742,66 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_record.js:196
+#: code:addons/web/static/src/js/report/qwebactionmanager.js:20
+#, python-format
+msgid "Your installation of Wkhtmltopdf seems to be broken. The report will be shown in html.<br><br><a href=\"http://wkhtmltopdf.org/\" target=\"_blank\">wkhtmltopdf.org</a>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:199
 #, python-format
 msgid "[No widget %s]"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:102
+#: code:addons/web/static/src/js/core/translation.js:113
 #, python-format
 msgid "a day ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:98
+#: code:addons/web/static/src/js/core/translation.js:109
 #, python-format
 msgid "about a minute ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:104
+#: code:addons/web/static/src/js/core/translation.js:115
 #, python-format
 msgid "about a month ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:106
+#: code:addons/web/static/src/js/core/translation.js:117
 #, python-format
 msgid "about a year ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:100
+#: code:addons/web/static/src/js/core/translation.js:111
 #, python-format
 msgid "about an hour ago"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:571
+#: code:addons/web/static/src/xml/base.xml:633
 #, python-format
 msgid "all records"
 msgstr ""
 
 #. module: web
+#: model:ir.model,name:web.model_base
+msgid "base"
+msgstr ""
+
+#. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:28
 #, python-format
@@ -2673,11 +2847,16 @@ msgid "in"
 msgstr ""
 
 #. module: web
+#: model:ir.model,name:web.model_ir_qweb_field_image
+msgid "ir.qweb.field.image"
+msgstr ""
+
+#. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome/search_filters.js:284
 #: code:addons/web/static/src/js/chrome/search_filters.js:319
 #: code:addons/web/static/src/js/widgets/domain_selector.js:828
-#: code:addons/web/static/src/xml/base.xml:659
+#: code:addons/web/static/src/xml/base.xml:721
 #, python-format
 msgid "is"
 msgstr ""
@@ -2786,7 +2965,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/core/translation.js:97
+#: code:addons/web/static/src/js/core/translation.js:108
 #, python-format
 msgid "less than a minute ago"
 msgstr ""
@@ -2802,7 +2981,7 @@ msgstr ""
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:18
-#: code:addons/web/static/src/xml/base.xml:661
+#: code:addons/web/static/src/xml/base.xml:723
 #, python-format
 msgid "not"
 msgstr ""
@@ -2837,22 +3016,22 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:580
+#: code:addons/web/static/src/xml/base.xml:642
 #, python-format
 msgid "of the following rules:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:595
+#: code:addons/web/static/src/xml/base.xml:657
 #, python-format
 msgid "of:"
 msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:652
-#: code:addons/web/static/src/xml/base.xml:1019
+#: code:addons/web/static/src/xml/base.xml:714
+#: code:addons/web/static/src/xml/base.xml:1081
 #, python-format
 msgid "or"
 msgstr ""
@@ -2866,7 +3045,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:536
+#: code:addons/web/static/src/xml/base.xml:598
 #, python-format
 msgid "record(s)"
 msgstr ""
@@ -2880,7 +3059,7 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/xml/base.xml:661
+#: code:addons/web/static/src/xml/base.xml:723
 #, python-format
 msgid "set"
 msgstr ""
diff --git a/addons/web_diagram/i18n/web_diagram.pot b/addons/web_diagram/i18n/web_diagram.pot
index e043bdfb6d6..79754539163 100644
--- a/addons/web_diagram/i18n/web_diagram.pot
+++ b/addons/web_diagram/i18n/web_diagram.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index 9f46e207c83..54cc8fda908 100644
--- a/addons/web_editor/i18n/web_editor.pot
+++ b/addons/web_editor/i18n/web_editor.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,16 +17,16 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:919
+#: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
-msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
+msgid "(URL or Embed)"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:193
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:922
 #, python-format
-msgid "(Youtube, Vimeo, Dailymotion)"
+msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
 msgstr ""
 
 #. module: web_editor
@@ -66,14 +66,21 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:583
+#: code:addons/web_editor/static/src/js/widgets/ace.js:569
 #, python-format
 msgid "A server error occured. Please check you correctly signed in and that the file you are saving is well-formed."
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:971
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Accepts"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:974
 #, python-format
 msgid "Action"
 msgstr ""
@@ -99,21 +106,21 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:953
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:956
 #, python-format
 msgid "Align center"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:952
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:955
 #, python-format
 msgid "Align left"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:954
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:957
 #, python-format
 msgid "Align right"
 msgstr ""
@@ -132,7 +139,7 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:298
+#: code:addons/web_editor/static/src/xml/editor.xml:315
 #, python-format
 msgid "Assign a focal point that will always be visible"
 msgstr ""
@@ -144,64 +151,64 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:24
+#: code:addons/web_editor/static/src/xml/snippets.xml:11
 #, python-format
 msgid "Auto size"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:214
+#: code:addons/web_editor/static/src/xml/editor.xml:204
 #, python-format
 msgid "Autoplay"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:960
-#: code:addons/web_editor/static/src/xml/snippets.xml:49
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:963
+#: code:addons/web_editor/static/src/xml/snippets.xml:32
 #, python-format
 msgid "Background Color"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:667
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:964
 #, python-format
 msgid "Background Image Sizing"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:337
+#: code:addons/web_editor/static/src/xml/editor.xml:354
 #, python-format
 msgid "Background height"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:347
+#: code:addons/web_editor/static/src/xml/editor.xml:364
 #, python-format
 msgid "Background position"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:369
+#: code:addons/web_editor/static/src/xml/editor.xml:386
 #, python-format
 msgid "Background repeat"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:325
+#: code:addons/web_editor/static/src/xml/editor.xml:342
 #, python-format
 msgid "Background size"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:328
+#: code:addons/web_editor/static/src/xml/editor.xml:345
 #, python-format
 msgid "Background width"
 msgstr ""
@@ -218,50 +225,43 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.editor.js:804
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:204
 #, python-format
 msgid "Block"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:8
-#, python-format
-msgid "Block style"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:880
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:883
 #, python-format
 msgid "Bold"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:108
+#: code:addons/web_editor/static/src/js/widgets/ace.js:827
 #, python-format
 msgid "Careful !"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:100
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:95
 #, python-format
 msgid "Center"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/widgets.js:53
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:55
 #, python-format
 msgid "Change media description and tooltip"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:969
-#: code:addons/web_editor/static/src/js/translator.js:74
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:972
+#: code:addons/web_editor/static/src/js/editor/translator.js:52
 #: code:addons/web_editor/static/src/xml/ace.xml:30
 #, python-format
 msgid "Close"
@@ -269,49 +269,63 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:931
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:934
 #, python-format
 msgid "Code"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:946
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:949
 #, python-format
 msgid "Code View"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:248
+#: code:addons/web_editor/static/src/xml/editor.xml:265
 #, python-format
 msgid "Color"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.editor.js:802
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:202
 #, python-format
 msgid "Column"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:66
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:61
 #, python-format
 msgid "Common colors"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:293
+#: code:addons/web_editor/static/src/xml/editor.xml:310
 #, python-format
 msgid "Contain"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:292
+#: code:addons/web_editor/static/src/xml/translator.xml:7
+#, python-format
+msgid "Content to translate"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:194
+#, python-format
+msgid "Copy-paste your URL or embed code here"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:309
 #, python-format
 msgid "Cover"
 msgstr ""
@@ -328,33 +342,40 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:294
+#: code:addons/web_editor/static/src/xml/editor.xml:311
 #, python-format
 msgid "Custom"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:32
+#: code:addons/web_editor/static/src/xml/snippets.xml:19
 #, python-format
 msgid "Customize"
 msgstr ""
 
 #. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Dailymotion"
+msgstr ""
+
+#. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Danger"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/summernote.js:1927
+#: code:addons/web_editor/static/src/js/editor/summernote.js:1899
 #, python-format
 msgid "Default"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:370
+#: code:addons/web_editor/static/src/xml/editor.xml:387
 #, python-format
 msgid "Define if/how the background image will be repeated"
 msgstr ""
@@ -366,7 +387,7 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:173
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:165
 #, python-format
 msgid "Description"
 msgstr ""
@@ -380,8 +401,8 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:671
-#: code:addons/web_editor/static/src/js/widgets.js:26
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:968
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:24
 #: code:addons/web_editor/static/src/xml/editor.xml:12
 #: code:addons/web_editor/static/src/xml/editor.xml:140
 #, python-format
@@ -402,139 +423,118 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:973
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:976
 #, python-format
 msgid "Document Style"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:855
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:860
 #, python-format
 msgid "Double-click to edit"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:900
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:903
 #, python-format
 msgid "Drag an image here"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:35
+#: code:addons/web_editor/static/src/xml/snippets.xml:22
 #, python-format
 msgid "Drag to Move"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:36
+#: code:addons/web_editor/static/src/xml/snippets.xml:23
 #, python-format
 msgid "Duplicate Container"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:159
-#: code:addons/web_editor/static/src/js/rte.summernote.js:909
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:151
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:912
 #, python-format
 msgid "Edit"
 msgstr ""
 
 #. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:200
-#, python-format
-msgid "Embed Video (HTML)"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/backend.xml:43
-#, python-format
-msgid "English"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/backend.xml:42
-#, python-format
-msgid "English (edit mode)"
-msgstr ""
-
-#. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Epsilon"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:73
+#: code:addons/web_editor/static/src/js/widgets/ace.js:93
 #, python-format
 msgid "Expected "
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:240
+#: code:addons/web_editor/static/src/xml/editor.xml:257
 #, python-format
 msgid "Extra Small"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:892
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:895
 #, python-format
 msgid "File / Image"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:25
+#: code:addons/web_editor/static/src/xml/snippets.xml:12
 #, python-format
 msgid "Fixed size"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:897
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:900
 #, python-format
 msgid "Float Left"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:899
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:902
 #, python-format
 msgid "Float None"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:898
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901
 #, python-format
 msgid "Float Right"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:961
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:964
 #, python-format
 msgid "Font Color"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:888
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:891
 #, python-format
 msgid "Font Family"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:889
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:892
 #, python-format
 msgid "Font Size"
 msgstr ""
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:945
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:948
 #, python-format
 msgid "Full Screen"
 msgstr ""
@@ -590,56 +590,98 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:932
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:935
 #, python-format
 msgid "Header 1"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:933
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:936
 #, python-format
 msgid "Header 2"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:934
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:937
 #, python-format
 msgid "Header 3"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:935
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:938
 #, python-format
 msgid "Header 4"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:936
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:939
 #, python-format
 msgid "Header 5"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:937
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:940
 #, python-format
 msgid "Header 6"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:944
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:947
 #, python-format
 msgid "Help"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:350
+#: code:addons/web_editor/static/src/xml/translator.xml:5
+#, python-format
+msgid "Here are the visuals used to help you translate efficiently:"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:219
+#, python-format
+msgid "Hide Dailymotion logo"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:216
+#, python-format
+msgid "Hide Youtube logo"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:213
+#, python-format
+msgid "Hide fullscreen button"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:210
+#, python-format
+msgid "Hide player controls"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:222
+#, python-format
+msgid "Hide sharing button"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:367
 #, python-format
 msgid "Horizontal"
 msgstr ""
@@ -651,14 +693,14 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:137
+#: code:addons/web_editor/static/src/js/editor/editor.js:125
 #, python-format
 msgid "If you discard the current edition, all unsaved changes will be lost. You can cancel to return to the edition mode."
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:107
+#: code:addons/web_editor/static/src/js/widgets/ace.js:826
 #, python-format
 msgid "If you reset this file, all your customizations will be lost as it will be reverted to the default file."
 msgstr ""
@@ -672,13 +714,21 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:902
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:905
 #, python-format
 msgid "Image URL"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
+#: code:addons/web_editor/static/src/xml/translator.xml:10
+#, python-format
+msgid "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
+"        Each modification on the master page is automatically applied to all translated versions."
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
@@ -693,7 +743,7 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:951
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954
 #, python-format
 msgid "Indent"
 msgstr ""
@@ -705,49 +755,63 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:925
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:928
 #, python-format
 msgid "Insert Horizontal Rule"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:893
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:896
 #, python-format
 msgid "Insert Image"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:907
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:910
 #, python-format
 msgid "Insert Link"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:917
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:920
 #, python-format
 msgid "Insert Video"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:881
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Instagram"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1028
+#, python-format
+msgid "Install"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:884
 #, python-format
 msgid "Italic"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:955
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:958
 #, python-format
 msgid "Justify full"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:968
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971
 #, python-format
 msgid "Keyboard shortcuts"
 msgstr ""
@@ -761,8 +825,8 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:114
-#: code:addons/web_editor/static/src/xml/editor.xml:243
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:109
+#: code:addons/web_editor/static/src/xml/editor.xml:260
 #, python-format
 msgid "Large"
 msgstr ""
@@ -784,50 +848,57 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:464
+#: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:887
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:890
 #, python-format
 msgid "Line Height"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:906
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:909
 #, python-format
 msgid "Link"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:225
+#: code:addons/web_editor/static/src/xml/editor.xml:242
 #, python-format
 msgid "Link Label"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/widgets.js:958
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1085
 #, python-format
 msgid "Link to"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:113
-#: code:addons/web_editor/static/src/xml/editor.xml:242
+#: code:addons/web_editor/static/src/xml/editor.xml:207
+#, python-format
+msgid "Loop"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:108
+#: code:addons/web_editor/static/src/xml/editor.xml:259
 #, python-format
 msgid "Medium"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:959
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:962
 #, python-format
 msgid "More Color"
 msgstr ""
@@ -841,77 +912,92 @@ msgstr ""
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:60
 #, python-format
-msgid "Next →"
+msgid "Next"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:372
+#: code:addons/web_editor/static/src/xml/editor.xml:389
 #, python-format
 msgid "No repeat"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:111
-#: code:addons/web_editor/static/src/xml/snippets.xml:51
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:106
+#: code:addons/web_editor/static/src/xml/snippets.xml:34
 #, python-format
 msgid "None"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:929
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:932
 #, python-format
 msgid "Normal"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:670
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:967
+#: code:addons/web_editor/static/src/js/editor/translator.js:94
 #, python-format
 msgid "Ok"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:912
-#: code:addons/web_editor/static/src/xml/editor.xml:269
+#: code:addons/web_editor/static/src/js/editor/translator.js:93
+#, python-format
+msgid "Ok, never show me this again"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:915
+#: code:addons/web_editor/static/src/xml/editor.xml:286
 #, python-format
 msgid "Open in new window"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:941
+#: code:addons/web_editor/static/src/xml/editor.xml:201
+#, python-format
+msgid "Options"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:944
 #, python-format
 msgid "Ordered list"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:950
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
 #, python-format
 msgid "Outdent"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:118
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:113
 #, python-format
 msgid "Padding"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:949
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:952
 #, python-format
 msgid "Paragraph"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:972
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:975
 #, python-format
 msgid "Paragraph formatting"
 msgstr ""
@@ -925,105 +1011,111 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:196
-#: code:addons/web_editor/static/src/xml/editor.xml:202
-#: code:addons/web_editor/static/src/xml/editor.xml:277
+#: code:addons/web_editor/static/src/xml/editor.xml:228
+#: code:addons/web_editor/static/src/xml/editor.xml:294
 #, python-format
 msgid "Preview"
 msgstr ""
 
 #. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:57
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Primary"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:930
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:933
 #, python-format
 msgid "Quote"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.js:336
+#: code:addons/web_editor/static/src/js/editor/rte.js:307
 #, python-format
 msgid "Readonly field"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:958
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:961
 #, python-format
 msgid "Recent Color"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:977
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:980
 #, python-format
 msgid "Redo"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:163
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:155
 #, python-format
 msgid "Remove"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:37
+#: code:addons/web_editor/static/src/xml/snippets.xml:24
 #, python-format
 msgid "Remove Block"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:886
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:889
 #, python-format
 msgid "Remove Font Style"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:903
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:906
 #, python-format
 msgid "Remove Image"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:312
+#: code:addons/web_editor/static/src/xml/editor.xml:329
 #, python-format
 msgid "Repeat"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:373
+#: code:addons/web_editor/static/src/xml/editor.xml:390
 #, python-format
 msgid "Repeat both"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:374
+#: code:addons/web_editor/static/src/xml/editor.xml:391
 #, python-format
 msgid "Repeat x"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:375
+#: code:addons/web_editor/static/src/xml/editor.xml:392
 #, python-format
 msgid "Repeat y"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:964
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:967
 #: code:addons/web_editor/static/src/xml/ace.xml:36
 #, python-format
 msgid "Reset"
@@ -1031,56 +1123,49 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/backend.xml:18
-#, python-format
-msgid "Reset from source"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:965
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:968
 #, python-format
 msgid "Reset to default"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:482
+#: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:894
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:897
 #, python-format
 msgid "Resize Full"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:895
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:898
 #, python-format
 msgid "Resize Half"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:896
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:899
 #, python-format
 msgid "Resize Quarter"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:25
+#: code:addons/web_editor/static/src/xml/snippets.xml:12
 #, python-format
 msgid "Resize to force the height of this block"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/widgets.js:25
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:23
 #: code:addons/web_editor/static/src/xml/ace.xml:29
 #: code:addons/web_editor/static/src/xml/editor.xml:13
 #, python-format
@@ -1089,28 +1174,28 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:66
+#: code:addons/web_editor/static/src/xml/snippets.xml:49
 #, python-format
 msgid "Search"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:64
+#: code:addons/web_editor/static/src/xml/snippets.xml:47
 #, python-format
 msgid "Search Contact"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:30
+#: code:addons/web_editor/static/src/xml/snippets.xml:17
 #, python-format
 msgid "Select Parent Container"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/widgets.js:93
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:930
 #, python-format
 msgid "Select a Media"
 msgstr ""
@@ -1124,92 +1209,85 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:901
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:904
 #, python-format
 msgid "Select from files"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:581
+#: code:addons/web_editor/static/src/js/widgets/ace.js:567
 #, python-format
 msgid "Server error"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:194
-#, python-format
-msgid "Set a video URL"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:348
+#: code:addons/web_editor/static/src/xml/editor.xml:365
 #, python-format
 msgid "Set the starting position of the background image."
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:963
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966
 #, python-format
 msgid "Set transparent"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:326
+#: code:addons/web_editor/static/src/xml/editor.xml:343
 #, python-format
 msgid "Sets the width and height of the background image in percent of the parent element."
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:125
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:120
 #, python-format
 msgid "Shadow"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:237
+#: code:addons/web_editor/static/src/xml/editor.xml:254
 #, python-format
 msgid "Size"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:112
-#: code:addons/web_editor/static/src/xml/editor.xml:241
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:107
+#: code:addons/web_editor/static/src/xml/editor.xml:258
 #, python-format
 msgid "Small"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:133
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:128
 #, python-format
 msgid "Spin"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:883
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:886
 #, python-format
 msgid "Strikethrough"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:928
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:931
 #, python-format
 msgid "Style"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:884
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:887
 #, python-format
 msgid "Subscript"
 msgstr ""
@@ -1221,72 +1299,79 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:885
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:888
 #, python-format
 msgid "Superscript"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:922
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:925
 #, python-format
 msgid "Table"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:462
+#: code:addons/web_editor/static/src/js/widgets/ace.js:358
 #, python-format
 msgid "Template ID: %s"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:970
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:973
 #, python-format
 msgid "Text formatting"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:910
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:913
 #, python-format
 msgid "Text to display"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:213
+#: code:addons/web_editor/static/src/xml/editor.xml:158
 #, python-format
-msgid "The feature might not be supported for every video type"
+msgid "The image could not be deleted because it is used in the\n"
+"               following pages or views:"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:158
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
-msgid "The image could not be deleted because it is used in the\n"
-"               following pages or views:"
+msgid "The provided url does not reference any supported video"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:58
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:865
+#, python-format
+msgid "The provided url is not valid"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:53
 #, python-format
 msgid "Theme colors"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:91
-#: code:addons/web_editor/static/src/js/translator.js:165
+#: code:addons/web_editor/static/src/js/editor/editor.js:85
+#: code:addons/web_editor/static/src/js/editor/translator.js:177
 #, python-format
 msgid "This document is not saved!"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:911
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:914
 #, python-format
 msgid "To what URL should this link go?"
 msgstr ""
@@ -1300,14 +1385,28 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/translator.js:72
+#: code:addons/web_editor/static/src/js/editor/translator.js:50
 #, python-format
 msgid "Translate Attribute"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:962
+#: code:addons/web_editor/static/src/xml/translator.xml:8
+#, python-format
+msgid "Translated content"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/translator.js:91
+#, python-format
+msgid "Translation Info"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:965
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 #, python-format
 msgid "Transparent"
@@ -1315,42 +1414,42 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:231
+#: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:882
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:885
 #, python-format
 msgid "Underline"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:976
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:979
 #, python-format
 msgid "Undo"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:66
+#: code:addons/web_editor/static/src/js/widgets/ace.js:86
 #, python-format
 msgid "Unexpected "
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:908
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:911
 #, python-format
 msgid "Unlink"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:940
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:943
 #, python-format
 msgid "Unordered list"
 msgstr ""
@@ -1378,14 +1477,14 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:359
+#: code:addons/web_editor/static/src/xml/editor.xml:376
 #, python-format
 msgid "Vertical"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:915
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:918
 #: code:addons/web_editor/static/src/xml/editor.xml:53
 #, python-format
 msgid "Video"
@@ -1393,19 +1492,40 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:916
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:919
 #, python-format
 msgid "Video Link"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:918
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:921
 #, python-format
 msgid "Video URL?"
 msgstr ""
 
 #. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:193
+#, python-format
+msgid "Video code"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Vimeo"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Vine.co"
+msgstr ""
+
+#. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Warning"
 msgstr ""
@@ -1417,39 +1537,53 @@ msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:103
+#: code:addons/web_editor/static/src/xml/ace.xml:8
+#: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
-msgid "Write Your Text Here"
+msgid "XML (HTML)"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:107
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:110
 #, python-format
-msgid "Write Your Text or Drag a Block Here"
+msgid "Xl"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/ace.xml:8
-#: code:addons/web_editor/static/src/xml/ace.xml:10
+#: code:addons/web_editor/static/src/xml/translator.xml:4
 #, python-format
-msgid "XML (HTML)"
+msgid "You are about to enter the translation mode."
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:115
+#: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
-msgid "Xl"
+msgid "Youku"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "Youtube"
 msgstr ""
 
 #. module: web_editor
 #. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:331
-#: code:addons/web_editor/static/src/xml/editor.xml:340
-#: code:addons/web_editor/static/src/xml/editor.xml:353
-#: code:addons/web_editor/static/src/xml/editor.xml:362
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:348
+#: code:addons/web_editor/static/src/xml/editor.xml:357
+#: code:addons/web_editor/static/src/xml/editor.xml:370
+#: code:addons/web_editor/static/src/xml/editor.xml:379
 #, python-format
 msgid "auto"
 msgstr ""
@@ -1557,6 +1691,13 @@ msgid "ir.ui.view"
 msgstr ""
 
 #. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:198
+#, python-format
+msgid "videos"
+msgstr ""
+
+#. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
 msgid "web_editor.converter.test"
 msgstr ""
@@ -1569,15 +1710,7 @@ msgstr ""
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:110
-#: code:addons/web_editor/static/src/xml/editor.xml:200
 #, python-format
 msgid "— or —"
 msgstr ""
 
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:57
-#, python-format
-msgid "← Previous"
-msgstr ""
-
diff --git a/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot b/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
index 812e9cbb5c5..372776eec42 100644
--- a/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
+++ b/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
@@ -1,13 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* web_kanban_gauge
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,24 +14,3 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: web_kanban_gauge
-#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:210
-#, python-format
-msgid "Click to change value"
-msgstr ""
-
-#. module: web_kanban_gauge
-#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:172
-#, python-format
-msgid "Only Integer Value should be valid."
-msgstr ""
-
-#. module: web_kanban_gauge
-#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:172
-#, python-format
-msgid "Wrong value entered!"
-msgstr ""
-
diff --git a/addons/web_planner/i18n/web_planner.pot b/addons/web_planner/i18n/web_planner.pot
index a59a2a99757..4bc3d1f0720 100644
--- a/addons/web_planner/i18n/web_planner.pot
+++ b/addons/web_planner/i18n/web_planner.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. module: web_planner
 #. openerp-web
-#: code:addons/web_planner/static/src/js/web_planner_common.js:369
+#: code:addons/web_planner/static/src/js/web_planner_common.js:379
 #, python-format
 msgid "Cancel"
 msgstr ""
@@ -80,7 +80,7 @@ msgstr ""
 
 #. module: web_planner
 #. openerp-web
-#: code:addons/web_planner/static/src/js/web_planner_common.js:132
+#: code:addons/web_planner/static/src/js/web_planner_common.js:133
 #, python-format
 msgid "Mark As Done"
 msgstr ""
@@ -97,14 +97,14 @@ msgstr ""
 
 #. module: web_planner
 #. openerp-web
-#: code:addons/web_planner/static/src/js/web_planner_common.js:140
+#: code:addons/web_planner/static/src/js/web_planner_common.js:141
 #, python-format
 msgid "Next Step"
 msgstr ""
 
 #. module: web_planner
 #. openerp-web
-#: code:addons/web_planner/static/src/js/web_planner_common.js:378
+#: code:addons/web_planner/static/src/js/web_planner_common.js:388
 #, python-format
 msgid "Odoo Enterprise"
 msgstr ""
@@ -144,7 +144,7 @@ msgstr ""
 
 #. module: web_planner
 #. openerp-web
-#: code:addons/web_planner/static/src/js/web_planner_common.js:360
+#: code:addons/web_planner/static/src/js/web_planner_common.js:365
 #, python-format
 msgid "Upgrade now"
 msgstr ""
diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index 8487ceb4bc0..2ace442f02b 100644
--- a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
+++ b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:90
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:96
 #, python-format
 msgid "%\n"
 "                Implementation"
@@ -25,63 +25,63 @@ msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
 #, python-format
 msgid "(Community Edition)"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:166
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:172
 #, python-format
 msgid "Activate the developer mode"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:168
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:174
 #, python-format
 msgid "Activate the developer mode (with assets)"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:56
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:62
 #, python-format
 msgid "Active User"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:57
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:63
 #, python-format
 msgid "Active Users"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:42
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:48
 #, python-format
 msgid "App store"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:39
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:45
 #, python-format
 msgid "Browse Apps"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:102
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:108
 #, python-format
 msgid "Browse the documentation."
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:157
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:163
 #, python-format
 msgid "Copyright © 2004-2016"
 msgstr ""
@@ -94,147 +94,182 @@ msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:170
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:176
 #, python-format
 msgid "Deactivate the developer mode"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:66
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:72
 #, python-format
 msgid "Enter e-mail addresses (one per line)"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:94
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:100
 #, python-format
 msgid "Follow these implementation guides to get the most out of Odoo."
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:157
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:163
 #, python-format
 msgid "GNU LGPL Licensed"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:181
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:187
 #, python-format
 msgid "Get more features with the Enterprise Edition!"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:134
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:140
 #, python-format
 msgid "Help us spread the word: Share Odoo's awesomeness with your friends!"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:31
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:37
 #, python-format
 msgid "Installed App"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:32
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:38
 #, python-format
 msgid "Installed Apps"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:67
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
 #, python-format
 msgid "Invite"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:65
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:71
 #, python-format
 msgid "Invite new users:"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:61
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:208
+#, python-format
+msgid "Load a Translation"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:67
 #, python-format
 msgid "Manage access rights"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:101
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:107
 #, python-format
 msgid "Need more help?"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:34
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:40
 #, python-format
 msgid "No app installed"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:149
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:155
 #, python-format
 msgid "Odoo"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:180
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:186
 #, python-format
 msgid "Odoo Enterprise"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:157
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:163
 #, python-format
 msgid "Odoo S.A."
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:79
 #, python-format
 msgid "Pending invitations:"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:107
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:116
 #, python-format
 msgid "Please provide valid email addresses"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:132
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:203
+#, python-format
+msgid "Send your documents in your partner's language or set up a language for your users"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:225
+#, python-format
+msgid "Set Up"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:220
+#, python-format
+msgid "Set up your company information"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:138
 #, python-format
 msgid "Share the Love"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:43
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:49
 #, python-format
 msgid "Theme store"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:184
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:199
+#, python-format
+msgid "Translations"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:190
 #, python-format
 msgid "Upgrade Now"
 msgstr ""
@@ -246,14 +281,14 @@ msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:109
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:115
 #, python-format
 msgid "You need to install some apps first."
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:79
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:85
 #, python-format
 msgid "more"
 msgstr ""
diff --git a/addons/web_tour/i18n/web_tour.pot b/addons/web_tour/i18n/web_tour.pot
index 2ccf74b9d24..f951d1289c7 100644
--- a/addons/web_tour/i18n/web_tour.pot
+++ b/addons/web_tour/i18n/web_tour.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #. module: web_tour
 #. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:501
+#: code:addons/web_tour/static/src/js/tour_manager.js:485
 #, python-format
 msgid "Click the <i>Home icon</i> to navigate across apps."
 msgstr ""
@@ -55,11 +55,6 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: web_tour
-#: model:ir.model.fields,field_description:web_tour.field_ir_ui_menu_load_xmlid
-msgid "Load Xmlid"
-msgstr ""
-
-#. module: web_tour
 #: model:ir.ui.view,arch_db:web_tour.edit_tour_list
 msgid "Menu"
 msgstr ""
@@ -80,7 +75,7 @@ msgstr ""
 
 #. module: web_tour
 #. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:229
+#: code:addons/web_tour/static/src/js/tour_manager.js:198
 #, python-format
 msgid "Skip tour"
 msgstr ""
@@ -109,8 +104,3 @@ msgstr ""
 msgid "Tours"
 msgstr ""
 
-#. module: web_tour
-#: model:ir.model,name:web_tour.model_ir_ui_menu
-msgid "ir.ui.menu"
-msgstr ""
-
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index a6611b6fcc6..77d933a5b64 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/editor/snippets.options.js:724
+#, python-format
+msgid " Add Images"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
 msgid "&amp;times;"
 msgstr ""
@@ -28,13 +35,24 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.gallery.xml:17
-#: code:addons/website/static/src/xml/website.gallery.xml:97
+#: code:addons/website/static/src/xml/website.xml:40
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.gallery.xml:51
 #, python-format
 msgid "&times;"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "' did not match any pages."
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "(e.g. business name, location) tends to improve your ranking in search engines and consequently increases your traffic. Do it:"
 msgstr ""
@@ -67,13 +85,6 @@ msgid "- The Odoo Team"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:17
-#, python-format
-msgid "1. Define Keywords"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "10s"
 msgstr ""
@@ -89,13 +100,6 @@ msgid "1s"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:45
-#, python-format
-msgid "2. Reference Your Page"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "24x7 toll-free support"
 msgstr ""
@@ -106,13 +110,6 @@ msgid "2s"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:62
-#, python-format
-msgid "3. Preview"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "3s"
 msgstr ""
@@ -133,27 +130,20 @@ msgid "5s"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:69
-#, python-format
-msgid ":&nbsp;"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_big_picture
 msgid "<b>A Small Subtitle</b>"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:15
+#: code:addons/website/static/src/js/tours/banner.js:15
 #, python-format
 msgid "<b>Click Edit</b> to start designing your homepage."
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:24
+#: code:addons/website/static/src/js/tours/banner.js:25
 #, python-format
 msgid "<b>Click on a text</b> to start editing it. <i>It's that easy to edit your content!</i>"
 msgstr ""
@@ -178,14 +168,14 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:72
+#: code:addons/website/static/src/js/tours/banner.js:74
 #, python-format
 msgid "<b>Install a contact form</b> to improve this page."
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:77
+#: code:addons/website/static/src/js/tours/banner.js:79
 #, python-format
 msgid "<b>Install new apps</b> to get more features. Let's install the <i>'Contact form'</i> app."
 msgstr ""
@@ -206,11 +196,6 @@ msgid "<b>Set Custom Image...</b>"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.show_sign_in
-msgid "<b>Sign in</b>"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<br/>\n"
 "                                    Make sure the Advanced Options are set to your country and language."
@@ -369,7 +354,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:53
+#: code:addons/website/static/src/js/tours/banner.js:54
 #, python-format
 msgid "<p><b>That's it.</b> Your homepage is live.</p><p>Continue adding more pages to your site or edit this page to make it even more awesome.</p>"
 msgstr ""
@@ -390,6 +375,12 @@ msgid "<small>John Doe, CEO</small>"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span class=\"caret\"/>\n"
+"                            <span class=\"sr-only\">Toggle Dropdown</span>"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<span class=\"fa fa-arrow-circle-o-down\"/> Install now"
 msgstr ""
@@ -411,6 +402,11 @@ msgid "<span class=\"fa fa-plus\"/>New"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_image_gallery
+msgid "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-plus-circle\"/> Add Images</span>"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<span class=\"panel-title\">\n"
 "                                        <span class=\"fa fa-pencil\"/>\n"
@@ -429,9 +425,16 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
 msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-"                                <span class=\"icon-bar\"/>\n"
-"                                <span class=\"icon-bar\"/>\n"
-"                                <span class=\"icon-bar\"/>"
+"                <span class=\"icon-bar\"/>\n"
+"                <span class=\"icon-bar\"/>\n"
+"                <span class=\"icon-bar\"/>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span/>\n"
+"                                <span class=\"css_publish\">Unpublished</span>\n"
+"                                <span class=\"css_unpublish\">Published</span>"
 msgstr ""
 
 #. module: website
@@ -647,7 +650,7 @@ msgid "@odoo"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "A CDN helps you serve your website’s content with high availability and high performance to any visitor wherever they are located."
 msgstr ""
 
@@ -689,18 +692,20 @@ msgid "A small explanation of this great<br/>feature, in clear words."
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_version
+#: model:ir.model.fields,field_description:website.field_res_config_settings_module_website_version
 msgid "A/B Testing"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "API Key"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
+#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
 #: model:ir.ui.view,arch_db:website.footer_default
+#: model:website.page,arch_db:website.aboutus_page
 msgid "About us"
 msgstr ""
 
@@ -715,6 +720,12 @@ msgid "Activate CDN for assets"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_active
+#: model:ir.model.fields,field_description:website.field_website_redirect_active
+msgid "Active"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_three_columns
 msgid "Adapt these three columns to fit you design need.\n"
 "                        To duplicate, delete or move columns, select the\n"
@@ -723,17 +734,14 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:37
+#: code:addons/website/static/src/xml/website.seo.xml:53
 #, python-format
 msgid "Add"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.snippets.gallery.js:247
-#: model:ir.ui.view,arch_db:website.s_image_gallery
-#, python-format
-msgid "Add Images from the 'Customize' menu"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Add Features"
 msgstr ""
 
 #. module: website
@@ -744,32 +752,13 @@ msgid "Add Menu Entry"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Add a contact form in the"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
 msgid "Add a great slogan"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.gallery.xml:18
-#, python-format
-msgid "Add images"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:20
-#, python-format
-msgid "Add keyword:"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:72
+#: code:addons/website/static/src/js/menu/new_content.js:49
 #, python-format
 msgid "Add page in menu"
 msgstr ""
@@ -793,7 +782,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:49
+#: code:addons/website/static/src/js/tours/banner.js:50
 #, python-format
 msgid "After having checked how it looks on mobile, <b>close the preview</b>."
 msgstr ""
@@ -809,6 +798,18 @@ msgid "Aim for a .com and/or your country extension"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Aline Turner, CTO"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Aline is one of the iconic person in life who can say she loves what she does.\n"
+"                                She mentors 100+ in-house developers and looks after the community of over\n"
+"                                thousands developers."
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
 msgid "All these icons are licensed under creative commons so that you can use them."
 msgstr ""
@@ -819,13 +820,15 @@ msgid "Allows your community to ask and answer questions about their interests"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.500
-msgid "An error occured while rendering the template"
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Although this Website may be linked to other websites, we are not, directly or\n"
+"                                indirectly, implying any approval, association, sponsorship, endorsement, or\n"
+"                                affiliation with any linked website, unless specifically stated herein."
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Analytics Key"
+#: model:ir.ui.view,arch_db:website.500
+msgid "An error occured while rendering the template"
 msgstr ""
 
 #. module: website
@@ -849,6 +852,23 @@ msgid "Apply it to your website from your database admin page"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_arch_db
+msgid "Arch Blob"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_arch_fs
+msgid "Arch Filename"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:60
+#, python-format
+msgid "Are you sure you want to delete this page ?"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_ir_attachment_website_url
 msgid "Attachment URL"
 msgstr ""
@@ -881,11 +901,6 @@ msgid "Back"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_banner
-msgid "Banner Odoo Image"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Basic sales &amp; marketing for up to 2 users"
 msgstr ""
@@ -916,36 +931,11 @@ msgid "Big"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_blog
-msgid "Blogs"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Boost your online sales with sleek product pages"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Build awareness and credibility"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Build up a community with an efficient content strategy"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Build up customized forms on your website"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Build up your own forms and get requests as emails, leads or issues. You can also edit the fields of the Extra Step page in eCommerce checkout."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Building Profile"
 msgstr ""
@@ -956,14 +946,14 @@ msgid "Buy it at a provider:"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_url
 #: model:ir.model.fields,field_description:website.field_website_cdn_url
-#: model:ir.model.fields,field_description:website.field_website_config_settings_cdn_url
 msgid "CDN Base URL"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_filters
 #: model:ir.model.fields,field_description:website.field_website_cdn_filters
-#: model:ir.model.fields,field_description:website.field_website_config_settings_cdn_filters
 msgid "CDN Filters"
 msgstr ""
 
@@ -973,17 +963,11 @@ msgid "Can I afford for advertising on the keyword?"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Can I use it to manage projects based on agile methodologies?"
-msgstr ""
-
-#. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backendDashboard.js:92
-#: code:addons/website/static/src/xml/website.xml:57
+#: code:addons/website/static/src/js/backend/dashboard.js:106
+#: code:addons/website/static/src/xml/website.xml:27
 #: model:ir.ui.view,arch_db:website.500
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 #, python-format
 msgid "Cancel"
 msgstr ""
@@ -999,11 +983,6 @@ msgid "Change Icons"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Chat with your visitors in real time"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Check its availability"
 msgstr ""
@@ -1014,6 +993,11 @@ msgid "Check your references before deciding to work with you"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_field_parent
+msgid "Child Field"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_child_id
 msgid "Child Menus"
 msgstr ""
@@ -1056,19 +1040,23 @@ msgid "Click to customize this text"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Client ID"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Client Secret"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Clone this page"
+msgstr ""
+
+#. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.gallery.xml:97
-#: code:addons/website/static/src/xml/website.translator.xml:13
+#: code:addons/website/static/src/xml/website.gallery.xml:51
 #, python-format
 msgid "Close"
 msgstr ""
@@ -1079,11 +1067,6 @@ msgid "Communicate"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Communication"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Community &amp; Enterprise users: apply a redirection from your Domain Manager platform"
 msgstr ""
@@ -1114,13 +1097,8 @@ msgid "Configuration"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Configure Website"
-msgstr ""
-
-#. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:32
+#: code:addons/website/static/src/js/editor/snippets.options.js:24
 #, python-format
 msgid "Confirmation"
 msgstr ""
@@ -1141,29 +1119,28 @@ msgid "Contact"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_crm
-msgid "Contact Form"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.403
 #: model:ir.ui.view,arch_db:website.404
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Contact Us"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
+#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
 #: model:ir.ui.view,arch_db:website.footer_default
 #: model:ir.ui.view,arch_db:website.s_banner
 #: model:ir.ui.view,arch_db:website.s_big_message
 #: model:ir.ui.view,arch_db:website.s_comparisons
 #: model:website.menu,name:website.menu_contactus
+#: model:website.page,arch_db:website.contactus_page
 msgid "Contact us"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
+#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
+#: model:website.page,arch_db:website.contactus_page
 msgid "Contact us about anything related to our company or services."
 msgstr ""
 
@@ -1178,21 +1155,14 @@ msgid "Content"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Content Delivery Network (CDN)"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:24
-#, python-format
-msgid "Content to translate"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:185
-#: code:addons/website/static/src/xml/website.xml:56
+#: code:addons/website/static/src/js/menu/content.js:314
+#: code:addons/website/static/src/xml/website.xml:26
 #, python-format
 msgid "Continue"
 msgstr ""
@@ -1203,12 +1173,19 @@ msgid "Copyright &amp;copy;"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/menu/content.js:256
+#, python-format
+msgid "Create Menu"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.page_404
 msgid "Create Page"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
 msgstr ""
 
@@ -1218,21 +1195,23 @@ msgid "Create a community"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Create several versions of your website pages"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_create_uid
 #: model:ir.model.fields,field_description:website.field_website_create_uid
 #: model:ir.model.fields,field_description:website.field_website_menu_create_uid
+#: model:ir.model.fields,field_description:website.field_website_page_create_uid
+#: model:ir.model.fields,field_description:website.field_website_redirect_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_create_date
 #: model:ir.model.fields,field_description:website.field_website_create_date
 #: model:ir.model.fields,field_description:website.field_website_menu_create_date
+#: model:ir.model.fields,field_description:website.field_website_page_create_date
+#: model:ir.model.fields,field_description:website.field_website_redirect_create_date
 msgid "Created on"
 msgstr ""
 
@@ -1242,12 +1221,6 @@ msgid "Cubes"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_form_editor
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Custom Forms"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Customize"
 msgstr ""
@@ -1259,7 +1232,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:31
+#: code:addons/website/static/src/js/tours/banner.js:32
 #, python-format
 msgid "Customize any block through this menu. Try to change the background of the banner."
 msgstr ""
@@ -1271,35 +1244,46 @@ msgid "Dashboard"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Default"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_website_default_lang_id
 msgid "Default Language"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_default_lang_id
+#: model:ir.model.fields,field_description:website.field_res_config_settings_default_lang_id
 msgid "Default language"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_default_lang_code
+#: model:ir.model.fields,field_description:website.field_res_config_settings_default_lang_code
 #: model:ir.model.fields,field_description:website.field_website_default_lang_code
 msgid "Default language code"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:41
+#, python-format
+msgid "Define Keywords"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
 msgid "Delete Blocks"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:133
-#: model:ir.ui.view,arch_db:website.user_navbar
+#: code:addons/website/static/src/js/menu/content.js:667
 #, python-format
 msgid "Delete Page"
 msgstr ""
@@ -1312,32 +1296,23 @@ msgid "Delete the above image or replace it with a picture\n"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_references
-msgid "Demo Logo"
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Delete this page"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Deploy new stores with just an internet connection: no\n"
-"                                installation, no specific hardware required. It works with any\n"
-"                                iPad, Tablet PC, laptop or industrial POS machine."
+#: model:ir.ui.view,arch_db:website.s_references
+msgid "Demo Logo"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:54
+#: code:addons/website/static/src/xml/website.seo.xml:20
 #, python-format
 msgid "Description"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:109
-#, python-format
-msgid "Description..."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Design"
 msgstr ""
@@ -1349,45 +1324,35 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:364
+#: code:addons/website/static/src/js/menu/content.js:44
+#: code:addons/website/static/src/js/menu/seo.js:343
 #, python-format
 msgid "Discard"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_display_name
+#: model:ir.ui.view,arch_db:website.external_snippets
+msgid "Discussion Group"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_website_display_name
 #: model:ir.model.fields,field_description:website.field_website_menu_display_name
+#: model:ir.model.fields,field_description:website.field_website_page_display_name
 #: model:ir.model.fields,field_description:website.field_website_published_mixin_display_name
+#: model:ir.model.fields,field_description:website.field_website_redirect_display_name
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata_display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Display a Twitter wall on your website"
-msgstr ""
-
-#. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:43
-#, python-format
-msgid "Do not show this dialog later."
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:79
+#: code:addons/website/static/src/js/editor/snippets.options.js:89
 #, python-format
 msgid "Do you want to edit the company data ?"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Does it works offline?"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "Domain"
 msgstr ""
@@ -1399,9 +1364,9 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:64
+#: code:addons/website/static/src/xml/website.xml:35
 #, python-format
-msgid "Don't forget to update all links referring to this page:"
+msgid "Don't forget to update all links referring to this page."
 msgstr ""
 
 #. module: website
@@ -1426,21 +1391,21 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:44
+#: code:addons/website/static/src/xml/website.contentMenu.xml:45
 #, python-format
 msgid "Drag a menu to the right to create a sub-menu"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:35
+#: code:addons/website/static/src/js/tours/banner.js:36
 #, python-format
 msgid "Drag another block in your page, below the cover."
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:19
+#: code:addons/website/static/src/js/tours/banner.js:20
 #, python-format
 msgid "Drag the <i>Cover</i> block and drop it in your page."
 msgstr ""
@@ -1467,7 +1432,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:207
+#: code:addons/website/static/src/js/menu/content.js:343
 #: model:ir.ui.view,arch_db:website.user_navbar
 #, python-format
 msgid "Edit Menu"
@@ -1480,6 +1445,7 @@ msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.publish_management
+#: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Edit in backend"
 msgstr ""
 
@@ -1497,7 +1463,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:36
+#: code:addons/website/static/src/js/editor/snippets.options.js:35
 #, python-format
 msgid "Edit the menu"
 msgstr ""
@@ -1528,11 +1494,6 @@ msgid "Error"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_event_sale
-msgid "Event Tickets"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Examples"
 msgstr ""
@@ -1549,13 +1510,13 @@ msgid "Explain the benefits you offer. Don't write about products or\n"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Extra-Large"
+#: model:ir.model.fields,field_description:website.field_website_page_xml_id
+msgid "External ID"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_facebook
-msgid "Facebook"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Extra-Large"
 msgstr ""
 
 #. module: website
@@ -1569,7 +1530,7 @@ msgid "Fast"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_favicon
+#: model:ir.model.fields,field_description:website.field_res_config_settings_favicon
 msgid "Favicon"
 msgstr ""
 
@@ -1594,11 +1555,6 @@ msgid "Feature Two"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Features"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Finally don't try to make all your content accessible from the main menu or the footer.\n"
 "                            Indeed, a page can also be accessible through a direct link or button, from any other page of your website."
@@ -1654,8 +1610,10 @@ msgid "For the Odoo Team,<br/>\n"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_forum
-msgid "Forum"
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Founder and chief visionary, Tony is the driving force behind Company. He loves\n"
+"                                to keep his hands full by participating in the development of the software,\n"
+"                                marketing and the Customer Experience strategies."
 msgstr ""
 
 #. module: website
@@ -1669,6 +1627,11 @@ msgid "From the main container, you can change the background to highlight featu
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "General Terms and Conditions / Service Policies"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Gengo"
 msgstr ""
@@ -1690,7 +1653,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:361
+#: code:addons/website/static/src/js/menu/seo.js:340
 #, python-format
 msgid "Get this page efficiently referenced in Google to attract more visitors."
 msgstr ""
@@ -1701,35 +1664,30 @@ msgid "Get your opportunities filled up in our integrated CRM application"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_github
-msgid "GitHub"
-msgstr ""
-
-#. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_github
 msgid "GitHub Account"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:35
+#: code:addons/website/static/src/js/menu/content.js:47
 #, python-format
-msgid "Go to Link"
+msgid "Go To Page"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:20
-#: code:addons/website/static/src/xml/website.backend.xml:22
+#: code:addons/website/static/src/js/editor/snippets.options.js:27
 #, python-format
-msgid "Go to Website"
+msgid "Go to Link"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:96
+#: code:addons/website/static/src/xml/website.backend.xml:20
+#: code:addons/website/static/src/xml/website.backend.xml:22
 #, python-format
-msgid "Go to our"
+msgid "Go to Website"
 msgstr ""
 
 #. module: website
@@ -1739,7 +1697,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:45
+#: code:addons/website/static/src/js/tours/banner.js:46
 #, python-format
 msgid "Good Job! You created your first page. Let's check how this page looks like on <b>mobile devices</b>."
 msgstr ""
@@ -1751,20 +1709,20 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backendDashboard.js:79
-#: model:ir.model.fields,field_description:website.field_website_config_settings_has_google_analytics
+#: code:addons/website/static/src/js/backend/dashboard.js:89
+#: model:ir.model.fields,field_description:website.field_res_config_settings_has_google_analytics
 #, python-format
 msgid "Google Analytics"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_google_analytics_key
+#: model:ir.model.fields,field_description:website.field_res_config_settings_google_analytics_key
 #: model:ir.model.fields,field_description:website.field_website_google_analytics_key
 msgid "Google Analytics Key"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_has_google_analytics_dashboard
+#: model:ir.model.fields,field_description:website.field_res_config_settings_has_google_analytics_dashboard
 msgid "Google Analytics in Dashboard"
 msgstr ""
 
@@ -1774,25 +1732,25 @@ msgid "Google Business"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_google_management_client_id
+#: model:ir.model.fields,field_description:website.field_res_config_settings_google_management_client_id
 #: model:ir.model.fields,field_description:website.field_website_google_management_client_id
 msgid "Google Client ID"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_google_management_client_secret
+#: model:ir.model.fields,field_description:website.field_res_config_settings_google_management_client_secret
 #: model:ir.model.fields,field_description:website.field_website_google_management_client_secret
 msgid "Google Client Secret"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_has_google_maps
+#: model:ir.model.fields,field_description:website.field_res_config_settings_has_google_maps
 #: model:ir.ui.view,arch_db:website.company_description
 msgid "Google Maps"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_google_maps_api_key
+#: model:ir.model.fields,field_description:website.field_res_config_settings_google_maps_api_key
 msgid "Google Maps API Key"
 msgstr ""
 
@@ -1802,11 +1760,6 @@ msgid "Google Webmaster"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_googleplus
-msgid "Google+"
-msgstr ""
-
-#. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_googleplus
 msgid "Google+ Account"
 msgstr ""
@@ -1818,6 +1771,8 @@ msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
+#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
+#: model:website.page,arch_db:website.aboutus_page
 msgid "Great products for great people"
 msgstr ""
 
@@ -1832,6 +1787,11 @@ msgid "Group By"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_groups_id
+msgid "Groups"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Grow"
 msgstr ""
@@ -1852,15 +1812,15 @@ msgid "Headline"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:21
-#, python-format
-msgid "Here are the visuals used to help you translate efficiently:"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Here is a checklist of actions to help you launch a new website efficiently:"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Here is a checklist of actions to help you launch a new website efficiently:"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:75
+#, python-format
+msgid "Hide this page from search results"
 msgstr ""
 
 #. module: website
@@ -1873,6 +1833,8 @@ msgstr ""
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.editor.xml:4
+#: model:ir.model.fields,field_description:website.field_website_homepage_id
+#: model:ir.model.fields,field_description:website.field_website_page_is_homepage
 #: model:ir.ui.view,arch_db:website.403
 #: model:ir.ui.view,arch_db:website.404
 #: model:ir.ui.view,arch_db:website.footer_custom
@@ -1883,46 +1845,85 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:92
+#: code:addons/website/static/src/xml/website.backend.xml:101
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #, python-format
-msgid "I'm sure, I want to delete this page definitively"
+msgid "How to get my Client ID"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:96
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#, python-format
+msgid "How to get my Tracking ID"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_id
 #: model:ir.model.fields,field_description:website.field_website_id
-#: model:ir.model.fields,field_description:website.field_website_menu_id_1831
+#: model:ir.model.fields,field_description:website.field_website_menu_id_7170
+#: model:ir.model.fields,field_description:website.field_website_page_id
 #: model:ir.model.fields,field_description:website.field_website_published_mixin_id
+#: model:ir.model.fields,field_description:website.field_website_redirect_id
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata_id
 msgid "ID"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,help:website.field_website_page_xml_id
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.500
 msgid "If this error is caused by a change of yours in the templates, you have the possibility to reset one or more templates to their <strong>factory settings</strong>."
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,help:website.field_website_page_groups_id
+msgid "If this field is empty, the view applies to all users. Otherwise, the view applies to the users of those groups only."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,help:website.field_website_page_active
+msgid "If this view is inherited,\n"
+"* if True, the view always extends its parent\n"
+"* if False, the view currently does not extend its parent but can be enabled\n"
+"         "
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Improve your conversion from visitors to customers"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:32
+#: code:addons/website/static/src/xml/website.seo.xml:68
+#, python-format
+msgid "In description"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:69
 #, python-format
-msgid "In this mode, you can only translate texts.  To\n"
-"                            change the structure of the page, you must edit the\n"
-"                            master page. Each modification on the master page\n"
-"                            is automatically applied to all translated\n"
-"                            versions."
+msgid "In page's content"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backendDashboard.js:102
+#: code:addons/website/static/src/xml/website.seo.xml:67
 #, python-format
-msgid "Incorrect Client ID"
+msgid "In title"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:73
+#: model:ir.ui.view,arch_db:website.index_management
+#, python-format
+msgid "Indexed"
 msgstr ""
 
 #. module: website
@@ -1931,8 +1932,8 @@ msgid "Information about the"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Install Apps"
+#: model:ir.model.fields,field_description:website.field_website_page_inherit_id
+msgid "Inherited View"
 msgstr ""
 
 #. module: website
@@ -1946,7 +1947,7 @@ msgid "Install Language"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Install new language"
 msgstr ""
 
@@ -1966,6 +1967,23 @@ msgid "Installed Modules"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Iris Joe, CFO"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Iris, with her international experience, helps us easily understand the numbers and\n"
+"                                improves them. She is determined to drive success and delivers her professional\n"
+"                                acumen to bring Company at the next level."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_is_visible
+msgid "Is Visible"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Is the keyword popular in Google?"
 msgstr ""
@@ -1979,9 +1997,9 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:13
+#: code:addons/website/static/src/js/content/website_root.js:208
 #, python-format
-msgid "It might be possible to edit the relevant items or fix the issue in"
+msgid "It might be possible to edit the relevant items or fix the issue in <a href=\"%s\">the classic Odoo interface</a>"
 msgstr ""
 
 #. module: website
@@ -1998,30 +2016,30 @@ msgid "It’s time to grow your traffic!"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_hr_recruitment
-msgid "Jobs"
+#: model:ir.ui.view,arch_db:website.s_button
+msgid "Join us and make your company a better place."
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_button
-msgid "Join us and make your company a better place."
+#: model:ir.model.fields,field_description:website.field_website_page_key
+msgid "Key"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:28
+#: code:addons/website/static/src/xml/website.seo.xml:48
 #, python-format
-msgid "Language:"
+msgid "Keyword"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_language_ids
+#: model:ir.model.fields,field_description:website.field_res_config_settings_language_ids
 #: model:ir.model.fields,field_description:website.field_website_language_ids
 msgid "Languages"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Languages available on your website"
 msgstr ""
 
@@ -2032,44 +2050,47 @@ msgstr ""
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website___last_update
-#: model:ir.model.fields,field_description:website.field_website_config_settings___last_update
 #: model:ir.model.fields,field_description:website.field_website_menu___last_update
+#: model:ir.model.fields,field_description:website.field_website_page___last_update
 #: model:ir.model.fields,field_description:website.field_website_published_mixin___last_update
+#: model:ir.model.fields,field_description:website.field_website_redirect___last_update
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:102
+#: code:addons/website/static/src/xml/website.backend.xml:109
 #, python-format
 msgid "Last Month"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_write_uid
 #: model:ir.model.fields,field_description:website.field_website_menu_write_uid
+#: model:ir.model.fields,field_description:website.field_website_page_write_uid
+#: model:ir.model.fields,field_description:website.field_website_redirect_write_uid
 #: model:ir.model.fields,field_description:website.field_website_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_write_date
 #: model:ir.model.fields,field_description:website.field_website_menu_write_date
+#: model:ir.model.fields,field_description:website.field_website_page_write_date
+#: model:ir.model.fields,field_description:website.field_website_redirect_write_date
 #: model:ir.model.fields,field_description:website.field_website_write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:101
+#: code:addons/website/static/src/xml/website.backend.xml:108
 #, python-format
 msgid "Last Week"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:103
+#: code:addons/website/static/src/xml/website.backend.xml:110
 #, python-format
 msgid "Last Year"
 msgstr ""
@@ -2091,6 +2112,18 @@ msgstr ""
 
 #. module: website
 #. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:65
+#, python-format
+msgid "Legend:"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Let your customers log in to see their documents"
+msgstr ""
+
+#. module: website
+#. openerp-web
 #: code:addons/website/static/src/xml/website.editor.xml:5
 #, python-format
 msgid "Let's start designing."
@@ -2103,14 +2136,16 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:81
+#: code:addons/website/static/src/xml/website.contentMenu.xml:55
 #, python-format
-msgid "Link my Analytics Account"
+msgid "Link"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_linkedin
-msgid "LinkedIn"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:81
+#, python-format
+msgid "Link my Analytics Account"
 msgstr ""
 
 #. module: website
@@ -2119,25 +2154,25 @@ msgid "LinkedIn Account"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "List of Features"
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Links to other websites"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_livechat
-msgid "Live Chat"
+#: model:ir.ui.view,arch_db:website.s_feature_grid
+msgid "List of Features"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:83
+#: code:addons/website/static/src/js/menu/seo.js:82
 #, python-format
 msgid "Loading..."
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "Logout"
+#: model:ir.ui.view,arch_db:website.external_snippets
+msgid "Local Events"
 msgstr ""
 
 #. module: website
@@ -2147,11 +2182,26 @@ msgid "Main Menu"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Manage Pages"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Manage Your Website Pages"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Manage channels to structure your content"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Manage this page"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Masonry"
 msgstr ""
@@ -2168,7 +2218,12 @@ msgid "Medium"
 msgstr ""
 
 #. module: website
-#: code:addons/website/models/website.py:327
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Meet the Executive Team"
+msgstr ""
+
+#. module: website
+#: code:addons/website/models/website.py:207
 #: model:ir.model.fields,field_description:website.field_website_menu_name
 #, python-format
 msgid "Menu"
@@ -2176,21 +2231,44 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:326
+#: code:addons/website/static/src/js/menu/content.js:267
 #, python-format
 msgid "Menu Label"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Mich Stark, COO"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Mich loves taking on challenges. With his multi-year experience as Commercial\n"
+"                                Director in the software industry, Mich has helped Company to get where it\n"
+"                                is today. Mich is among the best minds."
+msgstr ""
+
+#. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.mobile.js:42
+#: code:addons/website/static/src/js/menu/mobile_view.js:54
 #, python-format
 msgid "Mobile preview"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_model
+#: model:ir.model.fields,field_description:website.field_website_page_model_ids
+msgid "Model"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_model_data_id
+msgid "Model Data"
+msgstr ""
+
+#. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:41
+#: code:addons/website/static/src/xml/website.seo.xml:58
 #, python-format
 msgid "Most searched topics related to your keywords, ordered by importance:"
 msgstr ""
@@ -2216,12 +2294,31 @@ msgid "Move to previous"
 msgstr ""
 
 #. module: website
+#: selection:website.redirect,type:0
+msgid "Moved permanently"
+msgstr ""
+
+#. module: website
+#: selection:website.redirect,type:0
+msgid "Moved temporarily"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.layout
 msgid "My Website"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:6
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Name and favicon of your website"
 msgstr ""
 
@@ -2232,7 +2329,8 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:64
+#: code:addons/website/static/src/js/menu/new_content.js:41
+#: code:addons/website/static/src/xml/website.contentMenu.xml:58
 #: model:ir.ui.view,arch_db:website.user_navbar
 #, python-format
 msgid "New Page"
@@ -2244,13 +2342,12 @@ msgid "New Window"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "New incoming messages are managed as leads or opportunities in your CRM app."
+#: model:ir.ui.view,arch_db:website.external_snippets
+msgid "Newsletter"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.kanban_contain
-#: model:ir.ui.view,arch_db:website.pager
 msgid "Next"
 msgstr ""
 
@@ -2275,12 +2372,19 @@ msgid "None"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:66
+#, python-format
+msgid "Not used"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
 msgid "Note: To hide this page, uncheck it from the top Customize menu."
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_language_count
+#: model:ir.model.fields,field_description:website.field_res_config_settings_language_count
 msgid "Number of languages"
 msgstr ""
 
@@ -2346,19 +2450,6 @@ msgid "Odoo text and image block"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Odoo's POS is a web application that can run on any device that\n"
-"                                can display websites with little to no setup required."
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:46
-#, python-format
-msgid "Ok"
-msgstr ""
-
-#. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:5
 #, python-format
@@ -2376,6 +2467,20 @@ msgid "Online users:"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,help:website.field_website_page_mode
+msgid "Only applies if this view inherits from an other one (inherit_id is not False/Null).\n"
+"\n"
+"* if extension (default), if this view is requested the closest primary view\n"
+"is looked up (via inherit_id), then all views inheriting from it with this\n"
+"view's model are applied\n"
+"* if primary, the closest primary view is fully resolved (even if it uses a\n"
+"different model than this one), then this view's inheritance specs\n"
+"(<xpath/>) are applied, and the result is used as if it were this view's\n"
+"actual arch.\n"
+""
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
 msgid "Open Source ERP"
 msgstr ""
@@ -2401,11 +2506,6 @@ msgid "Organize and publish events to meet your prospects and customers"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Organize events and sell tickets online"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "Other Info"
 msgstr ""
@@ -2427,13 +2527,17 @@ msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
+#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
+#: model:website.page,arch_db:website.aboutus_page
 msgid "Our Team"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
+#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
+#: model:website.page,arch_db:website.aboutus_page
 msgid "Our products are designed for small to medium size companies willing to optimize\n"
-"                                      their performance."
+"                                                      their performance."
 msgstr ""
 
 #. module: website
@@ -2443,25 +2547,70 @@ msgid "Our products are designed for small to medium size companies willing to o
 msgstr ""
 
 #. module: website
-#: code:addons/website/models/website.py:306
+#: code:addons/website/models/website.py:174
+#: model:ir.model,name:website.model_website_page
 #, python-format
 msgid "Page"
 msgstr ""
 
 #. module: website
-#: code:addons/website/models/website.py:312
+#: code:addons/website/models/website.py:185
 #, python-format
 msgid "Page <b>%s</b> contains a link to this page"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_website_indexed
+msgid "Page Indexed"
+msgstr ""
+
+#. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:65
+#: code:addons/website/static/src/xml/website.pageProperties.xml:12
+#: model:ir.model.fields,field_description:website.field_website_page_name
+#, python-format
+msgid "Page Name"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/menu/content.js:50
+#: model:ir.ui.view,arch_db:website.user_navbar
+#, python-format
+msgid "Page Properties"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/menu/new_content.js:42
+#: code:addons/website/static/src/xml/website.seo.xml:14
 #, python-format
 msgid "Page Title"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_url
+msgid "Page URL"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:18
+#, python-format
+msgid "Page Url"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.menu,name:website.menu_website_pages_list
+msgid "Pages"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Pages Management"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Panama Sky"
 msgstr ""
@@ -2508,11 +2657,6 @@ msgid "People"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Performance Optimization"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Plan"
 msgstr ""
@@ -2533,18 +2677,6 @@ msgid "Please install a theme in order to customize your website."
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.theme.js:277
-#, python-format
-msgid "Please install or update node-less"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Point of Sale Questions <small>v7</small>"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Post content on other people blogs, forums, websites, that are related to your environment."
 msgstr ""
@@ -2556,36 +2688,36 @@ msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.kanban_contain
-#: model:ir.ui.view,arch_db:website.pager
 msgid "Prev"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:28
+#, python-format
+msgid "Preview"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Professional"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:5
 #: model:ir.ui.view,arch_db:website.user_navbar
 #: model:ir.ui.view,arch_db:website.website_planner
-#, python-format
 msgid "Promote"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:360
+#: code:addons/website/static/src/js/menu/seo.js:339
 #, python-format
 msgid "Promote This Page"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:5
 #: model:ir.ui.view,arch_db:website.user_navbar
-#, python-format
 msgid "Promote page on the web"
 msgstr ""
 
@@ -2595,11 +2727,6 @@ msgid "Promote your catalog of services"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Promote your job announces and attract new talents"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Provide fast, professional and accurate information to your visitors"
 msgstr ""
@@ -2615,6 +2742,14 @@ msgid "Public User"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:7
+#: code:addons/website/static/src/xml/website.pageProperties.xml:87
+#, python-format
+msgid "Publish"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Publish multimedias to document your products/services"
 msgstr ""
@@ -2626,14 +2761,14 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:41
+#: code:addons/website/static/src/js/tours/banner.js:42
 #, python-format
 msgid "Publish your page by clicking on the <b>Save</b> button."
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backend.js:18
+#: code:addons/website/static/src/js/backend/button.js:37
 #: model:ir.ui.view,arch_db:website.publish_management
 #: model:ir.ui.view,arch_db:website.publish_short
 #, python-format
@@ -2641,6 +2776,14 @@ msgid "Published"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:98
+#: model:ir.model.fields,field_description:website.field_website_page_date_publish
+#, python-format
+msgid "Publishing Date"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
 msgid "QWeb"
 msgstr ""
@@ -2666,8 +2809,30 @@ msgid "Redeem a $75 coupon code to start your campaign."
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Reduce resources spent on support with a website forum"
+#: model:ir.model.fields,field_description:website.field_website_redirect_url_from
+msgid "Redirect From"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_redirect_url_to
+msgid "Redirect To"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:27
+#, python-format
+msgid "Redirect old url"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_redirect_type
+msgid "Redirection Type"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.menu,name:website.menu_website_redirect_list
+msgid "Redirects"
 msgstr ""
 
 #. module: website
@@ -2681,29 +2846,27 @@ msgid "Regroup similar pages into a sub-menu, so they will appear under a unique
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:58
-#, python-format
-msgid "Remove this suggestion from dashboard"
+#: model:ir.model.fields,field_description:website.field_website_page_menu_ids
+msgid "Related Menus"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Rename Page"
+#: model:ir.model.fields,field_description:website.field_website_menu_page_id
+msgid "Related Page"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:105
+#: code:addons/website/static/src/xml/website.backend.xml:58
 #, python-format
-msgid "Rename Page To:"
+msgid "Remove this suggestion from dashboard"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:99
+#: code:addons/website/static/src/xml/website.xml:68
 #, python-format
-msgid "Rename This Page"
+msgid "Rename Page To:"
 msgstr ""
 
 #. module: website
@@ -2748,19 +2911,14 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backendDashboard.js:83
-#: code:addons/website/static/src/js/website.seo.js:363
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: code:addons/website/static/src/js/backend/dashboard.js:96
+#: code:addons/website/static/src/js/menu/content.js:43
+#: code:addons/website/static/src/js/menu/seo.js:342
 #, python-format
 msgid "Save"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.menu_search
 msgid "Search Menus"
 msgstr ""
@@ -2781,7 +2939,7 @@ msgid "Second List"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "See Google Analytics data on your Website Dashboard"
 msgstr ""
 
@@ -2797,7 +2955,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:184
+#: code:addons/website/static/src/js/menu/content.js:313
 #, python-format
 msgid "Select a Menu"
 msgstr ""
@@ -2818,22 +2976,21 @@ msgid "Sell more online"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Sell recurring services with automated billing and payments"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Send an email to all your contacts"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
+#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
+#: model:website.page,arch_db:website.contactus_page
 msgid "Send us an email"
 msgstr ""
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_sequence
+#: model:ir.model.fields,field_description:website.field_website_page_priority
+#: model:ir.model.fields,field_description:website.field_website_redirect_sequence
 msgid "Sequence"
 msgstr ""
 
@@ -2853,18 +3010,21 @@ msgid "Share experience on similar projects"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Share videos, presentations and documents"
+#: model:ir.model.fields,field_description:website.field_ir_ui_view_customize_show
+#: model:ir.model.fields,field_description:website.field_website_page_customize_show
+msgid "Show As Optional Inherit"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_ir_ui_view_customize_show
-msgid "Show As Optional Inherit"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:51
+#, python-format
+msgid "Show in top menu"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Show a map in the"
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Show your address on a map in the"
 msgstr ""
 
 #. module: website
@@ -2873,8 +3033,8 @@ msgid "Simple and obvious"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_slides
-msgid "Slides"
+#: model:ir.ui.view,arch_db:website.s_banner
+msgid "Slider Odoo Image"
 msgstr ""
 
 #. module: website
@@ -2893,19 +3053,21 @@ msgid "Small"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.view_company_form_inherit_website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "Social Media"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Social Media Links"
+#: code:addons/website/controllers/main.py:213
+#, python-format
+msgid "Sort by Name"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Social media links in your website footer"
+#: code:addons/website/controllers/main.py:212
+#, python-format
+msgid "Sort by Url"
 msgstr ""
 
 #. module: website
@@ -2927,17 +3089,12 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:44
+#: code:addons/website/static/src/js/editor/snippets.options.js:50
 #, python-format
 msgid "Stay on this page"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_contract
-msgid "Subscriptions"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.footer_custom
 msgid "Subtitle"
 msgstr ""
@@ -2953,6 +3110,13 @@ msgid "Subtitle 3"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:58
+#, python-format
+msgid "Suggested"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "TRANSLATE"
 msgstr ""
@@ -2973,7 +3137,7 @@ msgid "Tell what's the value for the<br/>customer for this feature."
 msgstr ""
 
 #. module: website
-#: code:addons/website/models/website.py:317
+#: code:addons/website/models/website.py:199
 #, python-format
 msgid "Template <b>%s (id:%s)</b> contains a link to this page"
 msgstr ""
@@ -2984,22 +3148,13 @@ msgid "Template fallback"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "The Banner or Big Picture building blocks are good choices for that."
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.backendDashboard.js:102
-#, python-format
-msgid "The Google Analytics Client ID you have entered seems incorrect."
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Terms of service"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "The Point of Sale works perfectly on any kind of touch enabled\n"
-"                                device, whether it's multi-touch tablets like an iPad or\n"
-"                                keyboardless resistive touchscreen terminals."
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "The Banner or Big Picture building blocks are good choices for that."
 msgstr ""
 
 #. module: website
@@ -3020,14 +3175,13 @@ msgstr ""
 #: model:ir.model.fields,help:website.field_hr_employee_website_url
 #: model:ir.model.fields,help:website.field_hr_job_website_url
 #: model:ir.model.fields,help:website.field_im_livechat_channel_website_url
-#: model:ir.model.fields,help:website.field_payment_acquirer_website_url
 #: model:ir.model.fields,help:website.field_product_template_website_url
-#: model:ir.model.fields,help:website.field_project_project_website_url
 #: model:ir.model.fields,help:website.field_res_partner_grade_website_url
 #: model:ir.model.fields,help:website.field_res_partner_tag_website_url
 #: model:ir.model.fields,help:website.field_res_partner_website_url
 #: model:ir.model.fields,help:website.field_slide_channel_website_url
 #: model:ir.model.fields,help:website.field_slide_slide_website_url
+#: model:ir.model.fields,help:website.field_website_page_website_url
 #: model:ir.model.fields,help:website.field_website_published_mixin_website_url
 msgid "The full URL to access the document through the website."
 msgstr ""
@@ -3060,17 +3214,8 @@ msgid "The shorter the better"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:12
-#, python-format
-msgid "The web site has encountered an error."
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.theme.js:280
-#, python-format
-msgid "Theme Error"
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "There are currently no pages for your website."
 msgstr ""
 
 #. module: website
@@ -3088,18 +3233,30 @@ msgid "There is no data currently available."
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website\n"
+"                                (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\")."
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_features
 msgid "Third Feature"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,help:website.field_website_config_settings_favicon
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "This Agreement sets forth the general terms and conditions of your use of this website\n"
+"                                and any of its products or services (collectively, \"Website\" or \"Services\")."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,help:website.field_res_config_settings_favicon
 #: model:ir.model.fields,help:website.field_website_favicon
 msgid "This field holds the image used to display a favicon on the website."
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,help:website.field_website_config_settings_default_lang_code
+#: model:ir.model.fields,help:website.field_res_config_settings_default_lang_code
 #: model:ir.model.fields,help:website.field_website_default_lang_code
 msgid "This field is used to set/get locales for user"
 msgstr ""
@@ -3110,7 +3267,7 @@ msgid "This page does not exists, but you can create it as you are administrator
 msgstr ""
 
 #. module: website
-#: code:addons/website/models/website.py:331
+#: code:addons/website/models/website.py:211
 #, python-format
 msgid "This page is in the menu <b>%s</b>"
 msgstr ""
@@ -3126,13 +3283,6 @@ msgid "Time-consuming"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:48
-#, python-format
-msgid "Title"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_three_columns
 msgid "To add a fourth column, reduce the size of these\n"
 "                        three columns using the right icon of each block.\n"
@@ -3146,8 +3296,13 @@ msgid "To get an external assessment of your website, you can also submit it to"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Tony Fred, CEO"
+msgstr ""
+
+#. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:179
+#: code:addons/website/static/src/js/menu/content.js:308
 #: model:website.menu,name:website.main_menu
 #, python-format
 msgid "Top Menu"
@@ -3159,34 +3314,25 @@ msgid "Traceback"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Track visits in Google Analytics"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:487
-#, python-format
-msgid "Transform the picture (click twice to reset transformation)"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Translate"
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Tracking ID"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:14
+#: code:addons/website/static/src/js/editor/rte.summernote.js:17
 #, python-format
-msgid "Translate this page"
+msgid "Transform the picture (click twice to reset transformation)"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:27
-#, python-format
-msgid "Translated content"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Translate"
 msgstr ""
 
 #. module: website
@@ -3195,27 +3341,20 @@ msgid "Translating your website into other languages is the best way to broaden
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "Tutorial"
-msgstr ""
-
-#. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_twitter
-msgid "Twitter"
-msgstr ""
-
-#. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_twitter
 msgid "Twitter Account"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_twitter
-msgid "Twitter Roller"
+#: model:ir.ui.view,arch_db:website.external_snippets
+msgid "Twitter Scroller"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:41
 #: model:ir.ui.view,arch_db:website.snippet_options
+#, python-format
 msgid "Type"
 msgstr ""
 
@@ -3225,23 +3364,38 @@ msgid "Type '<i class=\"confirm_word\">yes</i>' in the box below if you want to
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:95
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#, python-format
 msgid "UA-XXXXXXXX-Y"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,help:website.field_res_config_settings_cdn_filters
 #: model:ir.model.fields,help:website.field_website_cdn_filters
-#: model:ir.model.fields,help:website.field_website_config_settings_cdn_filters
 msgid "URL matching those filters will be rewritten using the CDN Base URL"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.contentMenu.xml:61
+#, python-format
+msgid "URL or Email"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Ultimate package"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.index_management
+msgid "Unindexed"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Unlimited CRM power and support"
 msgstr ""
@@ -3253,7 +3407,7 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/js/website.backend.js:22
+#: code:addons/website/static/src/js/backend/button.js:37
 #: model:ir.ui.view,arch_db:website.publish_management
 #: model:ir.ui.view,arch_db:website.publish_short
 #, python-format
@@ -3266,44 +3420,36 @@ msgid "Update your internal documents: footer of sales order, contracts, invoice
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.gallery.xml:32
-#, python-format
-msgid "Upload failed, some images might not have been uploaded. Check your network connectivity."
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.gallery.xml:31
-#, python-format
-msgid "Upload successful."
+#: model:ir.model.fields,field_description:website.field_website_menu_url
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Url"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_menu_url
-msgid "Url"
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Use Of Cookies"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Use a CDN to optimize the availability of your website's content"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_cdn_activated
+#: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_activated
 msgid "Use a Content Delivery Network (CDN)"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Use the Button block or the Newsletter subscription one (if Mass Mailing installed)."
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:62
+#, python-format
+msgid "Use as homepage"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:96
-#, python-format
-msgid "User Documentation"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Use the Button block or the Newsletter subscription one (if Mass Mailing installed)."
 msgstr ""
 
 #. module: website
@@ -3323,16 +3469,42 @@ msgid "Very Slow"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_ir_ui_view_id
+msgid "View"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_arch
+#: model:ir.model.fields,field_description:website.field_website_page_arch_base
+msgid "View Architecture"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_type
+msgid "View Type"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_mode
+msgid "View inheritance mode"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_inherit_children_ids
+msgid "Views which inherit from this one"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_blog_post_website_published
 #: model:ir.model.fields,field_description:website.field_event_track_website_published
 #: model:ir.model.fields,field_description:website.field_hr_employee_website_published
 #: model:ir.model.fields,field_description:website.field_hr_job_website_published
 #: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_published
 #: model:ir.model.fields,field_description:website.field_product_template_website_published
-#: model:ir.model.fields,field_description:website.field_project_project_website_published
 #: model:ir.model.fields,field_description:website.field_res_partner_website_published
 #: model:ir.model.fields,field_description:website.field_slide_channel_website_published
 #: model:ir.model.fields,field_description:website.field_slide_slide_website_published
+#: model:ir.model.fields,field_description:website.field_website_page_website_published
 #: model:ir.model.fields,field_description:website.field_website_published_mixin_website_published
 msgid "Visible in Website"
 msgstr ""
@@ -3350,17 +3522,12 @@ msgid "Visits"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:64
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
+#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
+#: model:website.page,arch_db:website.aboutus_page
 msgid "We are a team of passionate people whose goal is to improve everyone's\n"
-"                                      life through disruptive products. We build great products to solve your\n"
-"                                      business problems."
+"                                                      life through disruptive products. We build great products to solve your\n"
+"                                                      business problems."
 msgstr ""
 
 #. module: website
@@ -3371,12 +3538,21 @@ msgid "We are a team of passionate people whose goal is to improve everyone's\n"
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:37
+#, python-format
+msgid "We found these ones:"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "We hope this planner helped you to create your website."
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
+#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
+#: model:website.page,arch_db:website.contactus_page
 msgid "We'll do our best to get back to you as soon as possible."
 msgstr ""
 
@@ -3385,10 +3561,11 @@ msgstr ""
 #: model:ir.model,name:website.model_website
 #: model:ir.model.fields,field_description:website.field_ir_ui_view_website_id
 #: model:ir.model.fields,field_description:website.field_website_menu_website_id
+#: model:ir.model.fields,field_description:website.field_website_page_website_id
+#: model:ir.model.fields,field_description:website.field_website_redirect_website_id
 #: model:ir.ui.menu,name:website.menu_website_configuration
-#: model:ir.ui.view,arch_db:website.user_navbar
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:website.view_server_action_search_website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "Website"
 msgstr ""
 
@@ -3419,17 +3596,44 @@ msgid "Website Menu"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_website_name
+#: model:ir.model.fields,field_description:website.field_res_config_settings_website_name
 #: model:ir.model.fields,field_description:website.field_website_name
 msgid "Website Name"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.website_pages_form_view
+msgid "Website Page Settings"
+msgstr ""
+
+#. module: website
+#: model:ir.actions.act_window,name:website.action_website_pages_list
+#: model:ir.ui.view,arch_db:website.website_pages_tree_view
+msgid "Website Pages"
+msgstr ""
+
+#. module: website
 #: model:ir.model.fields,field_description:website.field_ir_act_server_website_path
 msgid "Website Path"
 msgstr ""
 
 #. module: website
+#: model:ir.model,name:website.model_website_redirect
+msgid "Website Redirect"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.website_redirect_form_view
+msgid "Website Redirect Settings"
+msgstr ""
+
+#. module: website
+#: model:ir.actions.act_window,name:website.action_website_redirect_list
+#: model:ir.ui.view,arch_db:website.website_redirect_tree_view
+msgid "Website Redirects"
+msgstr ""
+
+#. module: website
 #: model:ir.actions.act_window,name:website.action_website_configuration
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "Website Settings"
@@ -3441,7 +3645,7 @@ msgid "Website Theme"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Website Title"
 msgstr ""
 
@@ -3453,14 +3657,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:website.field_hr_employee_website_url
 #: model:ir.model.fields,field_description:website.field_hr_job_website_url
 #: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_url
-#: model:ir.model.fields,field_description:website.field_payment_acquirer_website_url
 #: model:ir.model.fields,field_description:website.field_product_template_website_url
-#: model:ir.model.fields,field_description:website.field_project_project_website_url
 #: model:ir.model.fields,field_description:website.field_res_partner_grade_website_url
 #: model:ir.model.fields,field_description:website.field_res_partner_tag_website_url
 #: model:ir.model.fields,field_description:website.field_res_partner_website_url
 #: model:ir.model.fields,field_description:website.field_slide_channel_website_url
 #: model:ir.model.fields,field_description:website.field_slide_slide_website_url
+#: model:ir.model.fields,field_description:website.field_website_page_website_url
 #: model:ir.model.fields,field_description:website.field_website_published_mixin_website_url
 msgid "Website URL"
 msgstr ""
@@ -3471,6 +3674,13 @@ msgid "Website Url"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Website may use cookies to personalize and facilitate maximum navigation of the\n"
+"                                User by this site. The User may configure his / her browser to notify and\n"
+"                                reject the installation of the cookies sent by us."
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.menu_tree
 msgid "Website menu"
 msgstr ""
@@ -3492,6 +3702,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:website.field_res_partner_website_meta_description
 #: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_description
 #: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_description
+#: model:ir.model.fields,field_description:website.field_website_page_website_meta_description
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_description
 msgid "Website meta description"
 msgstr ""
@@ -3513,6 +3724,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:website.field_res_partner_website_meta_keywords
 #: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_keywords
 #: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_website_page_website_meta_keywords
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_keywords
 msgid "Website meta keywords"
 msgstr ""
@@ -3534,6 +3746,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:website.field_res_partner_website_meta_title
 #: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_title
 #: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_title
+#: model:ir.model.fields,field_description:website.field_website_page_website_meta_title
 #: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_title
 msgid "Website meta title"
 msgstr ""
@@ -3544,6 +3757,7 @@ msgid "Website: Dashboard"
 msgstr ""
 
 #. module: website
+#: model:ir.model.fields,field_description:website.field_website_page_website_ids
 #: model:ir.ui.view,arch_db:website.view_website_tree
 msgid "Websites"
 msgstr ""
@@ -3578,22 +3792,6 @@ msgid "What may <strong>interest your visitors?</strong>"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_ir_ui_view_page
-msgid "Whether this view is a web page template (complete)"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Which hardware does Odoo POS support?"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "While an internet connection is required to start the Point of\n"
-"                                Sale, it will stay operational even after a complete disconnection."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.s_cover
 msgid "With a great subtitle"
 msgstr ""
@@ -3639,18 +3837,6 @@ msgid "Write what the customer would like to know,<br/>not what you want to show
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Yes"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:18
-#, python-format
-msgid "You are about to enter the translation mode."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "You can also pay for a sponsored indexing and place advertisements on web pages that show results from search\n"
 "                        engine queries. This is called <strong>SEA</strong>."
@@ -3684,21 +3870,35 @@ msgid "You need to log in to your Google Account before:"
 msgstr ""
 
 #. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "You should carefully review the legal statements and other conditions of use of\n"
+"                                any website which you access through a link from this Website. Your linking to\n"
+"                                any other off-site pages or other websites is at your own risk."
+msgstr ""
+
+#. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
 #: model:ir.actions.act_window,help:website.action_module_website
 msgid "You should try other search criteria."
 msgstr ""
 
 #. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:99
+#, python-format
+msgid "Your Client ID:"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
-msgid "Your Banner Title"
+msgid "Your Slide Title"
 msgstr ""
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:94
 #, python-format
-msgid "Your Google Analytic Client ID:"
+msgid "Your Tracking ID:"
 msgstr ""
 
 #. module: website
@@ -3727,13 +3927,13 @@ msgid "Your menu must be built for your visitors and not for your own purposes o
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Your visitors won't see the footer immediately. Use it for links you don't want in your main menu (e.g. social media, terms and conditions, privacy terms, etc.)."
+#: model:ir.ui.view,arch_db:website.edit_website_pages
+msgid "Your search '"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_social_youtube
-msgid "Youtube"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Your visitors won't see the footer immediately. Use it for links you don't want in your main menu (e.g. social media, terms and conditions, privacy terms, etc.)."
 msgstr ""
 
 #. module: website
@@ -3768,24 +3968,19 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:17
+#: code:addons/website/static/src/xml/website.seo.xml:41
 #, python-format
 msgid "describing your page content"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:107
+#: code:addons/website/static/src/xml/website.xml:70
 #, python-format
 msgid "e.g. About Us"
 msgstr ""
 
 #. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_sale
-msgid "eCommerce"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "etc."
 msgstr ""
@@ -3817,55 +4012,45 @@ msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.xml:70
+#: code:addons/website/static/src/xml/website.xml:41
 #, python-format
 msgid "found(s)"
 msgstr ""
 
 #. module: website
 #. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:62
+#: code:addons/website/static/src/xml/website.seo.xml:28
 #, python-format
 msgid "how your page will be listed on Google"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "https://plus.google.com/+Odooapps"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "https://twitter.com/Odoo"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
-msgid "https://www.facebook.com/Odoo"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "https://www.facebook.com/odoo"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "https://www.linkedin.com/company/odoo"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "https://www.youtube.com/user/OpenERPonline"
 msgstr ""
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
 msgid "https://youraccount.github.io"
 msgstr ""
 
@@ -3915,15 +4100,12 @@ msgid "name"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.translator.xml:5
 #: model:ir.ui.view,arch_db:website.user_navbar
-#, python-format
 msgid "or Edit Master"
 msgstr ""
 
 #. module: website
-#: model:ir.ui.view,arch_db:website.website_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "page"
 msgstr ""
 
@@ -3933,6 +4115,11 @@ msgid "peek.usertesting.com"
 msgstr ""
 
 #. module: website
+#: model:ir.model,name:website.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "sending us an email"
 msgstr ""
@@ -3950,13 +4137,6 @@ msgid "sitemap.xml"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:13
-#, python-format
-msgid "the classic Odoo interface"
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "through the content of your pages;"
 msgstr ""
@@ -3968,13 +4148,6 @@ msgid "to describe\n"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:96
-#, python-format
-msgid "to get more information."
-msgstr ""
-
-#. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "to get started."
 msgstr ""
@@ -4000,24 +4173,12 @@ msgid "user / month (billed annually)"
 msgstr ""
 
 #. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:45
-#, python-format
-msgid "using above suggested keywords"
-msgstr ""
-
-#. module: website
-#: model:ir.model.fields,field_description:website.field_website_config_settings_website_id
+#: model:ir.model.fields,field_description:website.field_res_config_settings_website_id
 #: model:ir.ui.view,arch_db:website.menu_search
 msgid "website"
 msgstr ""
 
 #. module: website
-#: model:ir.model,name:website.model_website_config_settings
-msgid "website.config.settings"
-msgstr ""
-
-#. module: website
 #: model:ir.model,name:website.model_website_published_mixin
 msgid "website.published.mixin"
 msgstr ""
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index 178b95d95b7..f3c6852b90d 100644
--- a/addons/website_blog/i18n/website_blog.pot
+++ b/addons/website_blog/i18n/website_blog.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -132,7 +132,7 @@ msgid "Blog Name"
 msgstr ""
 
 #. module: website_blog
-#: code:addons/website_blog/models/website.py:23
+#: code:addons/website_blog/models/website.py:22
 #: model:ir.model,name:website_blog.model_blog_post
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
@@ -141,7 +141,7 @@ msgid "Blog Post"
 msgstr ""
 
 #. module: website_blog
-#: code:addons/website_blog/models/website.py:27
+#: code:addons/website_blog/models/website.py:26
 #, python-format
 msgid "Blog Post <b>%s</b> seems to have a link to this page !"
 msgstr ""
@@ -256,6 +256,7 @@ msgstr ""
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_mail_compose_message_path
+#: model:ir.model.fields,field_description:website_blog.field_mail_mail_path
 #: model:ir.model.fields,field_description:website_blog.field_mail_message_path
 #: model:ir.model.fields,field_description:website_blog.field_survey_mail_compose_message_path
 msgid "Discussion Path"
@@ -269,7 +270,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.blog_edit_options
 msgid "Duplicate"
 msgstr ""
 
@@ -383,7 +384,7 @@ msgstr ""
 
 #. module: website_blog
 #. openerp-web
-#: code:addons/website_blog/static/src/js/website_blog.editor.js:21
+#: code:addons/website_blog/static/src/js/website_blog.editor.js:37
 #: model:ir.ui.view,arch_db:website_blog.content_new_blogpost
 #, python-format
 msgid "New Blog Post"
@@ -447,7 +448,7 @@ msgid "Posts"
 msgstr ""
 
 #. module: website_blog
-#: code:addons/website_blog/controllers/main.py:269
+#: code:addons/website_blog/controllers/main.py:270
 #, python-format
 msgid "Public user cannot post comments on blog post."
 msgstr ""
@@ -469,13 +470,13 @@ msgid "Published Post"
 msgstr ""
 
 #. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
-msgid "Published date"
+#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
+msgid "Publishing Options"
 msgstr ""
 
 #. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
-msgid "Publishing Options"
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
+msgid "Publishing date"
 msgstr ""
 
 #. module: website_blog
@@ -524,7 +525,7 @@ msgstr ""
 
 #. module: website_blog
 #. openerp-web
-#: code:addons/website_blog/models/website_blog.py:120
+#: code:addons/website_blog/models/website_blog.py:123
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:52
 #, python-format
 msgid "Start writing here..."
@@ -588,6 +589,11 @@ msgid "Technical"
 msgstr ""
 
 #. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_post_post_date
+msgid "The blog post will be visible for your visitors as of this date on the website if it is set as published."
+msgstr ""
+
+#. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
 msgid "This page is great to improve your <strong>Search Engine Optimization</strong>;\n"
 "                   You can review titles, keywords and descriptions of all blogs at once."
@@ -622,6 +628,7 @@ msgstr ""
 
 #. module: website_blog
 #: model:ir.model.fields,help:website_blog.field_mail_compose_message_path
+#: model:ir.model.fields,help:website_blog.field_mail_mail_path
 #: model:ir.model.fields,help:website_blog.field_mail_message_path
 #: model:ir.model.fields,help:website_blog.field_survey_mail_compose_message_path
 msgid "Used to display messages in a paragraph-based chatter using a unique path;"
diff --git a/addons/website_crm/i18n/website_crm.pot b/addons/website_crm/i18n/website_crm.pot
index cffe4bc8002..071d7cc3a03 100644
--- a/addons/website_crm/i18n/website_crm.pot
+++ b/addons/website_crm/i18n/website_crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,14 +16,9 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_crm
-#. openerp-web
-#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:35
-#, python-format
-msgid "% Leads"
-msgstr ""
-
-#. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
+#: model:ir.ui.view,arch_db:website_crm.contactus_thanks_page_ir_ui_view
+#: model:website.page,arch_db:website_crm.contactus_thanks_page
 msgid "&amp;times;"
 msgstr ""
 
@@ -34,7 +29,27 @@ msgid "<span class=\"btn btn-primary btn-lg o_website_form_send\">Send</span>\n"
 msgstr ""
 
 #. module: website_crm
-#: model:ir.model.fields,field_description:website_crm.field_website_config_settings_crm_default_team_id
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "Add a contact form in the"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "Communication"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "Contact Form"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "Contact Us"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_team_id
 msgid "Default Sales Channel"
 msgstr ""
 
@@ -44,19 +59,19 @@ msgid "Default Sales Channels"
 msgstr ""
 
 #. module: website_crm
-#: model:ir.model.fields,field_description:website_crm.field_website_config_settings_crm_default_user_id
+#: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_user_id
 #: model:ir.model.fields,field_description:website_crm.field_website_crm_default_user_id
 msgid "Default Salesperson"
 msgstr ""
 
 #. module: website_crm
-#: model:ir.model.fields,help:website_crm.field_website_config_settings_crm_default_team_id
+#: model:ir.model.fields,help:website_crm.field_res_config_settings_crm_default_team_id
 #: model:ir.model.fields,help:website_crm.field_website_crm_default_team_id
 msgid "Default sales channel for new leads created through the Contact Us form."
 msgstr ""
 
 #. module: website_crm
-#: model:ir.model.fields,help:website_crm.field_website_config_settings_crm_default_user_id
+#: model:ir.model.fields,help:website_crm.field_res_config_settings_crm_default_user_id
 #: model:ir.model.fields,help:website_crm.field_website_crm_default_user_id
 msgid "Default salesperson for new leads created through the Contact Us form."
 msgstr ""
@@ -68,6 +83,8 @@ msgstr ""
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
+#: model:ir.ui.view,arch_db:website_crm.contactus_thanks_page_ir_ui_view
+#: model:website.page,arch_db:website_crm.contactus_thanks_page
 msgid "If you have an emergency, do not hesitate to contact us by phone:"
 msgstr ""
 
@@ -77,24 +94,8 @@ msgid "Lead/Opportunity"
 msgstr ""
 
 #. module: website_crm
-#. openerp-web
-#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:34
-#, python-format
-msgid "Leads"
-msgstr ""
-
-#. module: website_crm
-#. openerp-web
-#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:8
-#, python-format
-msgid "Leads Acquisition /"
-msgstr ""
-
-#. module: website_crm
-#. openerp-web
-#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:13
-#, python-format
-msgid "Leads Analysis"
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "New messages are managed as leads or opportunities in your CRM app."
 msgstr ""
 
 #. module: website_crm
@@ -103,12 +104,12 @@ msgid "Phone Number"
 msgstr ""
 
 #. module: website_crm
-#: model:ir.ui.view,arch_db:website_crm.website_config_settings_view_form_inherit_website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "Sales Channel"
 msgstr ""
 
 #. module: website_crm
-#: model:ir.ui.view,arch_db:website_crm.website_config_settings_view_form_inherit_website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "Salesperson"
 msgstr ""
 
@@ -119,18 +120,15 @@ msgstr ""
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
+#: model:ir.ui.view,arch_db:website_crm.contactus_thanks_page_ir_ui_view
+#: model:website.page,arch_db:website_crm.contactus_thanks_page
 msgid "Thanks!"
 msgstr ""
 
 #. module: website_crm
-#. openerp-web
-#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:15
-#, python-format
-msgid "There is no recent lead."
-msgstr ""
-
-#. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
+#: model:ir.ui.view,arch_db:website_crm.contactus_thanks_page_ir_ui_view
+#: model:website.page,arch_db:website_crm.contactus_thanks_page
 msgid "We will get back to you shortly."
 msgstr ""
 
@@ -161,11 +159,18 @@ msgstr ""
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
+#: model:ir.ui.view,arch_db:website_crm.contactus_thanks_page_ir_ui_view
+#: model:website.page,arch_db:website_crm.contactus_thanks_page
 msgid "Your message has been sent successfully."
 msgstr ""
 
 #. module: website_crm
-#: model:ir.model,name:website_crm.model_website_config_settings
-msgid "website.config.settings"
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "page"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.model,name:website_crm.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
index a32d10ac906..2a291848c25 100644
--- a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
+++ b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "\n"
 "\n"
 "<p>Thanks,</p>\n"
 "\n"
-"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or '' | safe}\n"
+"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
 "\n"
 "% if not ctx['partner_id'].user_id:\n"
 "PS: It looks like you do not have an account manager assigned to you, please contact us.\n"
@@ -77,7 +77,7 @@ msgid "<i class=\"fa fa-fw fa-times\"/> I'm not interested"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/models/crm_lead.py:194
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:191
 #, python-format
 msgid "<p>I am interested by this lead.</p>"
 msgstr ""
@@ -121,6 +121,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_activation
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_activation
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.res_partner_activation_form
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.res_partner_activation_tree
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_res_partner_filter_assign
@@ -128,7 +129,7 @@ msgid "Activation"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:97
+#: code:addons/website_crm_partner_assign/controllers/main.py:99
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_active
 #, python-format
 msgid "Active"
@@ -141,19 +142,19 @@ msgid "Address"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:222
+#: code:addons/website_crm_partner_assign/controllers/main.py:224
 #, python-format
 msgid "All Categories"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:239
+#: code:addons/website_crm_partner_assign/controllers/main.py:241
 #, python-format
 msgid "All Countries"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/models/crm_lead.py:267
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:262
 #, python-format
 msgid "All fields are required !"
 msgstr ""
@@ -169,6 +170,11 @@ msgid "Assign Month"
 msgstr ""
 
 #. module: website_crm_partner_assign
+#: model:ir.actions.server,name:website_crm_partner_assign.action_assign_salesman_according_assigned_partner
+msgid "Assign salesman of assigned partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_date_assign
 msgid "Assignation Date"
 msgstr ""
@@ -252,8 +258,8 @@ msgid "Contact"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:51
-#: code:addons/website_crm_partner_assign/controllers/main.py:108
+#: code:addons/website_crm_partner_assign/controllers/main.py:53
+#: code:addons/website_crm_partner_assign/controllers/main.py:110
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 #, python-format
@@ -314,11 +320,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.actions.server,name:website_crm_partner_assign.action_assign_salesman_according_assigned_partner
-msgid "Crm Assignation: Assign salesman of assigned partner"
-msgstr ""
-
-#. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "Current stage of the opp"
 msgstr ""
@@ -427,7 +428,7 @@ msgid "Expected Closing:"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:109
+#: code:addons/website_crm_partner_assign/controllers/main.py:111
 #, python-format
 msgid "Expected Revenue"
 msgstr ""
@@ -487,6 +488,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,help:website_crm_partner_assign.field_res_partner_grade_partner_weight
 #: model:ir.model.fields,help:website_crm_partner_assign.field_res_partner_partner_weight
+#: model:ir.model.fields,help:website_crm_partner_assign.field_res_users_partner_weight
 msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
 msgstr ""
 
@@ -508,13 +510,13 @@ msgid "High"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/models/crm_lead.py:205
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:201
 #, python-format
 msgid "I am not interested by this lead. I contacted the lead."
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/models/crm_lead.py:207
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:203
 #, python-format
 msgid "I am not interested by this lead. I have not contacted the lead."
 msgstr ""
@@ -531,16 +533,19 @@ msgstr ""
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_partner_ids
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_implemented_partner_ids
 msgid "Implementation References"
 msgstr ""
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_count
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_implemented_count
 msgid "Implemented Count"
 msgstr ""
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_assigned_partner_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_assigned_partner_id
 msgid "Implemented by"
 msgstr ""
 
@@ -583,6 +588,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_date_review
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_review
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_date_review
 msgid "Latest Partner Review"
 msgstr ""
 
@@ -624,17 +630,13 @@ msgid "Lead/Opportunity"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
-msgid "Leads"
-msgstr ""
-
-#. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
 msgid "Leads Analysis"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_10215
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_10691
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_grade_id
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
 msgid "Level"
 msgstr ""
@@ -647,6 +649,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_partner_weight
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_partner_weight
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_partner_weight
 msgid "Level Weight"
 msgstr ""
 
@@ -656,7 +659,7 @@ msgid "Looking For a Local Store?"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:103
+#: code:addons/website_crm_partner_assign/controllers/main.py:105
 #, python-format
 msgid "Lost"
 msgstr ""
@@ -688,18 +691,22 @@ msgid "My Assigned Partners"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
 msgid "My Leads"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "My Opportunities"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:50
-#: code:addons/website_crm_partner_assign/controllers/main.py:107
+#: code:addons/website_crm_partner_assign/controllers/main.py:52
+#: code:addons/website_crm_partner_assign/controllers/main.py:109
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_name
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
@@ -713,8 +720,8 @@ msgid "New Opportunity"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:49
-#: code:addons/website_crm_partner_assign/controllers/main.py:106
+#: code:addons/website_crm_partner_assign/controllers/main.py:51
+#: code:addons/website_crm_partner_assign/controllers/main.py:108
 #, python-format
 msgid "Newest"
 msgstr ""
@@ -731,6 +738,7 @@ msgstr ""
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_review_next
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_date_review_next
 msgid "Next Partner Review"
 msgstr ""
 
@@ -775,11 +783,6 @@ msgid "Opp. Assignment Analysis"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
-msgid "Opportunities"
-msgstr ""
-
-#. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_graph
 msgid "Opportunities Assignment Analysis"
 msgstr ""
@@ -800,7 +803,7 @@ msgid "Our Partners"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:101
+#: code:addons/website_crm_partner_assign/controllers/main.py:103
 #, python-format
 msgid "Overdue Activities"
 msgstr ""
@@ -881,6 +884,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_date_partnership
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_partnership
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_date_partnership
 msgid "Partnership Date"
 msgstr ""
 
@@ -911,7 +915,7 @@ msgid "Priority:"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:110
+#: code:addons/website_crm_partner_assign/controllers/main.py:112
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 #, python-format
 msgid "Probability"
@@ -934,6 +938,7 @@ msgid "References"
 msgstr ""
 
 #. module: website_crm_partner_assign
+#: model:ir.ui.menu,name:website_crm_partner_assign.crm_menu_resellers
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.footer_custom
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.layout
 msgid "Resellers"
@@ -979,7 +984,8 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_sequence
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence
-#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence_10218
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence_10692
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_grade_sequence
 msgid "Sequence"
 msgstr ""
 
@@ -1001,7 +1007,7 @@ msgid "Spam"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:111
+#: code:addons/website_crm_partner_assign/controllers/main.py:113
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 #, python-format
 msgid "Stage"
@@ -1035,16 +1041,6 @@ msgid "The Forward Email Template is not in the database"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
-msgid "There are currently no leads."
-msgstr ""
-
-#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
-msgid "There are currently no opportunities."
-msgstr ""
-
-#. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
 msgid "There are no leads."
 msgstr ""
@@ -1055,7 +1051,7 @@ msgid "There are no opportunities."
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:99
+#: code:addons/website_crm_partner_assign/controllers/main.py:101
 #, python-format
 msgid "This Week Activities"
 msgstr ""
@@ -1071,7 +1067,7 @@ msgid "Title"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:98
+#: code:addons/website_crm_partner_assign/controllers/main.py:100
 #, python-format
 msgid "Today Activities"
 msgstr ""
@@ -1118,7 +1114,7 @@ msgid "Why aren't you interested by this lead?"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:102
+#: code:addons/website_crm_partner_assign/controllers/main.py:104
 #, python-format
 msgid "Won"
 msgstr ""
@@ -1134,18 +1130,6 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
-msgid "Your Leads"
-msgstr ""
-
-#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
-msgid "Your Opportunities"
-msgstr ""
-
-#. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "ZIP"
 msgstr ""
diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot
index 3dcdc820bfa..1590d98949b 100644
--- a/addons/website_customer/i18n/website_customer.pot
+++ b/addons/website_customer/i18n/website_customer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 6d9a61c6836..a143759decd 100644
--- a/addons/website_event/i18n/website_event.pot
+++ b/addons/website_event/i18n/website_event.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:05+0000\n"
-"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -160,7 +160,7 @@ msgid "All Events"
 msgstr ""
 
 #. module: website_event
-#: model:ir.ui.view,arch_db:website_event.event_config_settings_view_form_inherit_website
+#: model:ir.ui.view,arch_db:website_event.res_config_settings_view_form
 msgid "Ask questions to attendees when registering online"
 msgstr ""
 
@@ -342,8 +342,8 @@ msgid "Find out what people see and say about this event,\n"
 msgstr ""
 
 #. module: website_event
-#: code:addons/website_event/models/event.py:63
-#: code:addons/website_event/models/event.py:70
+#: code:addons/website_event/models/event.py:54
+#: code:addons/website_event/models/event.py:61
 #, python-format
 msgid "Introduction"
 msgstr ""
@@ -354,8 +354,8 @@ msgid "Is Participating"
 msgstr ""
 
 #. module: website_event
-#: code:addons/website_event/models/event.py:63
-#: code:addons/website_event/models/event.py:71
+#: code:addons/website_event/models/event.py:54
+#: code:addons/website_event/models/event.py:62
 #, python-format
 msgid "Location"
 msgstr ""
@@ -372,8 +372,8 @@ msgstr ""
 
 #. module: website_event
 #. openerp-web
-#: code:addons/website_event/controllers/main.py:182
-#: code:addons/website_event/static/src/js/website_event.editor.js:14
+#: code:addons/website_event/controllers/main.py:183
+#: code:addons/website_event/static/src/js/website_event.editor.js:29
 #: model:ir.ui.view,arch_db:website_event.content_new_event
 #, python-format
 msgid "New Event"
@@ -467,7 +467,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: website_event
-#: model:ir.ui.view,arch_db:website_event.event_config_settings_view_form_inherit_website
+#: model:ir.ui.view,arch_db:website_event.res_config_settings_view_form
 msgid "Questions"
 msgstr ""
 
@@ -477,8 +477,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: website_event
+#: code:addons/website_event/models/event.py:54
 #: code:addons/website_event/models/event.py:63
-#: code:addons/website_event/models/event.py:72
 #, python-format
 msgid "Register"
 msgstr ""
@@ -489,6 +489,11 @@ msgid "Register Now"
 msgstr ""
 
 #. module: website_event
+#: model:ir.ui.view,arch_db:website_event.event_description_full
+msgid "Registration for this event is now closed"
+msgstr ""
+
+#. module: website_event
 #: model:ir.ui.view,arch_db:website_event.404
 msgid "Return to the event list."
 msgstr ""
@@ -567,16 +572,6 @@ msgid "Website Menu"
 msgstr ""
 
 #. module: website_event
-#: model:ir.model.fields,field_description:website_event.field_event_event_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_event
-#: model:ir.model.fields,help:website_event.field_event_event_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
 msgid "When"
 msgstr ""
diff --git a/addons/website_event_questions/i18n/website_event_questions.pot b/addons/website_event_questions/i18n/website_event_questions.pot
index 4eb8efddf67..e525f07cd3f 100644
--- a/addons/website_event_questions/i18n/website_event_questions.pot
+++ b/addons/website_event_questions/i18n/website_event_questions.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #. module: website_event_questions
 #: model:ir.ui.view,arch_db:website_event_questions.registration_attendee_details_questions
-msgid "<strong>Common Questions</strong>"
+msgid "<strong>Questions</strong>"
 msgstr ""
 
 #. module: website_event_questions
@@ -149,7 +149,7 @@ msgid "Question"
 msgstr ""
 
 #. module: website_event_questions
-#: code:addons/website_event_questions/models/event.py:82
+#: code:addons/website_event_questions/models/event.py:78
 #, python-format
 msgid "Question should belong to either event category or event but not both"
 msgstr ""
diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot
index adbce54b79a..6f74fc0d025 100644
--- a/addons/website_event_sale/i18n/website_event_sale.pot
+++ b/addons/website_event_sale/i18n/website_event_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,32 +31,17 @@ msgid "<span>left</span>"
 msgstr ""
 
 #. module: website_event_sale
-#: model:ir.model.fields,field_description:website_event_sale.field_product_product_intrastat_id
-msgid "Intrastat code"
-msgstr ""
-
-#. module: website_event_sale
 #: model:ir.ui.view,arch_db:website_event_sale.index
 msgid "Only"
 msgstr ""
 
 #. module: website_event_sale
-#: model:ir.ui.view,arch_db:website_event_sale.registration_template
-msgid "Order Now"
-msgstr ""
-
-#. module: website_event_sale
 #: model:ir.model,name:website_event_sale.model_product_product
 msgid "Product"
 msgstr ""
 
 #. module: website_event_sale
-#: model:ir.ui.view,arch_db:website_event_sale.registration_template
-msgid "Register Now"
-msgstr ""
-
-#. module: website_event_sale
-#: code:addons/website_event_sale/controllers/main.py:65
+#: code:addons/website_event_sale/controllers/main.py:56
 #, python-format
 msgid "Registration"
 msgstr ""
@@ -73,7 +58,6 @@ msgstr ""
 
 #. module: website_event_sale
 #: model:ir.ui.view,arch_db:website_event_sale.index
-#: model:ir.ui.view,arch_db:website_event_sale.registration_template
 msgid "Sold Out"
 msgstr ""
 
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index 2cd7f9e24e9..8cc084d30e3 100644
--- a/addons/website_event_track/i18n/website_event_track.pot
+++ b/addons/website_event_track/i18n/website_event_track.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_event_track
-#: model:mail.template,body_html:website_event_track.mail_template_data_track_confirmation
-msgid "<?xml version=\"1.0\"?>\n"
-"<div>\n"
-"    <p>\n"
-"        Dear <t t-esc=\"object.partner_name\"/>\n"
-"    </p><p>\n"
-"        We are pleased to inform you that your proposal ${object.name} has been accepted and confirmed for the event ${object.event_id.name}.\n"
-"    </p><p>\n"
-"        You will find more details here:\n"
-"        <div style=\"margin-top: 16px;\">\n"
-"            <a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\">\n"
-"                View Event\n"
-"            </a>\n"
-"        </div>\n"
-"    </p>\n"
-"    <p>Sincerely,</p>\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
 msgid "<b>Date</b><br/>"
 msgstr ""
@@ -124,7 +103,8 @@ msgid "Active"
 msgstr ""
 
 #. module: website_event_track
-#: code:addons/website_event_track/models/event.py:89
+#: code:addons/website_event_track/models/event.py:95
+#: code:addons/website_event_track/models/event.py:104
 #, python-format
 msgid "Agenda"
 msgstr ""
@@ -370,6 +350,11 @@ msgid "Folded in Kanban"
 msgstr ""
 
 #. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
+msgid "Future Activities"
+msgstr ""
+
+#. module: website_event_track
 #: model:event.sponsor.type,name:website_event_track.event_sponsor_type3
 msgid "Gold"
 msgstr ""
@@ -460,6 +445,11 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
+msgid "Late Activities"
+msgstr ""
+
+#. module: website_event_track
 #: model:ir.ui.menu,name:website_event_track.menu_event_track_location
 msgid "Locations"
 msgstr ""
@@ -516,11 +506,6 @@ msgid "Our Sponsors"
 msgstr ""
 
 #. module: website_event_track
-#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
-msgid "Overdue Activities"
-msgstr ""
-
-#. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
 msgid "Practical Info"
 msgstr ""
@@ -579,7 +564,7 @@ msgid "Responsible"
 msgstr ""
 
 #. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_9002
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_10881
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_name
 msgid "Room"
 msgstr ""
@@ -618,7 +603,7 @@ msgid "Speaker Biography"
 msgstr ""
 
 #. module: website_event_track
-#: code:addons/website_event_track/models/event_track.py:160
+#: code:addons/website_event_track/models/event_track.py:159
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email
 #, python-format
 msgid "Speaker Email"
@@ -635,7 +620,7 @@ msgid "Speaker Phone"
 msgstr ""
 
 #. module: website_event_track
-#: code:addons/website_event_track/models/event_track.py:166
+#: code:addons/website_event_track/models/event_track.py:179
 #, python-format
 msgid "Speakers"
 msgstr ""
@@ -673,7 +658,7 @@ msgid "Sponsors"
 msgstr ""
 
 #. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_id_9024
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_id_10876
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
 msgid "Stage"
 msgstr ""
@@ -716,7 +701,8 @@ msgstr ""
 
 #. module: website_event_track
 #: code:addons/website_event_track/models/event.py:62
-#: code:addons/website_event_track/models/event.py:91
+#: code:addons/website_event_track/models/event.py:95
+#: code:addons/website_event_track/models/event.py:106
 #, python-format
 msgid "Talk Proposals"
 msgstr ""
@@ -728,7 +714,8 @@ msgstr ""
 
 #. module: website_event_track
 #: code:addons/website_event_track/models/event.py:56
-#: code:addons/website_event_track/models/event.py:88
+#: code:addons/website_event_track/models/event.py:95
+#: code:addons/website_event_track/models/event.py:103
 #, python-format
 msgid "Talks"
 msgstr ""
@@ -810,12 +797,6 @@ msgid "Track Ready for Next Stage"
 msgstr ""
 
 #. module: website_event_track
-#: code:addons/website_event_track/models/event_track.py:53
-#, python-format
-msgid "Track Speakers"
-msgstr ""
-
-#. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_stage
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_form
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search
@@ -883,11 +864,6 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: website_event_track
-#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
-msgid "Upcoming Activities (7 days)"
-msgstr ""
-
-#. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_social
 msgid "Use this tag:"
 msgstr ""
@@ -934,6 +910,11 @@ msgid "Your Phone"
 msgstr ""
 
 #. module: website_event_track
+#: model:mail.template,body_html:website_event_track.mail_template_data_track_confirmation
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c6469763e0a202020203c703e0a202020202020202044656172203c7420742d6573633d226f626a6563742e706172746e65725f6e616d65222f3e0a202020203c2f703e3c703e0a202020202020202057652061726520706c656173656420746f20696e666f726d20796f75207468617420796f75722070726f706f73616c20247b6f626a6563742e6e616d657d20686173206265656e20616363657074656420616e6420636f6e6669726d656420666f7220746865206576656e7420247b6f626a6563742e6576656e745f69642e6e616d657d2e0a202020203c2f703e3c703e0a2020202020202020596f752077696c6c2066696e64206d6f72652064657461696c7320686572653a0a20202020202020203c646976207374796c653d226d617267696e2d746f703a20313670783b223e0a2020202020202020202020203c6120687265663d222f6576656e742f247b6f626a6563742e6576656e745f69642e69647d2f22207374796c653d2270616464696e673a2038707820313270783b20666f6e742d73697a653a20313270783b20636f6c6f723a20234646464646463b20746578742d6465636f726174696f6e3a206e6f6e652021696d706f7274616e743b20666f6e742d7765696768743a203430303b206261636b67726f756e642d636f6c6f723a20233837354137423b20626f726465723a2030707820736f6c696420233837354137423b20626f726465722d7261646975733a337078223e0a2020202020202020202020202020202056696577204576656e740a2020202020202020202020203c2f613e0a20202020202020203c2f6469763e0a202020203c2f703e0a202020203c703e53696e636572656c792c3c2f703e0a3c2f6469763e0a202020202020202020202020"
+msgstr ""
+
+#. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_form
 msgid "e.g. Inspiring Business Talk"
 msgstr ""
diff --git a/addons/website_form/i18n/website_form.pot b/addons/website_form/i18n/website_form.pot
index 6ecc12adfbc..3b198b5121e 100644
--- a/addons/website_form/i18n/website_form.pot
+++ b/addons/website_form/i18n/website_form.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,20 +17,20 @@ msgstr ""
 
 #. module: website_form
 #. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:209
+#: code:addons/website_form/static/src/js/website_form.js:226
 #, python-format
 msgid "'%s' is not a correct date"
 msgstr ""
 
 #. module: website_form
 #. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:204
+#: code:addons/website_form/static/src/js/website_form.js:221
 #, python-format
 msgid "'%s' is not a correct datetime"
 msgstr ""
 
 #. module: website_form
-#: code:addons/website_form/controllers/main.py:225
+#: code:addons/website_form/controllers/main.py:226
 #, python-format
 msgid "<p>Attached files : </p>"
 msgstr ""
@@ -58,7 +58,7 @@ msgid "Blacklisted in web forms"
 msgstr ""
 
 #. module: website_form
-#: code:addons/website_form/controllers/main.py:53
+#: code:addons/website_form/controllers/main.py:54
 #, python-format
 msgid "Custom infos"
 msgstr ""
@@ -94,7 +94,7 @@ msgid "Label for form action"
 msgstr ""
 
 #. module: website_form
-#: code:addons/website_form/controllers/main.py:54
+#: code:addons/website_form/controllers/main.py:55
 #, python-format
 msgid "Metadata"
 msgstr ""
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index 75bdf73ced2..ba9d4eef535 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -58,17 +58,12 @@ msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:21
+#: code:addons/website_forum/static/src/js/website_forum.js:24
 #, python-format
 msgid " karma is required to perform this action. You can earn karma by having your answers upvoted by the community."
 msgstr ""
 
 #. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_res_users_task_count
-msgid "# Tasks"
-msgstr ""
-
-#. module: website_forum
 #: model:mail.template,subject:website_forum.validation_email
 msgid "${object.company_id.name} Forums validation"
 msgstr ""
@@ -385,7 +380,7 @@ msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.editor.js:25
+#: code:addons/website_forum/static/src/js/website_forum.editor.js:43
 #, python-format
 msgid "Add page in menu"
 msgstr ""
@@ -396,7 +391,7 @@ msgid "After posting the user will be proposed to share its question or answer o
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/controllers/main.py:188
+#: code:addons/website_forum/controllers/main.py:187
 #: model:ir.ui.view,arch_db:website_forum.forum_index
 #, python-format
 msgid "All"
@@ -413,7 +408,7 @@ msgid "Answer"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:504
+#: code:addons/website_forum/models/forum.py:501
 #: model:mail.message.subtype,description:website_forum.mt_answer_edit
 #: model:mail.message.subtype,name:website_forum.mt_answer_edit
 #, python-format
@@ -597,14 +592,13 @@ msgid "Back to"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/controllers/main.py:323
-#: code:addons/website_forum/controllers/main.py:394
+#: code:addons/website_forum/controllers/main.py:324
+#: code:addons/website_forum/controllers/main.py:395
 #, python-format
 msgid "Bad Request"
 msgstr ""
 
 #. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_res_users_badge_ids
 #: model:ir.ui.view,arch_db:website_forum.badge
 #: model:ir.ui.view,arch_db:website_forum.header
 #: model:ir.ui.view,arch_db:website_forum.user_detail_full
@@ -863,11 +857,6 @@ msgid "Comments"
 msgstr ""
 
 #. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_post_website_message_ids
-msgid "Comments on forum post"
-msgstr ""
-
-#. module: website_forum
 #: model:gamification.challenge,name:website_forum.challenge_configure_profile
 msgid "Complete own biography"
 msgstr ""
@@ -1670,7 +1659,7 @@ msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.editor.js:14
+#: code:addons/website_forum/static/src/js/website_forum.editor.js:32
 #: model:ir.ui.view,arch_db:website_forum.content_new_forum
 #, python-format
 msgid "New Forum"
@@ -1719,20 +1708,20 @@ msgid "Nofollow links"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:872
-#: code:addons/website_forum/models/forum.py:892
+#: code:addons/website_forum/models/forum.py:870
+#: code:addons/website_forum/models/forum.py:890
 #, python-format
 msgid "Not allowed to vote for its own post"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:936
+#: code:addons/website_forum/models/forum.py:934
 #, python-format
 msgid "Not enough karma to create a new Tag"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:494
+#: code:addons/website_forum/models/forum.py:491
 #, python-format
 msgid "Not enough karma to retag."
 msgstr ""
@@ -1865,7 +1854,6 @@ msgstr ""
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_post_id
-#: model:ir.ui.view,arch_db:website_forum.close_post
 #: model:ir.ui.view,arch_db:website_forum.new_link
 #: model:ir.ui.view,arch_db:website_forum.post_comment
 #: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
@@ -1890,11 +1878,6 @@ msgid "Post Comment"
 msgstr ""
 
 #. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_website_message_ids
-msgid "Post Messages"
-msgstr ""
-
-#. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.new_link
 msgid "Post Title"
 msgstr ""
@@ -1930,7 +1913,7 @@ msgid "Posted 100 comments"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:438
+#: code:addons/website_forum/models/forum.py:435
 #, python-format
 msgid "Posting answer on a [Deleted] or [Closed] question is not possible"
 msgstr ""
@@ -1987,7 +1970,7 @@ msgid "Question"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:507
+#: code:addons/website_forum/models/forum.py:504
 #: model:mail.message.subtype,description:website_forum.mt_question_edit
 #: model:mail.message.subtype,name:website_forum.mt_question_edit
 #, python-format
@@ -2058,7 +2041,7 @@ msgid "Questions"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:525
+#: code:addons/website_forum/models/forum.py:522
 #, python-format
 msgid "Re: %s"
 msgstr ""
@@ -2237,28 +2220,28 @@ msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:23
+#: code:addons/website_forum/static/src/js/website_forum.js:26
 #, python-format
 msgid "Sorry you must be logged in to perform this action"
 msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:97
+#: code:addons/website_forum/static/src/js/website_forum.js:100
 #, python-format
 msgid "Sorry you must be logged to flag a post"
 msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:145
+#: code:addons/website_forum/static/src/js/website_forum.js:149
 #, python-format
 msgid "Sorry you must be logged to vote"
 msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:195
+#: code:addons/website_forum/static/src/js/website_forum.js:199
 #, python-format
 msgid "Sorry, anonymous users cannot choose correct answer."
 msgstr ""
@@ -2270,7 +2253,7 @@ msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:140
+#: code:addons/website_forum/static/src/js/website_forum.js:144
 #, python-format
 msgid "Sorry, you cannot vote for your own posts"
 msgstr ""
@@ -2343,11 +2326,6 @@ msgid "Tags"
 msgstr ""
 
 #. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_res_users_task_ids
-msgid "Tasks"
-msgstr ""
-
-#. module: website_forum
 #: model:gamification.badge,name:website_forum.badge_32
 #: model:gamification.challenge,name:website_forum.challenge_taxonomist
 #: model:gamification.challenge.line,name:website_forum.line_taxonomist
@@ -2426,21 +2404,21 @@ msgid "This formula is used in order to sort by relevance. The variable 'votes'
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:414
+#: code:addons/website_forum/models/forum.py:411
 #, python-format
 msgid "This forum does not allow %s"
 msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:107
+#: code:addons/website_forum/static/src/js/website_forum.js:110
 #, python-format
 msgid "This post can not be flagged"
 msgstr ""
 
 #. module: website_forum
 #. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:102
+#: code:addons/website_forum/static/src/js/website_forum.js:105
 #, python-format
 msgid "This post is already flagged"
 msgstr ""
@@ -2472,8 +2450,8 @@ msgid "Title must not be empty"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/controllers/main.py:323
-#: code:addons/website_forum/controllers/main.py:394
+#: code:addons/website_forum/controllers/main.py:324
+#: code:addons/website_forum/controllers/main.py:395
 #, python-format
 msgid "Title should not be empty."
 msgstr ""
@@ -2647,6 +2625,16 @@ msgid "Website"
 msgstr ""
 
 #. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_post_website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_post_website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_welcome_message
 msgid "Welcome Message"
 msgstr ""
@@ -2691,7 +2679,7 @@ msgid "You already have one pending post.<br/>\n"
 msgstr ""
 
 #. module: website_forum
-#: code:addons/website_forum/models/forum.py:139
+#: code:addons/website_forum/models/forum.py:140
 #, python-format
 msgid "You cannot choose %s as default post since the forum does not allow it."
 msgstr ""
diff --git a/addons/website_forum_doc/i18n/website_forum_doc.pot b/addons/website_forum_doc/i18n/website_forum_doc.pot
index 4ab79549fa5..7fbefa12cc4 100644
--- a/addons/website_forum_doc/i18n/website_forum_doc.pot
+++ b/addons/website_forum_doc/i18n/website_forum_doc.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_gengo/i18n/website_gengo.pot b/addons/website_gengo/i18n/website_gengo.pot
index ed0aedd41de..17b8004eee3 100644
--- a/addons/website_gengo/i18n/website_gengo.pot
+++ b/addons/website_gengo/i18n/website_gengo.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -100,6 +100,20 @@ msgstr ""
 
 #. module: website_gengo
 #. openerp-web
+#: code:addons/website_gengo/static/src/js/website_gengo.js:88
+#, python-format
+msgid "Could not Post translation"
+msgstr ""
+
+#. module: website_gengo
+#. openerp-web
+#: code:addons/website_gengo/static/src/js/website_gengo.js:195
+#, python-format
+msgid "Could not submit ! Try Again"
+msgstr ""
+
+#. module: website_gengo
+#. openerp-web
 #: code:addons/website_gengo/static/src/xml/website.gengo.xml:7
 #, python-format
 msgid "Count Words"
diff --git a/addons/website_hr/i18n/website_hr.pot b/addons/website_hr/i18n/website_hr.pot
index be64ebbdd91..4a1fa1273a8 100644
--- a/addons/website_hr/i18n/website_hr.pot
+++ b/addons/website_hr/i18n/website_hr.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index e4dfe644f77..5fb4885ecbc 100644
--- a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
+++ b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -88,15 +88,12 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "<span>\n"
-"                                We usually reply between one and three days.<br/>\n"
-"                                Feel free to contact him/her if you have further questions.\n"
-"                            </span>"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
-msgid "<span>In the meantime</span>"
+"                                            We usually reply between one and three days.<br/>\n"
+"                                            Feel free to contact him/her if you have further questions.\n"
+"                                        </span>"
 msgstr ""
 
 #. module: website_hr_recruitment
@@ -181,6 +178,8 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Congratulations!"
 msgstr ""
 
@@ -191,6 +190,8 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Continue To Our Website"
 msgstr ""
 
@@ -230,6 +231,13 @@ msgid "High commissions for good performers"
 msgstr ""
 
 #. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
+msgid "In the meantime,"
+msgstr ""
+
+#. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
 msgid "Job Application Form"
 msgstr ""
@@ -287,7 +295,9 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
-msgid "Look around on our website."
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
+msgid "Look around on our website:"
 msgstr ""
 
 #. module: website_hr_recruitment
@@ -441,7 +451,7 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Vacation, Sick, and Holiday paid leaves"
+msgid "Vacation, Sick, and paid leaves"
 msgstr ""
 
 #. module: website_hr_recruitment
@@ -486,6 +496,15 @@ msgstr ""
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
+msgid "Your application has been posted successfully."
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
+#: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Your application has been sent to:"
 msgstr ""
 
diff --git a/addons/website_links/i18n/website_links.pot b/addons/website_links/i18n/website_links.pot
index c262fd26d08..79767456167 100644
--- a/addons/website_links/i18n/website_links.pot
+++ b/addons/website_links/i18n/website_links.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,27 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/js/website_links_charts.js:53
+#, python-format
+msgid " clicks"
+msgstr ""
+
+#. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/js/website_links_charts.js:104
+#, python-format
+msgid " countries"
+msgstr ""
+
+#. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/js/website_links_charts.js:57
+#, python-format
+msgid "# of clicks"
+msgstr ""
+
+#. module: website_links
 #: model:ir.ui.view,arch_db:website_links.share_page_menu
 msgid "<span title=\"Track this page to count clicks\">Track this Page</span>"
 msgstr ""
@@ -69,7 +90,7 @@ msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:350
+#: code:addons/website_links/static/src/js/website_links.js:358
 #, python-format
 msgid "Generating link..."
 msgstr ""
@@ -138,6 +159,15 @@ msgid "Stats"
 msgstr ""
 
 #. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/js/website_links_charts.js:229
+#: code:addons/website_links/static/src/js/website_links_charts.js:230
+#: code:addons/website_links/static/src/js/website_links_charts.js:231
+#, python-format
+msgid "There is no data to show"
+msgstr ""
+
+#. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
 msgid "Those trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues."
 msgstr ""
@@ -149,14 +179,21 @@ msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:216
+#: code:addons/website_links/static/src/js/website_links.js:225
 #, python-format
 msgid "Unable to get recent links"
 msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:239
+#: code:addons/website_links/static/src/js/website_links_charts.js:99
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/js/website_links.js:248
 #, python-format
 msgid "You don't have any recent links."
 msgstr ""
@@ -188,21 +225,21 @@ msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:259
+#: code:addons/website_links/static/src/js/website_links.js:268
 #, python-format
 msgid "e.g. Newsletter, Social Network, .."
 msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:256
+#: code:addons/website_links/static/src/js/website_links.js:265
 #, python-format
 msgid "e.g. Promotion of June, Winter Newsletter, .."
 msgstr ""
 
 #. module: website_links
 #. openerp-web
-#: code:addons/website_links/static/src/js/website_links.js:262
+#: code:addons/website_links/static/src/js/website_links.js:271
 #, python-format
 msgid "e.g. Search Engine, Website page, .."
 msgstr ""
diff --git a/addons/website_livechat/i18n/website_livechat.pot b/addons/website_livechat/i18n/website_livechat.pot
index ff790d2df2f..53ef4592f69 100644
--- a/addons/website_livechat/i18n/website_livechat.pot
+++ b/addons/website_livechat/i18n/website_livechat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "<span>Livechat Channel</span>"
 msgstr ""
 
 #. module: website_livechat
-#: model:ir.ui.view,arch_db:website_livechat.website_config_settings_view_form_inherit_website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
 msgid "Channel"
 msgstr ""
 
@@ -31,6 +31,16 @@ msgid "Description of the channel displayed on the website page"
 msgstr ""
 
 #. module: website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
+msgid "Live Chat"
+msgstr ""
+
+#. module: website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
+msgid "Live chat channel of your website"
+msgstr ""
+
+#. module: website_livechat
 #: model:ir.model,name:website_livechat.model_im_livechat_channel
 msgid "Livechat Channel"
 msgstr ""
@@ -76,7 +86,7 @@ msgid "Website"
 msgstr ""
 
 #. module: website_livechat
-#: model:ir.model.fields,field_description:website_livechat.field_website_config_settings_channel_id
+#: model:ir.model.fields,field_description:website_livechat.field_res_config_settings_channel_id
 msgid "Website Live Channel"
 msgstr ""
 
@@ -96,7 +106,7 @@ msgid "last feedbacks"
 msgstr ""
 
 #. module: website_livechat
-#: model:ir.model,name:website_livechat.model_website_config_settings
-msgid "website.config.settings"
+#: model:ir.model,name:website_livechat.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot
index efae5114db5..d582a74f5e8 100644
--- a/addons/website_mail/i18n/website_mail.pot
+++ b/addons/website_mail/i18n/website_mail.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -114,6 +114,7 @@ msgstr ""
 
 #. module: website_mail
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
+#: model:ir.model.fields,field_description:website_mail.field_mail_mail_description
 #: model:ir.model.fields,field_description:website_mail.field_mail_message_description
 #: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message_description
 msgid "Description"
@@ -125,40 +126,30 @@ msgid "Discussion Group"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "Leave a comment"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_mail_message
 msgid "Message"
 msgstr ""
 
 #. module: website_mail
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message_description
+#: model:ir.model.fields,help:website_mail.field_mail_mail_description
 #: model:ir.model.fields,help:website_mail.field_mail_message_description
 #: model:ir.model.fields,help:website_mail.field_survey_mail_compose_message_description
 msgid "Message description: either the subject, or the beginning of the body"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "Oops! Something went wrong. Try to reload the page and to log in."
-msgstr ""
-
-#. module: website_mail
+#. openerp-web
+#: code:addons/website_mail/static/src/xml/website_mail.xml:7
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_website_published
+#: model:ir.model.fields,field_description:website_mail.field_mail_mail_website_published
 #: model:ir.model.fields,field_description:website_mail.field_mail_message_website_published
 #: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message_website_published
+#, python-format
 msgid "Published"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "Send"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.ui.view,arch_db:website_mail.follow
 msgid "Subscribe"
 msgstr ""
@@ -172,60 +163,36 @@ msgid "The requested operation cannot be completed due to security restrictions.
 msgstr ""
 
 #. module: website_mail
+#. openerp-web
+#: code:addons/website_mail/static/src/xml/website_mail.xml:6
+#, python-format
+msgid "Unpublished"
+msgstr ""
+
+#. module: website_mail
 #: model:ir.ui.view,arch_db:website_mail.follow
 msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail
 #: model:ir.model.fields,help:website_mail.field_mail_compose_message_website_published
+#: model:ir.model.fields,help:website_mail.field_mail_mail_website_published
 #: model:ir.model.fields,help:website_mail.field_mail_message_website_published
 #: model:ir.model.fields,help:website_mail.field_survey_mail_compose_message_website_published
 msgid "Visible on the website as a comment"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "Write a message..."
-msgstr ""
-
-#. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "You must be"
-msgstr ""
-
-#. module: website_mail
 #: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
 msgid "Your business is reachable from anywhere, anytime !"
 msgstr ""
 
 #. module: website_mail
-#. openerp-web
-#: code:addons/website_mail/static/src/xml/chatter_message.xml:8
-#, python-format
-msgid "just now"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "logged in"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "on"
-msgstr ""
-
-#. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
 msgstr ""
 
 #. module: website_mail
-#: model:ir.ui.view,arch_db:website_mail.message_thread
-msgid "to post a comment."
-msgstr ""
-
-#. module: website_mail
 #: model:ir.ui.view,arch_db:website_mail.follow
 msgid "your email..."
 msgstr ""
diff --git a/addons/website_mail_channel/i18n/website_mail_channel.pot b/addons/website_mail_channel/i18n/website_mail_channel.pot
index d0fb563be75..9635cf18e44 100644
--- a/addons/website_mail_channel/i18n/website_mail_channel.pot
+++ b/addons/website_mail_channel/i18n/website_mail_channel.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,35 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
-msgstr ""
-
-#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
-msgstr ""
-
-#. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
 msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
 msgstr ""
 
 #. module: website_mail_channel
 #. openerp-web
-#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
 #, python-format
 msgid "Add a Subscribe Button"
 msgstr ""
@@ -82,23 +60,13 @@ msgid "Change Discussion List"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_description
-msgid "Description"
-msgstr ""
-
-#. module: website_mail_channel
 #. openerp-web
-#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
 #, python-format
 msgid "Discussion List"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_path
-msgid "Discussion Path"
-msgstr ""
-
-#. module: website_mail_channel
 #: model:ir.model,name:website_mail_channel.model_mail_channel
 msgid "Discussion channel"
 msgstr ""
@@ -131,11 +99,6 @@ msgid "Mailing-List"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_description
-msgid "Message description: either the subject, or the beginning of the body"
-msgstr ""
-
-#. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
 msgid "Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down pull-right\"/>"
 msgstr ""
@@ -162,11 +125,6 @@ msgid "Post to"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_website_published
-msgid "Published"
-msgstr ""
-
-#. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.group_message
 msgid "Reference"
 msgstr ""
@@ -190,18 +148,18 @@ msgid "Unsubscribe"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_path
-msgid "Used to display messages in a paragraph-based chatter using a unique path;"
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "You have been correctly"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.model.fields,help:website_mail_channel.field_mail_mail_website_published
-msgid "Visible on the website as a comment"
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c703e48656c6c6f2c3c2f703e0a3c703e596f7520686176652072657175657374656420746f206265207375627363726962656420746f20746865206d61696c696e67206c697374203c7374726f6e673e247b6f626a6563742e6e616d657d3c2f7374726f6e673e3c2f703e0a3c703e546f20636f6e6669726d2c20706c656173652076697369742074686520666f6c6c6f77696e67206c696e6b3a3c2f703e0a3c703e3c7374726f6e673e3c6120687265663d22247b6374785b27746f6b656e5f75726c275d7d223e247b6374785b27746f6b656e5f75726c275d7d3c2f613e3c2f7374726f6e673e3c2f703e0a3c703e49662074686973207761732061206d697374616b65206f7220796f7520646964206e6f7420726571756573746564207468697320616374696f6e2c20706c656173652069676e6f72652074686973206d6573736167652e3c2f703e0a3c2f646174613e"
 msgstr ""
 
 #. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
-msgid "You have been correctly"
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646174613e3c703e48656c6c6f2c3c2f703e0a3c703e596f7520686176652072657175657374656420746f20626520756e7375627363726962656420746f20746865206d61696c696e67206c697374203c7374726f6e673e247b6f626a6563742e6e616d657d3c2f7374726f6e673e3c2f703e0a3c703e546f20636f6e6669726d2c20706c656173652076697369742074686520666f6c6c6f77696e67206c696e6b3a3c2f703e0a3c703e3c7374726f6e673e3c6120687265663d22247b6374785b27746f6b656e5f75726c275d7d223e247b6374785b27746f6b656e5f75726c275d7d3c2f613e3c2f7374726f6e673e3c2f703e0a3c703e49662074686973207761732061206d697374616b65206f7220796f7520646964206e6f7420726571756573746564207468697320616374696f6e2c20706c656173652069676e6f72652074686973206d6573736167652e3c2f703e0a3c2f646174613e"
 msgstr ""
 
 #. module: website_mail_channel
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index ff076294ffe..150eddbbca8 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: website_mass_mailing
 #. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:49
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:53
 #, python-format
 msgid "Add a Newsletter Subscribe Popup"
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.inherited_view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:website_mass_mailing.res_config_settings_view_form
 msgid "Encourage to subscribe to mailing lists with a popup"
 msgstr ""
 
@@ -78,7 +78,7 @@ msgstr ""
 
 #. module: website_mass_mailing
 #. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:22
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:21
 #, python-format
 msgid "Newsletter"
 msgstr ""
@@ -105,13 +105,13 @@ msgid "Thanks for your subscription!"
 msgstr ""
 
 #. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.inherited_view_mass_mailing_configuration
+#: model:ir.ui.view,arch_db:website_mass_mailing.res_config_settings_view_form
 msgid "This adds a new Newsletter Popup snippet to drag & drop on on your website pages. It triggers a popup when visitors land on the page. This popup prompts them to enter their email address to join a mailing list."
 msgstr ""
 
 #. module: website_mass_mailing
 #. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:80
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:83
 #, python-format
 msgid "Type Here ..."
 msgstr ""
@@ -122,7 +122,7 @@ msgid "Use subscription pop up on the website"
 msgstr ""
 
 #. module: website_mass_mailing
-#: model:ir.model.fields,field_description:website_mass_mailing.field_mass_mailing_config_settings_group_website_popup_on_exit
+#: model:ir.model.fields,field_description:website_mass_mailing.field_res_config_settings_group_website_popup_on_exit
 msgid "Website Popup"
 msgstr ""
 
@@ -148,21 +148,21 @@ msgstr ""
 
 #. module: website_mass_mailing
 #. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:154
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:168
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
 
 #. module: website_mass_mailing
 #. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:157
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:171
 #, python-format
 msgid "Your changes have not been saved, try again later."
 msgstr ""
 
 #. module: website_mass_mailing
-#: model:ir.model,name:website_mass_mailing.model_mass_mailing_config_settings
-msgid "mass.mailing.config.settings"
+#: model:ir.model,name:website_mass_mailing.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: website_mass_mailing
diff --git a/addons/website_membership/i18n/website_membership.pot b/addons/website_membership/i18n/website_membership.pot
index ccbfa96c657..7cc90131370 100644
--- a/addons/website_membership/i18n/website_membership.pot
+++ b/addons/website_membership/i18n/website_membership.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot
index 0235f03c803..a1ceaa12d18 100644
--- a/addons/website_partner/i18n/website_partner.pot
+++ b/addons/website_partner/i18n/website_partner.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_payment/i18n/website_payment.pot b/addons/website_payment/i18n/website_payment.pot
index df5d7087456..9506da7a1e7 100644
--- a/addons/website_payment/i18n/website_payment.pot
+++ b/addons/website_payment/i18n/website_payment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,97 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-msgid "<i class=\"fa fa-arrow-circle-right\"/> Back to My Account"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "Acquirer"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "Add a new payment method:"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-#: model:ir.ui.view,arch_db:website_payment.pay
-msgid "Amount"
-msgstr ""
-
-#. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.website_settings_payment
 msgid "Configure payment acquirers"
 msgstr ""
 
 #. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "Delete <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "Delete a payment method:"
-msgstr ""
-
-#. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.website_settings_payment
 msgid "E-Commerce"
 msgstr ""
 
 #. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-msgid "From"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_meth_link
-msgid "Manage your payment methods"
-msgstr ""
-
-#. module: website_payment
-#: code:addons/website_payment/controllers/main.py:45
-#, python-format
-msgid "Pay Now"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-#: model:ir.ui.view,arch_db:website_payment.pay
-msgid "Payment"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.model,name:website_payment.model_payment_acquirer
-msgid "Payment Acquirer"
-msgstr ""
-
-#. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.header_footer_custom_payment
-msgid "Payment Method"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "Payment Methods"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-msgid "Payment processed by"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-#: model:ir.ui.view,arch_db:website_payment.pay
-msgid "Reference"
-msgstr ""
-
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay
-msgid "This transaction will be processed by"
+msgid "Payment Icons"
 msgstr ""
 
 #. module: website_payment
@@ -114,9 +35,3 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.confirm
-#: model:ir.ui.view,arch_db:website_payment.pay
-msgid "payment_provider_logo"
-msgstr ""
-
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 43c48ffdaeb..257b6f23779 100644
--- a/addons/website_quote/i18n/website_quote.pot
+++ b/addons/website_quote/i18n/website_quote.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -135,16 +135,6 @@ msgid "<i class=\"fa fa-times\"/> Reject"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.quotations
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.quotations
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "<span>, for an amount of </span>"
 msgstr ""
@@ -158,12 +148,7 @@ msgstr ""
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "<span>I agree that by signing this proposal, I\n"
-"                                  accept it on the behalf of </span>"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "<span>No payment gateway is available for your country</span>"
+"                                    accept it on the behalf of </span>"
 msgstr ""
 
 #. module: website_quote
@@ -177,11 +162,6 @@ msgid "<span>with payment terms: </span>"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.opt_quotation_signature
-msgid "<strong>Draw your signature</strong>"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
 msgid "<strong>Expiration Date:</strong>"
 msgstr ""
@@ -220,13 +200,13 @@ msgid "<strong>Total:</strong>"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,help:website_quote.field_delivery_carrier_website_description
-msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "About us"
 msgstr ""
 
 #. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "About us"
+#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_active
+msgid "Active"
 msgstr ""
 
 #. module: website_quote
@@ -245,6 +225,11 @@ msgid "Amount Before Discount"
 msgstr ""
 
 #. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_search
+msgid "Archived"
+msgstr ""
+
+#. module: website_quote
 #: model:sale.quote.template,website_description:website_quote.website_quote_template_default
 msgid "As a leading professional services firm,\n"
 "                                       we know that success is all about the\n"
@@ -277,8 +262,9 @@ msgid "Cancel"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.opt_quotation_signature
-msgid "Clear"
+#: model:ir.model.fields,help:website_quote.field_sale_order_require_payment
+#: model:ir.model.fields,help:website_quote.field_sale_quote_template_require_payment
+msgid "Choose how you want to confirm an order to launch the delivery process. You can either request a digital signature or an upfront payment. With a digital signature, you can request the payment when issuing the invoice."
 msgstr ""
 
 #. module: website_quote
@@ -287,11 +273,22 @@ msgid "Click here to create your template."
 msgstr ""
 
 #. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
+msgid "Confirmation"
+msgstr ""
+
+#. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_mail_template_id
 msgid "Confirmation Mail"
 msgstr ""
 
 #. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_sale_order_require_payment
+#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_require_payment
+msgid "Confirmation Mode"
+msgstr ""
+
+#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "Contact us"
 msgstr ""
@@ -318,6 +315,11 @@ msgid "Customer:"
 msgstr ""
 
 #. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_res_config_settings_default_template_id
+msgid "Default Template"
+msgstr ""
+
+#. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_order_option_name
 #: model:ir.model.fields,field_description:website_quote.field_sale_order_website_description
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_name
@@ -329,12 +331,6 @@ msgid "Description"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_delivery_carrier_website_description
-msgid "Description for Online Quotations"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_delivery_carrier_quote_description
 #: model:ir.model.fields,field_description:website_quote.field_product_product_quote_description
 #: model:ir.model.fields,field_description:website_quote.field_product_template_quote_description
 msgid "Description for the quote"
@@ -422,22 +418,15 @@ msgid "If edit a quotation from the 'Preview' of a quotation, you will\n"
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/controllers/main.py:80
-#: code:addons/website_quote/controllers/main.py:219
-#, python-format
-msgid "If we store your payment information on our server, subscription payments will be made automatically."
-msgstr ""
-
-#. module: website_quote
-#: selection:sale.order,require_payment:0
-#: selection:sale.quote.template,require_payment:0
-msgid "Immediate after website order validation"
+#: model:ir.model.fields,help:website_quote.field_sale_quote_template_active
+msgid "If unchecked, it will allow you to hide the quotation template without removing it."
 msgstr ""
 
 #. module: website_quote
-#: selection:sale.order,require_payment:0
-#: selection:sale.quote.template,require_payment:0
-msgid "Immediate after website order validation and save a token"
+#: code:addons/website_quote/controllers/main.py:110
+#: code:addons/website_quote/controllers/main.py:206
+#, python-format
+msgid "If we store your payment information on our server, subscription payments will be made automatically."
 msgstr ""
 
 #. module: website_quote
@@ -492,19 +481,20 @@ msgid "Lines"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "My Quotations"
+#: model:ir.model.fields,help:website_quote.field_sale_quote_template_number_of_days
+msgid "Number of days for the validity date computation of the quotation"
 msgstr ""
 
 #. module: website_quote
 #: selection:sale.order,require_payment:0
 #: selection:sale.quote.template,require_payment:0
-msgid "Not mandatory on website quote validation"
+msgid "Online Payment"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,help:website_quote.field_sale_quote_template_number_of_days
-msgid "Number of days for the validity date computation of the quotation"
+#: selection:sale.order,require_payment:0
+#: selection:sale.quote.template,require_payment:0
+msgid "Online Signature"
 msgstr ""
 
 #. module: website_quote
@@ -525,20 +515,15 @@ msgid "Optional Products Lines"
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/models/sale_order.py:195
+#: code:addons/website_quote/controllers/main.py:34
 #, python-format
-msgid "Order paid by %s. Transaction: %s. Amount: %s."
+msgid "Order is not in a state requiring customer validation."
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/controllers/main.py:96
+#: code:addons/website_quote/models/sale_order.py:205
 #, python-format
-msgid "Order signed by %s"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
-msgid "Other Settings"
+msgid "Order paid by %s. Transaction: %s. Amount: %s."
 msgstr ""
 
 #. module: website_quote
@@ -557,27 +542,19 @@ msgid "Our Service"
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/controllers/main.py:69
-#: code:addons/website_quote/controllers/main.py:212
+#: code:addons/website_quote/controllers/main.py:204
 #, python-format
 msgid "Pay & Confirm"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_sale_order_require_payment
-#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_require_payment
-msgid "Payment"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Payment Method:"
+msgid "Pay with"
 msgstr ""
 
 #. module: website_quote
 #: model:ir.ui.menu,name:website_quote.payment_acquirer_menu_sale
-#: model:ir.ui.view,arch_db:website_quote.sale_config_settings_view_form_inherit_website_quote
-msgid "Payment Methods"
+msgid "Payment Acquirers"
 msgstr ""
 
 #. module: website_quote
@@ -646,11 +623,6 @@ msgid "Quantity"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Quotation"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_number_of_days
 msgid "Quotation Duration"
 msgstr ""
@@ -682,7 +654,7 @@ msgstr ""
 #. module: website_quote
 #: model:ir.actions.act_window,name:website_quote.action_sale_quotation_template
 #: model:ir.ui.menu,name:website_quote.menu_sale_quote_template
-#: model:ir.ui.view,arch_db:website_quote.sale_config_settings_view_form_inherit_website_quote
+#: model:ir.ui.view,arch_db:website_quote.res_config_settings_view_form
 msgid "Quotation Templates"
 msgstr ""
 
@@ -692,7 +664,12 @@ msgid "Quotation Viewed"
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/controllers/main.py:29
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
+msgid "Quotation expires after"
+msgstr ""
+
+#. module: website_quote
+#: code:addons/website_quote/controllers/main.py:57
 #, python-format
 msgid "Quotation viewed by customer"
 msgstr ""
@@ -713,12 +690,6 @@ msgid "Reject This Quote"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,help:website_quote.field_sale_order_require_payment
-#: model:ir.model.fields,help:website_quote.field_sale_quote_template_require_payment
-msgid "Require immediate payment by the customer when validating the order from the website quote"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.model,name:website_quote.model_sale_order_option
 msgid "Sale Options"
 msgstr ""
@@ -752,6 +723,11 @@ msgid "Sales Quotation Template Lines"
 msgstr ""
 
 #. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_search
+msgid "Search Quotation Template"
+msgstr ""
+
+#. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_order_option_layout_category_id
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_layout_category_id
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_layout_category_id
@@ -759,11 +735,6 @@ msgid "Section"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_sale_order_access_token
-msgid "Security Token"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_order_option_sequence
 #: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_sequence
 msgid "Sequence"
@@ -775,11 +746,6 @@ msgid "Ship To:"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Sign &amp; Confirm"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.optional_products
 #: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
 #: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
@@ -814,7 +780,7 @@ msgstr ""
 
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
-msgid "These Terms & Conditions will replace the default ones set in the Configuration menu."
+msgid "The Administrator can set default Terms & Conditions in Sales Settings. Terms set here will show up instead if you select this quotation template."
 msgstr ""
 
 #. module: website_quote
@@ -894,7 +860,7 @@ msgid "We always ensure that our products are\n"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.actions.report.xml,name:website_quote.report_web_quote
+#: model:ir.actions.report,name:website_quote.report_web_quote
 msgid "Web Quotation"
 msgstr ""
 
@@ -913,7 +879,7 @@ msgid "You can <strong>set a description per product</strong>. Odoo will\n"
 msgstr ""
 
 #. module: website_quote
-#: code:addons/website_quote/controllers/main.py:140
+#: code:addons/website_quote/controllers/main.py:157
 #, python-format
 msgid "You cannot add options to a confirmed order."
 msgstr ""
@@ -924,11 +890,6 @@ msgid "Your Contact:"
 msgstr ""
 
 #. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Your Name:"
-msgstr ""
-
-#. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation_content
 msgid "Your Order"
 msgstr ""
@@ -1020,3 +981,8 @@ msgstr ""
 msgid "if you want a new one."
 msgstr ""
 
+#. module: website_quote
+#: model:ir.model,name:website_quote.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/website_rating/i18n/website_rating.pot b/addons/website_rating/i18n/website_rating.pot
new file mode 100644
index 00000000000..6e1818474f9
--- /dev/null
+++ b/addons/website_rating/i18n/website_rating.pot
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* website_rating
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:24
+#, python-format
+msgid "Average"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:34
+#, python-format
+msgid "Details"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/js/website_mail.js:43
+#, python-format
+msgid "I don't like it"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/js/website_mail.js:42
+#, python-format
+msgid "I hate it"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/js/website_mail.js:45
+#, python-format
+msgid "I like it"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/js/website_mail.js:46
+#, python-format
+msgid "I love it"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/js/website_mail.js:44
+#, python-format
+msgid "It's okay"
+msgstr ""
+
+#. module: website_rating
+#: model:ir.model,name:website_rating.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: website_rating
+#: model:ir.model.fields,field_description:website_rating.field_rating_rating_website_published
+msgid "Published"
+msgstr ""
+
+#. module: website_rating
+#: model:ir.model,name:website_rating.model_rating_rating
+msgid "Rating"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:52
+#, python-format
+msgid "Remove selection"
+msgstr ""
+
+#. module: website_rating
+#: model:ir.model.fields,help:website_rating.field_rating_rating_website_published
+msgid "Visible on the website as a comment"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:40
+#, python-format
+msgid "stars"
+msgstr ""
+
diff --git a/addons/website_rating_project/i18n/website_rating_project.pot b/addons/website_rating_project/i18n/website_rating_project.pot
index 55bf6d5f7e6..27a79ac9296 100644
--- a/addons/website_rating_project/i18n/website_rating_project.pot
+++ b/addons/website_rating_project/i18n/website_rating_project.pot
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* website_rating_project_issue
+#	* website_rating_project
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,78 +15,78 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.index
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.index
 msgid "<i class=\"fa fa-arrow-circle-right \"/> See the feedbacks"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.index
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.index
 msgid "<i class=\"fa fa-calendar\"/> End date :"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.index
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.index
 msgid "<i class=\"fa fa-envelope\"/> Email :"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_rating_data
 msgid "Average"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_rating_data
 msgid "Bad"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
-msgid "Customer Satisfaction of"
-msgstr ""
-
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_rating_data
 msgid "Happy"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_data_satisfaction
 msgid "Last 3 months"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_data_satisfaction
 msgid "Last 30 days"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_data_satisfaction
 msgid "Last 7 days"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.project_data_satisfaction
 msgid "Latest Feedbacks"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.model,name:website_rating_project_issue.model_project_project
+#. module: website_rating_project
+#: model:ir.model,name:website_rating_project.model_project_project
 msgid "Project"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.header_footer_custom
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.header_footer_custom
 msgid "Project Customer Satisfaction"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.index
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.index
 msgid "Project Satisfaction"
 msgstr ""
 
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.index
+#. module: website_rating_project
+#: model:ir.ui.view,arch_db:website_rating_project.index
 msgid "Projects"
 msgstr ""
 
+#. module: website_rating_project
+#: model:ir.model.fields,field_description:website_rating_project.field_project_project_portal_show_rating
+msgid "Rating visible in Website"
+msgstr ""
+
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index cf9c02ab6d0..28776c16fda 100644
--- a/addons/website_sale/i18n/website_sale.pot
+++ b/addons/website_sale/i18n/website_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:03+0000\n"
-"PO-Revision-Date: 2017-07-25 10:03+0000\n"
+"POT-Creation-Date: 2017-09-20 09:53+0000\n"
+"PO-Revision-Date: 2017-09-20 09:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,26 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "! Some processing fees will be applied"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "&amp; Shipping"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "&amp;nbsp;"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "(processing fees apply)"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.reduction_code
 msgid "/shop/cart"
 msgstr ""
@@ -65,22 +50,11 @@ msgid "<br/>\n"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "<i class=\"fa fa-3x fa-credit-card text-muted\" aria-hidden=\"true\"/><br/>\n"
-"                                                Are you sure you want to pay with this card: <br/>"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
 msgid "<i class=\"fa fa-check\"/> Ship to this address"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "<i class=\"fa fa-cog\"/> Configure Transfer Details"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "<i class=\"fa fa-envelope-o\"/> Ask Our Experts"
 msgstr ""
@@ -91,6 +65,11 @@ msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Add an address"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Configure payment acquirers"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<i class=\"fa fa-print\"/> Print"
 msgstr ""
@@ -102,7 +81,7 @@ msgid "<i class=\"fa fa-shopping-cart\"/>\n"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/models/crm_team.py:56
+#: code:addons/website_sale/models/crm_team.py:58
 #, python-format
 msgid "<p class=\"oe_view_nocontent_create\">\n"
 "                        You can find all abandoned carts here, i.e. the carts generated by your website's visitors from over an hour ago that haven't been confirmed yet.</p>\n"
@@ -136,18 +115,6 @@ msgid "<span class=\"col-xs-6 text-right text-muted\">Subtotal:</span>"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<span class=\"fa fa-2x fa-credit-card\"/>\n"
-"                                                Saved Cards"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product
-msgid "<span class=\"fa fa-check\"/>\n"
-"                                <span>In Stock</span>"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
 msgid "<span class=\"fa fa-chevron-left\" aria-hidden=\"true\"/>\n"
 "                                            <span class=\"sr-only\">Previous</span>"
@@ -207,11 +174,6 @@ msgid "<span class=\"hidden-xs\">Process Checkout</span>\n"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<span class=\"js_radio fa fa-circle-o\"/>&amp;nbsp;"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "<span class=\"panel-title\">\n"
 "                                        <span class=\"fa\" data-icon=\"\"/>\n"
@@ -335,13 +297,33 @@ msgid "<span class=\"panel-title\"><span class=\"fa fa-table\"/><strong> Flat ra
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "<span> &amp; Shipping</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "<span>Billing</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+msgid "<span>Confirmed</span>"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "<span>Next </span><span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<span>No payment gateway is available for your country</span>"
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+msgid "<span>Order</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "<span>Review Order</span>"
 msgstr ""
 
 #. module: website_sale
@@ -423,7 +405,7 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
-msgid "<strong>Payment Method:</strong>"
+msgid "<strong>Payment Acquirer:</strong>"
 msgstr ""
 
 #. module: website_sale
@@ -464,7 +446,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "<strong>Reassurance arguments</strong><br/>\n"
-"                            Anticipate your customers questions &amp; worries on practical details like shipping rates &amp; policies, return &amp; replacement policies, payment methods &amp; security and your"
+"                            Anticipate your customers questions &amp; worries on practical details like shipping rates &amp; policies, return &amp; replacement policies, payment acquirers &amp; security and your"
 msgstr ""
 
 #. module: website_sale
@@ -484,7 +466,7 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "<strong>Tip for B2B users:</strong> you can create new manually-processed payment methods (check, purchase order, etc.) by renaming 'Wire Transfer' or duplicating it."
+msgid "<strong>Tip for B2B users:</strong> you can create new manually-processed payment acquirers (check, purchase order, etc.) by renaming 'Wire Transfer' or duplicating it."
 msgstr ""
 
 #. module: website_sale
@@ -533,30 +515,44 @@ msgid "A few % discount can bring you twice more customers! Here are a few kinds
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes."
+msgstr ""
+
+#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:72
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:65
 #, python-format
 msgid "AT A GLANCE"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_is_abandoned_cart
 msgid "Abandoned Cart"
 msgstr ""
 
 #. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/models/crm_team.py:48
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:28
+#: code:addons/website_sale/models/crm_team.py:45
 #: model:ir.actions.act_window,name:website_sale.action_abandoned_orders_ecommerce
 #: model:ir.ui.menu,name:website_sale.menu_orders_abandoned_orders
-#: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale
 #, python-format
 msgid "Abandoned Carts"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_accessory_product_ids
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:21
+#: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale
+#, python-format
+msgid "Abandoned Carts to Recover"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_abandoned_delay
+msgid "Abandoned Delay"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_accessory_product_ids
 #: model:ir.model.fields,help:website_sale.field_product_template_accessory_product_ids
 msgid "Accessories show up when the customer reviews the cart before paying (cross-sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm figures out a list of accessories based on all the products added to cart."
@@ -568,7 +564,6 @@ msgid "Accessories: screen, mouse"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_accessory_product_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_accessory_product_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_template_accessory_product_ids
 msgid "Accessory Products"
@@ -595,20 +590,13 @@ msgid "Address"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_availability
-#: model:ir.model.fields,help:website_sale.field_product_product_availability
-#: model:ir.model.fields,help:website_sale.field_product_template_availability
-msgid "Adds an availability status on the web product page."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.option_collapse_products_categories
 #: model:ir.ui.view,arch_db:website_sale.products_categories
 msgid "All Products"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Allow shoppers to compare products based on their attributes"
 msgstr ""
 
@@ -623,7 +611,6 @@ msgid "Allow to use on"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_alternative_product_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_alternative_product_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_template_alternative_product_ids
 msgid "Alternative Products"
@@ -645,32 +632,32 @@ msgid "Apply"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Apply Automatic Rates Update"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Apply multi-currencies"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Apply multi-currencies"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Apply right VAT rates for digital products sold in EU"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Apply shipping costs on orders"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Apply specific prices per country, discounts, etc."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Assignation"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Assignation of online orders"
 msgstr ""
 
@@ -681,40 +668,26 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.menu,name:website_sale.menu_product_attribute_action
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Attributes"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_product_variant
-msgid "Attributes and Variants"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_availability
-#: model:ir.model.fields,field_description:website_sale.field_product_product_availability
-#: model:ir.model.fields,field_description:website_sale.field_product_template_availability
-msgid "Availability"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_availability_warning
-#: model:ir.model.fields,field_description:website_sale.field_product_product_availability_warning
-#: model:ir.model.fields,field_description:website_sale.field_product_template_availability_warning
-msgid "Availability Warning"
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_automatic_invoice
+msgid "Automatic Invoice"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:99
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:100
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:92
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:93
 #, python-format
 msgid "Average Order"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:111
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:104
 #, python-format
 msgid "Best Sellers"
 msgstr ""
@@ -725,28 +698,28 @@ msgid "Bill To:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Billing"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
 msgid "Billing Address"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products."
 msgstr ""
 
 #. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_can_directly_mark_as_paid
+msgid "Can be directly marked as paid"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Can take up to several days to receive the money"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:19
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:12
 #, python-format
 msgid "Capture order payments when the delivery is completed."
 msgstr ""
@@ -757,9 +730,24 @@ msgid "Cart Quantity"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_recovery_mail_template
+msgid "Cart Recovery Email"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Cart are considered abandoned after"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_recovery_email_sent
+msgid "Cart recovery email already sent"
+msgstr ""
+
+#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:90
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:91
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:83
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:84
 #, python-format
 msgid "Carts"
 msgstr ""
@@ -777,12 +765,12 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
-msgid "Catalog price: decreasing order"
+msgid "Catalog price: High to Low"
 msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
-msgid "Catalog price: increasing order"
+msgid "Catalog price: Low to High"
 msgstr ""
 
 #. module: website_sale
@@ -792,7 +780,6 @@ msgid "Categories are used to browse your products through the\n"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_public_categ_ids
 #: model:ir.model.fields,help:website_sale.field_product_product_public_categ_ids
 #: model:ir.model.fields,help:website_sale.field_product_template_public_categ_ids
 msgid "Categories can be published on the Shop page (online catalog grid) to help customers find all the items within a category. To publish them, go to the Shop page, hit Customize and turn *Product Categories* on. A product can belong to several categories."
@@ -804,8 +791,9 @@ msgid "Change"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Checkout Process"
+#: model:ir.model.fields,help:website_sale.field_sale_order_can_directly_mark_as_paid
+msgid "Checked if the sales order can directly be marked as paid, i.e. if the quotation\n"
+"                is sent or confirmed and if the payment acquire is of the type transfer or manual"
 msgstr ""
 
 #. module: website_sale
@@ -814,13 +802,6 @@ msgid "Children Categories"
 msgstr ""
 
 #. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:37
-#, python-format
-msgid "Choose an image from the library."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "City"
 msgstr ""
@@ -831,8 +812,13 @@ msgid "Click <i>'New'</i> in the top-right corner to create your first product."
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "Click here"
+msgstr ""
+
+#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:33
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:38
 #, python-format
 msgid "Click here to set an image describing your product."
 msgstr ""
@@ -844,21 +830,14 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
-#, python-format
-msgid "Click on <b>Save</b> to add the image to the product description."
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:23
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:28
 #, python-format
 msgid "Click on <em>Continue</em> to create the product."
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:57
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:60
 #, python-format
 msgid "Click on this button so your customers can see it."
 msgstr ""
@@ -889,18 +868,38 @@ msgid "Company Name"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Configure your delivery methods (pricing, destinations)"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with DHL"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with FedEx"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with UPS"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with USPS"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with bpost"
 msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Configure your pricelists"
+msgid "Configure your delivery methods (pricing, destinations)"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Confirm"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Configure your pricelists"
 msgstr ""
 
 #. module: website_sale
@@ -926,7 +925,7 @@ msgid "Confirm orders when you get paid."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Confirmation Email"
 msgstr ""
 
@@ -936,11 +935,6 @@ msgid "Confirmation<span class=\"chevron\"/>"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Confirmed"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "Confirmed Orders"
 msgstr ""
@@ -952,8 +946,8 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:103
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:104
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:96
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:97
 #, python-format
 msgid "Conversion"
 msgstr ""
@@ -989,12 +983,17 @@ msgid "Created on"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Currencies"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Customer Experience"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Customer Segments"
 msgstr ""
@@ -1010,16 +1009,11 @@ msgid "Customers review:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "DHL"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_dhl
-msgid "DHL integration"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_website_currency_id
 msgid "Default Currency"
 msgstr ""
@@ -1030,18 +1024,23 @@ msgid "Default Pricelist"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Default Sales Tax"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Default mode"
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,default_invoice_policy:0
-msgid "Delivered quantities or service hours"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Default recovery email to send when a cart is abandoned"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_sale_stock
-msgid "Delivery Orders"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Default sales tax applied to local transactions"
 msgstr ""
 
 #. module: website_sale
@@ -1050,43 +1049,27 @@ msgid "Delivery Strategy"
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,sale_delivery_settings:0
+#: selection:res.config.settings,sale_delivery_settings:0
 msgid "Delivery methods are only used internally: the customer doesn't pay for shipping costs"
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,sale_delivery_settings:0
+#: selection:res.config.settings,sale_delivery_settings:0
 msgid "Delivery methods are selectable on the website: the customer pays for shipping costs"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_website_sequence
 #: model:ir.model.fields,help:website_sale.field_product_product_website_sequence
 #: model:ir.model.fields,help:website_sale.field_product_template_website_sequence
 msgid "Determine the display order in the Website E-commerce"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_digital
-msgid "Digital Content"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Discount % or amounts, margins, roundings, periods, etc."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_sale_coupon
-msgid "Discount Programs"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_discount_per_so_line
-msgid "Discounted Prices"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_display_name
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_display_name
 #: model:ir.model.fields,field_description:website_sale.field_product_style_display_name
@@ -1094,23 +1077,18 @@ msgid "Display Name"
 msgstr ""
 
 #. module: website_sale
-#: selection:product.template,availability:0
-msgid "Display Nothing"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Display an images carousel on product pages"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Display crossed-out public prices"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:47
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:50
 #, python-format
 msgid "Drag this website block and drop it in your page."
 msgstr ""
@@ -1127,7 +1105,7 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:27
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:32
 #, python-format
 msgid "Edit the price of this product by clicking on the amount."
 msgstr ""
@@ -1148,29 +1126,39 @@ msgid "Email"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Email Template"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_website_config_settings_order_mail_template
+#: model:ir.model,name:website_sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Email for Abandonned carts"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_res_config_settings_order_mail_template
 msgid "Email sent to customer at the end of the checkout process"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Email sent to the customer"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Email sent to the customer after the checkout"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:19
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:24
 #, python-format
 msgid "Enter a name for your new product"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/models/product.py:89
+#: code:addons/website_sale/models/product.py:91
 #, python-format
 msgid "Error ! You cannot create recursive categories."
 msgstr ""
@@ -1186,28 +1174,16 @@ msgid "Extra Step"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "FedEx"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_fedex
-msgid "Fedex integration"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce
 msgid "Find here all the abandoned carts, i.e. the carts generated by your website's visitors more than one hour ago and not confirmed."
 msgstr ""
 
 #. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:62
-#, python-format
-msgid "Follow the steps and advices in the Odoo Planner to deploy your e-Commerce website in no time!"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Free and no setup"
 msgstr ""
@@ -1218,10 +1194,13 @@ msgid "Free delivery (see Delivery Strategy section)"
 msgstr ""
 
 #. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:12
-#, python-format
-msgid "Generate an invoice from orders ready for invoicing."
+#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
+msgid "From Website"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Generate the invoice automatically when the order is confirmed"
 msgstr ""
 
 #. module: website_sale
@@ -1240,11 +1219,6 @@ msgid "Go through the checkout process and make sure every single step is tailor
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Go to the Sales module settings page to configure eBay."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_style_html_class
 msgid "HTML Classes"
 msgstr ""
@@ -1276,8 +1250,8 @@ msgid "Here you can set a specific HTML color index (e.g. #ff0000) to display th
 msgstr ""
 
 #. module: website_sale
-#: selection:product.attribute,type:0
-msgid "Hidden"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "How total tax amount is computed in orders and invoices"
 msgstr ""
 
 #. module: website_sale
@@ -1298,6 +1272,11 @@ msgid "If you deal with a major shipper (UPS, FedEx, DHL, etc.), activate the re
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
 msgid "If your website or mobile apps allows users to create content and make that content public to other users, a <b>Content</b> section will inform users that they own the rights to the content they have created.<br/>The “Content” clause usually mentions that users must give you (the website or mobile app developer) a license so that you can share this content on your website/mobile app and to make it available to other users.<br/>Because the content created by users is public to other users, a DMCA notice clause (or Copyright Infringement ) section is helpful to inform users and copyright authors that, if any content is found to be a copyright infringement, you will respond to any DMCA take down notices received and you will take down the content."
 msgstr ""
@@ -1314,7 +1293,6 @@ msgid "Image Name"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_product_image_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_product_image_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_template_product_image_ids
 #: model:ir.ui.view,arch_db:website_sale.product_template_form_view
@@ -1327,11 +1305,6 @@ msgid "Imagine a new customer adds a product to cart and leaves your website bec
 msgstr ""
 
 #. module: website_sale
-#: selection:product.template,availability:0
-msgid "In Stock"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Install Optional Products (cross-selling)"
 msgstr ""
@@ -1342,29 +1315,19 @@ msgid "Install shipping connectors"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_comparison
-msgid "Installs *e-Commerce Comparator*"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_options
-msgid "Installs *e-Commerce Optional Products*"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_wishlist
-msgid "Installs *e-Commerce Wishlist*"
+#: model:ir.model.fields,help:website_sale.field_res_config_settings_module_website_sale_stock
+msgid "Installs *e-Commerce Inventory*"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.menu,name:website_sale.menu_internal_product_categories
-msgid "Internal Categories"
+#: code:addons/website_sale/controllers/main.py:496
+#, python-format
+msgid "Invalid Email! Please enter a valid email address."
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/main.py:484
-#, python-format
-msgid "Invalid Email! Please enter a valid email address."
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_stock
+msgid "Inventory"
 msgstr ""
 
 #. module: website_sale
@@ -1373,17 +1336,18 @@ msgid "Invoices"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_account_invoicing
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Invoicing"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_default_invoice_policy
-msgid "Invoicing Policy"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Issue invoices to customers"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:120
+#: code:addons/website_sale/models/sale_order.py:146
 #, python-format
 msgid "It is forbidden to modify a sales order which is not in draft status"
 msgstr ""
@@ -1412,11 +1376,6 @@ msgid "Last Online Sales Order"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_tx_id
-msgid "Last Transaction"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_write_uid
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_write_uid
 #: model:ir.model.fields,field_description:website_sale.field_product_style_write_uid
@@ -1446,12 +1405,12 @@ msgid "Legal Name"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Let returning shoppers save products in a whishlist"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Let the customer enter a shipping address"
 msgstr ""
 
@@ -1461,6 +1420,20 @@ msgid "Let them buy straight from catalog with:"
 msgstr ""
 
 #. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:15
+#, python-format
+msgid "Let's create your first product."
+msgstr ""
+
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:64
+#, python-format
+msgid "Let's now take a look at your administration dashboard to get your eCommerce website ready in no time."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "List displaying"
 msgstr ""
@@ -1481,18 +1454,18 @@ msgid "Make sure your customers can go through the shopping process in a very sh
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Manage picking and deliveries"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Manage availability of products"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Manage promotion &amp; coupon programs"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery
-msgid "Manage shipping internally"
+#: model:ir.ui.view,arch_db:website_sale.sale_order_view_form
+msgid "Mark as Paid"
 msgstr ""
 
 #. module: website_sale
@@ -1511,12 +1484,7 @@ msgid "Min. qty or period"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_multi_currency
-msgid "Multi-Currencies"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_website_multiimage
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_group_website_multiimage
 msgid "Multi-Images"
 msgstr ""
 
@@ -1526,16 +1494,6 @@ msgid "Multi-buy offers (2 products sold together for less than their individual
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_pricelist_setting_split_1
-msgid "Multiple Prices per Product"
-msgstr ""
-
-#. module: website_sale
-#: selection:website.config.settings,sale_pricelist_setting_split_2:0
-msgid "Multiple prices per product (e.g. customer segments, currencies)"
-msgstr ""
-
-#. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/js/website_sale.js:15
 #, python-format
@@ -1551,13 +1509,18 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
-msgid "Name <i class=\"fa fa-caret-down\" aria-hidden=\"true\"/>"
+msgid "Name - A to Z"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sort
+msgid "Name - Z to A"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/controllers/main.py:984
-#: code:addons/website_sale/static/src/js/website_sale.editor.js:18
+#: code:addons/website_sale/controllers/main.py:959
+#: code:addons/website_sale/static/src/js/website_sale.editor.js:32
 #: model:ir.ui.view,arch_db:website_sale.content_new_product
 #, python-format
 msgid "New Product"
@@ -1579,16 +1542,11 @@ msgid "No product defined."
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,sale_delivery_settings:0
+#: selection:res.config.settings,sale_delivery_settings:0
 msgid "No shipping management on website"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "No, choose another method"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale_pricelist_form_view
 msgid "None website"
 msgstr ""
@@ -1606,19 +1564,19 @@ msgid "OK"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Once activated, discounted prices can be applied from Pricelists setup form (Discount policy field)."
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:52
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:55
 #, python-format
 msgid "Once you click on <b>Save</b>, your product is updated."
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/models/crm_team.py:41
+#: code:addons/website_sale/models/crm_team.py:39
 #, python-format
 msgid "Online Sales"
 msgstr ""
@@ -1634,22 +1592,24 @@ msgid "Only Services"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_options
-msgid "Optional Products"
+#. openerp-web
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:68
+#, python-format
+msgid "Open your website app here."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Options: warranty, software"
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_options
+msgid "Optional Products"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Order"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Options: warranty, software"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_order_mail_template
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_order_mail_template
 msgid "Order Confirmation Email"
 msgstr ""
 
@@ -1664,17 +1624,13 @@ msgid "Order Lines to be displayed on the website. They should not be used for c
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,default_invoice_policy:0
-msgid "Ordered quantities"
-msgstr ""
-
-#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:74
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:67
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:68
 #: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce
 #: model:ir.ui.menu,name:website_sale.menu_orders
 #: model:ir.ui.menu,name:website_sale.menu_orders_orders
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 #, python-format
 msgid "Orders"
 msgstr ""
@@ -1686,15 +1642,8 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14
-#, python-format
-msgid "Orders to Invoice"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:95
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:96
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:88
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:89
 #, python-format
 msgid "Orders/Day"
 msgstr ""
@@ -1705,8 +1654,7 @@ msgid "Parent Category"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/main.py:741
-#: code:addons/website_sale/controllers/main.py:851
+#: code:addons/website_sale/controllers/main.py:747
 #, python-format
 msgid "Pay Now"
 msgstr ""
@@ -1717,13 +1665,14 @@ msgid "Pay Now <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Payment"
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "Pay with"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_acquirer_id
-msgid "Payment Acquirer"
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Payment Acquirers"
 msgstr ""
 
 #. module: website_sale
@@ -1732,40 +1681,11 @@ msgid "Payment Information"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Payment Method:"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Payment Methods"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Payment must be reconciled manually"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/main.py:775
-#, python-format
-msgid "Payment transaction (%s) failed : <%s>"
-msgstr ""
-
-#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:769
-#, python-format
-msgid "Payment transaction failed (%s)"
-msgstr ""
-
-#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:776
-#, python-format
-msgid "Payment transaction failed (Contact Administrator)"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info_option
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "Payment<span class=\"chevron\"/>"
@@ -1778,7 +1698,7 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:21
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14
 #, python-format
 msgid "Payments to Capture"
 msgstr ""
@@ -1795,6 +1715,11 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
+msgid "Please proceed your current cart."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Policies"
 msgstr ""
 
@@ -1804,19 +1729,19 @@ msgid "Prefered by some customers"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:111
+#: code:addons/website_sale/controllers/backend.py:109
 #, python-format
 msgid "Previous Month"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:109
+#: code:addons/website_sale/controllers/backend.py:107
 #, python-format
 msgid "Previous Week"
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:113
+#: code:addons/website_sale/controllers/backend.py:111
 #, python-format
 msgid "Previous Year"
 msgstr ""
@@ -1840,17 +1765,12 @@ msgstr ""
 #. module: website_sale
 #: model:ir.actions.act_window,name:website_sale.website_product_pricelist3
 #: model:ir.ui.menu,name:website_sale.menu_catalog_pricelists
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Pricelists"
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,sale_pricelist_setting_split_2:0
-msgid "Prices computed from formulas (discounts, margins, roundings)"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Pricing"
 msgstr ""
 
@@ -1861,7 +1781,7 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:114
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:107
 #: model:ir.model,name:website_sale.model_product_product
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
 #: model:ir.ui.view,arch_db:website_sale.payment
@@ -1875,12 +1795,12 @@ msgid "Product Attribute"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Product Catalog"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_comparison
 msgid "Product Comparator"
 msgstr ""
 
@@ -1901,8 +1821,7 @@ msgid "Product Pages"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_show_tax
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Product Prices"
 msgstr ""
 
@@ -1937,7 +1856,6 @@ msgid "Product descriptions"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product
 #: model:ir.ui.view,arch_db:website_sale.product_price
 msgid "Product not available"
 msgstr ""
@@ -1948,7 +1866,7 @@ msgid "Product not found!"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Product prices displaying in web catalog"
 msgstr ""
 
@@ -1972,17 +1890,11 @@ msgid "Promote"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Provide customers with links or content to download"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Provide customers with product-specific links or downloadable content in the confirmation page of the checkout process if the payment gets through. To do so, attach some files to a product using the new Files button and publish them."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_rating_rating_website_published
 #: model:ir.ui.view,arch_db:website_sale.product_template_search_view_website
 msgid "Published"
 msgstr ""
@@ -2009,7 +1921,7 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Put the practical details (shipping, payment methods, etc.) as links in the footer; That way, they will be accessible \n"
+msgid "Put the practical details (shipping, payment acquirers, etc.) as links in the footer; That way, they will be accessible \n"
 "                            all your product pages."
 msgstr ""
 
@@ -2019,13 +1931,8 @@ msgid "Qty:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Quantities to invoice from sales orders"
-msgstr ""
-
-#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:115
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:108
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 #: model:ir.ui.view,arch_db:website_sale.payment
@@ -2049,43 +1956,41 @@ msgid "Radio"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model,name:website_sale.model_rating_rating
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_ids
 msgid "Rating"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_feedback
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_feedback
 msgid "Rating Last Feedback"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_image
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_image
 msgid "Rating Last Image"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_value
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_value
 msgid "Rating Last Value"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_count
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_count
 msgid "Rating count"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_rating_last_feedback
 #: model:ir.model.fields,help:website_sale.field_product_product_rating_last_feedback
 msgid "Reason of the rating"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
+msgid "Recovery Email to Send"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_product_tmpl_id
 msgid "Related Product"
 msgstr ""
@@ -2101,13 +2006,13 @@ msgid "Return to the product list."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Review Order<span class=\"chevron\"/>"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Review your catalog"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Review your catalog"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Rounding Method"
 msgstr ""
 
 #. module: website_sale
@@ -2121,9 +2026,14 @@ msgid "Sale Report"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.actions.server,name:website_sale.ir_actions_server_sale_cart_recovery_email
+msgid "Sale: Send a Cart Recovery Email"
+msgstr ""
+
+#. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:44
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:56
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:37
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:49
 #: model:ir.actions.act_window,name:website_sale.sale_report_action_carts
 #: model:ir.actions.act_window,name:website_sale.sale_report_action_dashboard
 #: model:ir.ui.menu,name:website_sale.menu_report_sales
@@ -2134,9 +2044,9 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_crm_team
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesteam_id
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_salesteam_id
 #: model:ir.model.fields,field_description:website_sale.field_website_salesteam_id
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Sales Channel"
 msgstr ""
 
@@ -2146,40 +2056,25 @@ msgid "Sales Order"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_pricelist_setting_split_2
-msgid "Sales Price"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_report_view_pivot_website
 msgid "Sales Report"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:42
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:54
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:35
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:47
 #, python-format
 msgid "Sales Since Last"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesperson_id
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_salesperson_id
 #: model:ir.model.fields,field_description:website_sale.field_website_salesperson_id
 msgid "Salesperson"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Save my payment data"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Save this page and come back here to set up the feature."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Secure Payment"
 msgstr ""
@@ -2191,7 +2086,7 @@ msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "See how to configure payment methods"
+msgid "See how to configure payment acquirers"
 msgstr ""
 
 #. module: website_sale
@@ -2211,12 +2106,17 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:15
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:20
 #, python-format
 msgid "Select <b>New Product</b> to create it and manage its properties to boost your sales."
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Select optional products from the configuration form of your main products (in Sales tab)."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
 msgid "Select this address"
 msgstr ""
@@ -2247,25 +2147,30 @@ msgid "Sell More"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Sell content to download or URL links"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Sell in several currencies"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Sell your products on eBay"
+#: model:ir.ui.view,arch_db:website_sale.sale_order_view_form_cart_recovery
+msgid "Send a Recovery Email"
 msgstr ""
 
 #. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:26
-#, python-format
-msgid "Send a recovery email to visitors who haven't completed their order."
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Send a recovery email to authentified shoppers"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Send delivery orders to your warehouse and get delivered quantities updated in sales orders accordingly."
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:19
+#, python-format
+msgid "Send a recovery email to visitors who haven't completed their order."
 msgstr ""
 
 #. module: website_sale
@@ -2279,7 +2184,7 @@ msgid "Set alternatives, accessories and options in product detail form (in Sale
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Set product attributes (e.g. color, size) to sell variants"
 msgstr ""
 
@@ -2289,59 +2194,29 @@ msgid "Ship To:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Ship with DHL"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Ship with FedEx"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Ship with UPS"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Ship with USPS"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Shipping"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_delivery_invoice_address
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_group_delivery_invoice_address
 #: model:ir.ui.view,arch_db:website_sale.address
 #: model:ir.ui.view,arch_db:website_sale.checkout
 msgid "Shipping Address"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Shipping Connectors"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Shipping Costs"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_delivery_settings
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_sale_delivery_settings
 msgid "Shipping Management"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer.Apply shipping connector from delivery methods."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.products
 #: model:website.menu,name:website_sale.menu_shop
 msgid "Shop"
@@ -2353,18 +2228,13 @@ msgid "Shop - Checkout"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Shop - Confirm payment"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Shop - Confirmed"
 msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Shop - Select Payment Method"
+msgid "Shop - Select Payment Acquirer"
 msgstr ""
 
 #. module: website_sale
@@ -2383,39 +2253,17 @@ msgid "Show multi image on eCommerce"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_product_pricelist
-msgid "Show pricelists On Products"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_pricelist_item
-msgid "Show pricelists to customers"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_show_price_subtotal
-msgid "Show subtotal"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_show_price_total
-msgid "Show total"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale
 msgid "Size"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_size_x
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_size_x
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_size_x
 msgid "Size X"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_size_y
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_size_y
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_size_y
 msgid "Size Y"
@@ -2433,8 +2281,8 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:83
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:116
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:76
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:109
 #, python-format
 msgid "Sold"
 msgstr ""
@@ -2445,7 +2293,7 @@ msgid "Some acquirers like Authorize.net and Ingenico can be used as payment gat
 msgstr ""
 
 #. module: website_sale
-#: code:addons/website_sale/controllers/main.py:495
+#: code:addons/website_sale/controllers/main.py:512
 #, python-format
 msgid "Some required fields are empty."
 msgstr ""
@@ -2496,7 +2344,6 @@ msgid "Style Name"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_style_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_style_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_style_ids
 #: model:ir.ui.view,arch_db:website_sale.website_sale
@@ -2514,14 +2361,13 @@ msgid "Subtotal:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_alternative_product_ids
 #: model:ir.model.fields,help:website_sale.field_product_product_alternative_product_ids
 #: model:ir.model.fields,help:website_sale.field_product_template_alternative_product_ids
 msgid "Suggest more expensive alternatives to your customers (upsell strategy). Those products show up on the product page."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Suggest optional products when adding to cart"
 msgstr ""
 
@@ -2541,11 +2387,6 @@ msgid "Suggested Accessories:"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Summary"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "TIN / VAT"
 msgstr ""
@@ -2556,13 +2397,8 @@ msgid "Tax ID"
 msgstr ""
 
 #. module: website_sale
-#: selection:website.config.settings,sale_show_tax:0
-msgid "Tax-Excluded Prices"
-msgstr ""
-
-#. module: website_sale
-#: selection:website.config.settings,sale_show_tax:0
-msgid "Tax-Included Prices"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Taxes"
 msgstr ""
 
 #. module: website_sale
@@ -2596,46 +2432,41 @@ msgid "The first step is to set up your company's information. This is used in s
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_delivery_carrier_website_url
 #: model:ir.model.fields,help:website_sale.field_product_product_website_url
 msgid "The full URL to access the document through the website."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "The payment seems to have been canceled."
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "The mode selected here applies as invoicing policy of any new product created but not of products already existing."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "There are two strategies to sell more to a customer:"
+#: code:addons/website_sale/models/sale_order.py:245
+#, python-format
+msgid "The quote should be sent and the payment acquirer type should be manual or wire transfer"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "There are two ways to manage pricelists:                         Multiple prices per product: must be set in the Sales tab of the product detail form.                         Price computed from formulas: must be set in the pricelist form."
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "There are two strategies to sell more to a customer:"
 msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:60
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:53
 #, python-format
 msgid "There is no recent confirmed order."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "There seems to be an error with your request."
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "This adds the choice of a currency on pricelists."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "This default value is applied to any new product created. This can be changed in the product detail form."
+#: model:ir.ui.view,arch_db:website_sale.product
+msgid "This combination does not exist."
 msgstr ""
 
 #. module: website_sale
@@ -2644,11 +2475,21 @@ msgid "This field holds the image used as image for the category, limited to 102
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "This is your current cart."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
 msgid "This promo code is not available"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "This tax is applied to any new product created in the catalog."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "To collect payments, you can either request your customers to process it manually (wire transfer, etc.) or redirect them to payment acquirers.<br/>\n"
 "                        Using payment acquirers costs you money, so take some time to compare them."
@@ -2665,36 +2506,21 @@ msgid "Total"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Transaction processing ..."
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_attribute_type
 msgid "Type"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "UPS"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_ups
-msgid "UPS integration"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "USPS"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_usps
-msgid "USPS integration"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Unit Price"
 msgstr ""
@@ -2710,19 +2536,21 @@ msgstr ""
 
 #. module: website_sale
 #. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:82
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
 #, python-format
 msgid "Untaxed Total Sold"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Use our import templates to get your catalog ready in no time!"
+#. openerp-web
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
+#, python-format
+msgid "Upload an image from your local library."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_sale_pricelist
-msgid "Use pricelists to adapt your price per customers"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Use our import templates to get your catalog ready in no time!"
 msgstr ""
 
 #. module: website_sale
@@ -2731,48 +2559,18 @@ msgid "View Cart ("
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_published
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_published
 msgid "Visible in Website"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_rating_rating_website_published
-msgid "Visible on the website as a comment"
-msgstr ""
-
-#. module: website_sale
-#: selection:product.template,availability:0
-msgid "Warning"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model,name:website_sale.model_website
 #: model:ir.ui.view,arch_db:website_sale.product_template_form_view
 msgid "Website"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.menu,name:website_sale.menu_catalog_categories
-#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
-msgid "Website Categories"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_message_ids
-#: model:ir.model.fields,field_description:website_sale.field_product_product_website_message_ids
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_message_ids
-msgid "Website Comments"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.actions.act_window,name:website_sale.product_public_category_action
-msgid "Website Product Categories"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.model,name:website_sale.model_product_public_category
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_public_categ_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_product_public_categ_ids
 #: model:ir.model.fields,field_description:website_sale.field_product_template_public_categ_ids
 msgid "Website Product Category"
@@ -2784,7 +2582,6 @@ msgid "Website Public Categories"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_sequence
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_sequence
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_sequence
 msgid "Website Sequence"
@@ -2796,38 +2593,32 @@ msgid "Website Shop"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_url
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_url
 msgid "Website URL"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_description
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_description
 msgid "Website meta description"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_keywords
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_keywords
 msgid "Website meta keywords"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_title
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_title
 msgid "Website meta title"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_price
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_price
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_price
 msgid "Website price"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_public_price
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_public_price
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_public_price
 msgid "Website public price"
@@ -2844,18 +2635,18 @@ msgid "Websites using this sales channel"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_wishlist
-msgid "Wishlists "
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_wishlist
+msgid "Wishlists"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
-msgid "Yes, pay with this card"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "With the first mode you can set several prices in the product config form (from Sales tab). With the second one, you set prices and computation rules from Pricelists."
 msgstr ""
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "You can setup 3 types of <strong>payment methods in Odoo:</strong>"
+msgid "You can setup 3 types of <strong>payment acquirers in Odoo:</strong>"
 msgstr ""
 
 #. module: website_sale
@@ -2881,6 +2672,11 @@ msgid "You don't have any unpaid order from the website."
 msgstr ""
 
 #. module: website_sale
+#: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery
+msgid "You left items in your cart."
+msgstr ""
+
+#. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce
 msgid "You should send an email to revive them!"
 msgstr ""
@@ -2908,38 +2704,28 @@ msgid "Your cart is empty!"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "Your order has been confirmed, thank you for your loyalty."
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "Your payment has been authorized."
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "Your payment has been received."
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "Your previous cart has already been completed."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "Your transaction is waiting a manual confirmation."
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "Zip Code"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.order_state_message
-msgid "Your transaction is waiting confirmation."
+#: model:mail.template,body_html:website_sale.mail_template_sale_cart_recovery
+msgid "\\x3c3f786d6c2076657273696f6e3d22312e30223f3e0a3c646976207374796c653d226d617267696e3a6175746f3b77696474683a313030253b223e0a20202020202020202020202020202020202020203c696d67207372633d222f7765622f696d6167652f7265732e636f6d70616e792f247b757365722e636f6d70616e795f69642e69647d2f6c6f676f22207374796c653d226865696768743a206175746f3b2077696474683a20383070783b206d617267696e2d746f703a333070783b2220616c743d22247b757365722e636f6d70616e795f69642e6e616d657d222f3e0a20202020202020202020202020202020202020203c6831207374796c653d22636f6c6f723a234139413941393b223e5448455245275320534f4d455448494e4720494e20594f555220434152542e3c2f68313e0a20202020202020202020202020202020202020203c703e576f756c6420796f75206c696b6520746f20636f6d706c65746520796f75722070757263686173653f3c2f703e3c62722f3e3c62722f3e0a202020202020202020202020202020202020202025206966206f626a6563742e6f726465725f6c696e653a0a20202020202020202020202020202020202020202520666f72206c696e6520696e206f626a6563742e6f726465725f6c696e653a0a20202020202020202020202020202020202020203c68722f3e0a20202020202020202020202020202020202020203c7461626c652077696474683d2231303025223e0a2020202020202020202020202020202020202020202020203c74723e0a202020202020202020202020202020202020202020202020202020203c7464207374796c653d2270616464696e673a20313070783b2077696474683a31353070783b223e0a20202020202020202020202020202020202020202020202020202020202020203c696d67207372633d222f7765622f696d6167652f70726f647563742e70726f647563742f247b6c696e652e70726f647563745f69642e69647d2f696d61676522206865696768743d223130307078222077696474683d223130307078222f3e0a202020202020202020202020202020202020202020202020202020203c2f74643e0a202020202020202020202020202020202020202020202020202020203c74643e0a20202020202020202020202020202020202020202020202020202020202020203c7374726f6e673e247b6c696e652e70726f647563745f69642e646973706c61795f6e616d657d3c2f7374726f6e673e3c62722f3e247b6c696e652e6e616d657d0a202020202020202020202020202020202020202020202020202020203c2f74643e0a202020202020202020202020202020202020202020202020202020203c74642077696474683d2231303070782220616c69676e3d227269676874223e0a2020202020202020202020202020202020202020202020202020202020202020247b286c696e652e70726f647563745f756f6d5f71747929207c20696e747d20247b286c696e652e70726f647563745f756f6d2e6e616d65297d0a202020202020202020202020202020202020202020202020202020203c2f74643e0a2020202020202020202020202020202020202020202020203c2f74723e0a20202020202020202020202020202020202020203c2f7461626c653e0a20202020202020202020202020202020202020202520656e64666f720a20202020202020202020202020202020202020203c68722f3e0a20202020202020202020202020202020202020202520656e6469660a20202020202020202020202020202020202020203c62722f3e3c62722f3e0a20202020202020202020202020202020202020203c63656e7465723e0a2020202020202020202020202020202020202020202020203c6120687265663d222f73686f702f636172743f6163636573735f746f6b656e3d247b6f626a6563742e6163636573735f746f6b656e7d22207461726765743d225f626c616e6b22207374796c653d226261636b67726f756e642d636f6c6f723a20233161626339633b2070616464696e673a20323070783b20746578742d6465636f726174696f6e3a206e6f6e653b20636f6c6f723a20236666663b20626f726465722d7261646975733a203570783b20666f6e742d73697a653a20313670783b2220636c6173733d226f5f64656661756c745f736e69707065745f74657874223e526573756d65206f726465723c2f613e3c62722f3e3c62722f3e3c62722f3e0a2020202020202020202020202020202020202020202020203c703e3c623e5468616e6b20796f7520666f722073686f7070696e67207769746820247b757365722e636f6d70616e795f69642e6e616d657d213c2f623e3c2f703e0a20202020202020202020202020202020202020203c2f63656e7465723e0a202020202020202020202020202020203c2f6469763e0a202020202020202020202020"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.address
-msgid "Zip Code"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "all angles, detailed view, package, etc."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "all angles, detailed view, package, etc."
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "bpost"
 msgstr ""
 
 #. module: website_sale
@@ -2948,43 +2734,45 @@ msgid "code..."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product_comment
-msgid "comment"
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_settings
+msgid "eCommerce"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product_comment
-msgid "comments"
+#: model:ir.actions.act_window,name:website_sale.product_public_category_action
+#: model:ir.ui.menu,name:website_sale.menu_catalog_categories
+#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
+msgid "eCommerce Categories"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "eBay"
+#: model:ir.ui.view,arch_db:website_sale.search count
+msgid "found)"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_sale_ebay
-msgid "eBay connector"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "hours"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.menu,name:website_sale.menu_ecommerce_settings
-msgid "eCommerce"
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "if you want to merge your previous cart into current cart."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale
-msgid "eCommerce Integrations"
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "if you want to restore your previous cart. Your current cart will be replaced with your previous cart."
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.search count
-msgid "found)"
+#: model:ir.ui.view,arch_db:website_sale.cart_popover
+msgid "items)"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.cart_popover
-msgid "items)"
+#: model:ir.model.fields,help:website_sale.field_res_config_settings_cart_abandoned_delay
+msgid "number of hours after which the cart is considered abandoned"
 msgstr ""
 
 #. module: website_sale
@@ -3008,6 +2796,11 @@ msgid "product.style"
 msgstr ""
 
 #. module: website_sale
+#: model:ir.model,name:website_sale.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "set company logo"
 msgstr ""
@@ -3028,11 +2821,6 @@ msgid "website"
 msgstr ""
 
 #. module: website_sale
-#: model:ir.model,name:website_sale.model_website_config_settings
-msgid "website.config.settings"
-msgstr ""
-
-#. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "what do the customers think of the product"
 msgstr ""
diff --git a/addons/website_sale_comparison/i18n/website_sale_comparison.pot b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
index fefedbe944d..3081582c922 100644
--- a/addons/website_sale_comparison/i18n/website_sale_comparison.pot
+++ b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,13 @@ msgid "<strong>Price:</strong>"
 msgstr ""
 
 #. module: website_sale_comparison
-#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_id_11698
+#: model:ir.actions.act_window,name:website_sale_comparison.product_attribute_category_action
+#: model:ir.ui.menu,name:website_sale_comparison.menu_attribute_category_action
+msgid "Attribute Categories"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_id_11202
 msgid "Category"
 msgstr ""
 
@@ -129,7 +135,7 @@ msgid "Sequence"
 msgstr ""
 
 #. module: website_sale_comparison
-#: model:ir.model.fields,help:website_sale_comparison.field_product_attribute_category_id_11698
+#: model:ir.model.fields,help:website_sale_comparison.field_product_attribute_category_id_11202
 msgid "Set a category to regroup similar attributes under the same section in the Comparison page of eCommerce"
 msgstr ""
 
@@ -151,12 +157,6 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: website_sale_comparison
-#: model:ir.actions.act_window,name:website_sale_comparison.product_attribute_category_action
-#: model:ir.ui.menu,name:website_sale_comparison.menu_attribute_category_action
-msgid "Website attribute categories"
-msgstr ""
-
-#. module: website_sale_comparison
 #. openerp-web
 #: code:addons/website_sale_comparison/static/src/xml/comparison.xml:15
 #, python-format
diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
index 841f3e728a6..ace21d67cf5 100644
--- a/addons/website_sale_delivery/i18n/website_sale_delivery.pot
+++ b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,43 +16,25 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
-msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Delivery will be updated after choosing a new delivery method\"> Delivery:</span>"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_website_description
-msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Refund"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_accessory_product_ids
-msgid "Accessories show up when the customer reviews the cart before paying (cross-sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm figures out a list of accessories based on all the products added to cart."
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_accessory_product_ids
-msgid "Accessory Products"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_availability
-msgid "Adds an availability status on the web product page."
+#: code:addons/website_sale_delivery/controllers/main.py:50
+#, python-format
+msgid "%s does not ship to your address, please choose another one.\n"
+"(Error: %s)"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_alternative_product_ids
-msgid "Alternative Products"
+#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
+msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Configure delivery methods"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_availability
-msgid "Availability"
+#: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
+msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Delivery will be updated after choosing a new delivery method\"> Delivery:</span>"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_availability_warning
-msgid "Availability Warning"
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_website_description
+msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
 msgstr ""
 
 #. module: website_sale_delivery
@@ -61,13 +43,8 @@ msgid "Carrier"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_public_categ_ids
-msgid "Categories can be published on the Shop page (online catalog grid) to help customers find all the items within a category. To publish them, go to the Shop page, hit Customize and turn *Product Categories* on. A product can belong to several categories."
-msgstr ""
-
-#. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
-msgid "Choose your Delivery Method"
+msgid "Choose a delivery method <i class=\"fa fa-question text-muted\" title=\"Delivery price will be updated after choosing a new delivery method\" aria-hidden=\"true\"/>"
 msgstr ""
 
 #. module: website_sale_delivery
@@ -76,13 +53,18 @@ msgid "Country"
 msgstr ""
 
 #. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
+msgid "DHL Delivery Methods"
+msgstr ""
+
+#. module: website_sale_delivery
 #: model:ir.model.fields,field_description:website_sale_delivery.field_sale_order_amount_delivery
 msgid "Delivery Amount"
 msgstr ""
 
 #. module: website_sale_delivery
 #: model:ir.ui.menu,name:website_sale_delivery.menu_ecommerce_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.website_config_settings_view_form_inherit_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
 msgid "Delivery Methods"
 msgstr ""
 
@@ -102,27 +84,8 @@ msgid "Description for Online Quotations"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_quote_description
-msgid "Description for the quote"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_website_sequence
-msgid "Determine the display order in the Website E-commerce"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_split_method
-msgid "Equal : Cost will be equally divided.\n"
-"By Quantity : Cost will be divided according to product's quantity.\n"
-"By Current cost : Cost will be divided according to product's current cost.\n"
-"By Weight : Cost will be divided depending on its weight.\n"
-"By Volume : Cost will be divided depending on its volume."
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_attachment_count
-msgid "File"
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
+msgid "FedEx Delivery Methods"
 msgstr ""
 
 #. module: website_sale_delivery
@@ -136,39 +99,15 @@ msgid "Has delivery"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_product_image_ids
-msgid "Images"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_intrastat_id
-msgid "Intrastat code"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_landed_cost_ok
-msgid "Landed Costs"
-msgstr ""
-
-#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:99
+#: code:addons/website_sale_delivery/controllers/main.py:42
 #, python-format
 msgid "No shipping method is available for your current order and shipping address. Please contact us for more information."
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_optional_product_ids
-msgid "Optional Products"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_optional_product_ids
-msgid "Optional Products are suggested whenever the customer hits *Add to Cart* (cross-sell strategy, e.g. for computers: warranty, software, etc.)."
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_purchase_requisition
-msgid "Procurement"
+#: code:addons/website_sale_delivery/controllers/main.py:49
+#, python-format
+msgid "Ouch, you cannot choose this carrier!"
 msgstr ""
 
 #. module: website_sale_delivery
@@ -177,123 +116,38 @@ msgid "Published"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_ids
-msgid "Rating"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_feedback
-msgid "Rating Last Feedback"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_image
-msgid "Rating Last Image"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_value
-msgid "Rating Last Value"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_count
-msgid "Rating count"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_rating_last_feedback
-msgid "Reason of the rating"
-msgstr ""
-
-#. module: website_sale_delivery
 #: model:ir.model,name:website_sale_delivery.model_sale_order
 msgid "Sales Order"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_size_x
-msgid "Size X"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_size_y
-msgid "Size Y"
-msgstr ""
-
-#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:98
+#: code:addons/website_sale_delivery/controllers/main.py:41
 #, python-format
 msgid "Sorry, we are unable to ship your order"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_split_method
-msgid "Split Method"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_style_ids
-msgid "Styles"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_alternative_product_ids
-msgid "Suggest more expensive alternatives to your customers (upsell strategy). Those products show up on the product page."
-msgstr ""
-
-#. module: website_sale_delivery
 #: model:ir.model.fields,help:website_sale_delivery.field_sale_order_amount_delivery
 msgid "The amount without tax."
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.shipping_tracking
+#: model:ir.ui.view,arch_db:website_sale_delivery.portal_order_page_shipping_tracking
 msgid "Tracking:"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_message_ids
-msgid "Website Comments"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_public_categ_ids
-msgid "Website Product Category"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_sequence
-msgid "Website Sequence"
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
+msgid "USPS Delivery Methods"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_price
-msgid "Website price"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_published
+msgid "Visible in Website"
 msgstr ""
 
 #. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_public_price
-msgid "Website public price"
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
+msgid "bpost Delivery Methods"
 msgstr ""
 
diff --git a/addons/website_sale_digital/i18n/website_sale_digital.pot b/addons/website_sale_digital/i18n/website_sale_digital.pot
index dc11f986d77..5057b243ac8 100644
--- a/addons/website_sale_digital/i18n/website_sale_digital.pot
+++ b/addons/website_sale_digital/i18n/website_sale_digital.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -24,19 +24,18 @@ msgstr ""
 
 #. module: website_sale_digital
 #: model:ir.model.fields,field_description:website_sale_digital.field_ir_attachment_product_downloadable
+#: model:ir.model.fields,field_description:website_sale_digital.field_mrp_document_product_downloadable
 msgid "Downloadable from product portal"
 msgstr ""
 
 #. module: website_sale_digital
-#: model:ir.ui.view,arch_db:website_sale_digital.orders_followup_downloads
+#: model:ir.ui.view,arch_db:website_sale_digital.portal_order_page_downloads
 msgid "Downloads <span class=\"caret\"/>"
 msgstr ""
 
 #. module: website_sale_digital
 #: model:ir.model.fields,field_description:website_sale_digital.field_product_product_attachment_count
 #: model:ir.model.fields,field_description:website_sale_digital.field_product_template_attachment_count
-#: model:ir.ui.view,arch_db:website_sale_digital.product_product_view_form_inherit_digital
-#: model:ir.ui.view,arch_db:website_sale_digital.product_template_view_form_inherit_digital
 msgid "File"
 msgstr ""
 
@@ -46,6 +45,12 @@ msgid "Invoice Line"
 msgstr ""
 
 #. module: website_sale_digital
+#: model:ir.ui.view,arch_db:website_sale_digital.product_product_view_form_inherit_digital
+#: model:ir.ui.view,arch_db:website_sale_digital.product_template_view_form_inherit_digital
+msgid "Portal Files"
+msgstr ""
+
+#. module: website_sale_digital
 #: model:ir.model,name:website_sale_digital.model_product_product
 msgid "Product"
 msgstr ""
diff --git a/addons/website_sale_options/i18n/website_sale_options.pot b/addons/website_sale_options/i18n/website_sale_options.pot
index 75159078854..891cce3036e 100644
--- a/addons/website_sale_options/i18n/website_sale_options.pot
+++ b/addons/website_sale_options/i18n/website_sale_options.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -63,11 +63,13 @@ msgid "Option:"
 msgstr ""
 
 #. module: website_sale_options
+#: model:ir.model.fields,field_description:website_sale_options.field_product_product_optional_product_ids
 #: model:ir.model.fields,field_description:website_sale_options.field_product_template_optional_product_ids
 msgid "Optional Products"
 msgstr ""
 
 #. module: website_sale_options
+#: model:ir.model.fields,help:website_sale_options.field_product_product_optional_product_ids
 #: model:ir.model.fields,help:website_sale_options.field_product_template_optional_product_ids
 msgid "Optional Products are suggested whenever the customer hits *Add to Cart* (cross-sell strategy, e.g. for computers: warranty, software, etc.)."
 msgstr ""
diff --git a/addons/website_sale_stock/i18n/website_sale_stock.pot b/addons/website_sale_stock/i18n/website_sale_stock.pot
index 8e39d24ddc8..e71b852e2fc 100644
--- a/addons/website_sale_stock/i18n/website_sale_stock.pot
+++ b/addons/website_sale_stock/i18n/website_sale_stock.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,32 +16,174 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.orders_followup_shipping
+#: model:ir.ui.view,arch_db:website_sale_stock.portal_order_page_shipping
 msgid "<span class=\"label label-danger label-text-align\"><i class=\"fa fa-fw fa-times\"/> Cancelled</span>"
 msgstr ""
 
 #. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.orders_followup_shipping
+#: model:ir.ui.view,arch_db:website_sale_stock.portal_order_page_shipping
 msgid "<span class=\"label label-info label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Preparation</span>"
 msgstr ""
 
 #. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.orders_followup_shipping
+#: model:ir.ui.view,arch_db:website_sale_stock.portal_order_page_shipping
 msgid "<span class=\"label label-success label-text-align\"><i class=\"fa fa-fw fa-truck\"/> Shipped</span>"
 msgstr ""
 
 #. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.orders_followup_shipping
+#: model:ir.ui.view,arch_db:website_sale_stock.portal_order_page_shipping
 msgid "<span class=\"label label-warning label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Partially Available</span>"
 msgstr ""
 
 #. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.orders_followup_shipping
+#: model:ir.ui.view,arch_db:website_sale_stock.portal_order_page_shipping
 msgid "<strong>Delivery Orders</strong>"
 msgstr ""
 
 #. module: website_sale_stock
+#: model:ir.model.fields,help:website_sale_stock.field_product_product_inventory_availability
+#: model:ir.model.fields,help:website_sale_stock.field_product_template_inventory_availability
+msgid "Adds an inventory availability status on the web product page."
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_product_available_threshold
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_template_available_threshold
+#: model:ir.model.fields,field_description:website_sale_stock.field_res_config_settings_available_threshold
+msgid "Availability Threshold"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_product_cart_qty
+msgid "Cart Qty"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_product_custom_message
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_template_custom_message
+msgid "Custom Message"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
+msgid "Default Availability Mode"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
+msgid "Default availability mode set on newly created stockable products. This can be changed at the product level."
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
+msgid "Default threshold"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:16
+#, python-format
+msgid "In stock"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model.fields,field_description:website_sale_stock.field_res_config_settings_inventory_availability
+msgid "Inventory"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_product_inventory_availability
+#: model:ir.model.fields,field_description:website_sale_stock.field_product_template_inventory_availability
+msgid "Inventory Availability"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
+msgid "Manage the inventory of your products and display their availability status on the website."
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model,name:website_sale_stock.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model,name:website_sale_stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model,name:website_sale_stock.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: website_sale_stock
+#: selection:product.template,inventory_availability:0
+#: selection:res.config.settings,inventory_availability:0
+msgid "Sell regardless of inventory"
+msgstr ""
+
+#. module: website_sale_stock
+#: selection:product.template,inventory_availability:0
+#: selection:res.config.settings,inventory_availability:0
+msgid "Show inventory below a threshold and prevent sales if not enough stock"
+msgstr ""
+
+#. module: website_sale_stock
+#: selection:product.template,inventory_availability:0
+#: selection:res.config.settings,inventory_availability:0
+msgid "Show inventory on website and prevent sales if not enough stock"
+msgstr ""
+
+#. module: website_sale_stock
+#: selection:product.template,inventory_availability:0
+#: selection:res.config.settings,inventory_availability:0
+msgid "Show product-specific notifications"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:22
+#, python-format
+msgid "Temporarily out of stock"
+msgstr ""
+
+#. module: website_sale_stock
 #: model:ir.model,name:website_sale_stock.model_website
 msgid "Website"
 msgstr ""
 
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:19
+#, python-format
+msgid "You already added"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:20
+#, python-format
+msgid "all"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:9
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:14
+#, python-format
+msgid "available"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:20
+#, python-format
+msgid "in your cart."
+msgstr ""
+
+#. module: website_sale_stock
+#: model:ir.model,name:website_sale_stock.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
index e4e9981ef56..6b6159efcce 100644
--- a/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
+++ b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:04+0000\n"
-"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index d772228217f..72300117276 100644
--- a/addons/website_slides/i18n/website_slides.pot
+++ b/addons/website_slides/i18n/website_slides.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -251,6 +251,11 @@ msgid "A tag must be unique!"
 msgstr ""
 
 #. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
+msgid "API Key"
+msgstr ""
+
+#. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slide_detail_view
 msgid "Actions"
 msgstr ""
@@ -292,7 +297,7 @@ msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:251
+#: code:addons/website_slides/static/src/js/slides_upload.js:250
 #: code:addons/website_slides/static/src/xml/website_slides.xml:54
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_category_id
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
@@ -323,7 +328,7 @@ msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:171
+#: code:addons/website_slides/static/src/js/slides_upload.js:170
 #, python-format
 msgid "Channel contains the given title, please change before Save or Publish."
 msgstr ""
@@ -359,27 +364,27 @@ msgid "Content Preview"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/controllers/main.py:290
+#: code:addons/website_slides/controllers/main.py:244
 #, python-format
 msgid "Could not fetch data from url. Document or access right not available.\n"
 "Here is the received response: %s"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/models/slides.py:321
+#: code:addons/website_slides/models/slides.py:322
 #, python-format
 msgid "Could not fetch data from url. Document or access right not available:\n"
 "%s"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.website_config_settings_view_form_inherit_website_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
 msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:220
+#: code:addons/website_slides/static/src/js/slides_upload.js:219
 #, python-format
 msgid "Create new tag '%s'"
 msgstr ""
@@ -477,11 +482,6 @@ msgid "Download Security"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Email Address"
-msgstr ""
-
-#. module: website_slides
 #: model:ir.model.fields,help:website_slides.field_slide_channel_publish_template_id
 msgid "Email template to send slide publication through email"
 msgstr ""
@@ -549,8 +549,8 @@ msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/controllers/main.py:300
-#: code:addons/website_slides/static/src/js/slides_upload.js:90
+#: code:addons/website_slides/controllers/main.py:254
+#: code:addons/website_slides/static/src/js/slides_upload.js:89
 #, python-format
 msgid "File is too big. File size cannot exceed 25MB"
 msgstr ""
@@ -566,11 +566,16 @@ msgid "General"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_website_config_settings_website_slide_google_app_key
+#: model:ir.model.fields,field_description:website_slides.field_res_config_settings_website_slide_google_app_key
 msgid "Google Doc Key"
 msgstr ""
 
 #. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
+msgid "Google Drive API Key"
+msgstr ""
+
+#. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_graph
 msgid "Graph of Slides"
 msgstr ""
@@ -615,7 +620,7 @@ msgid "Infographics"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/controllers/main.py:322
+#: code:addons/website_slides/controllers/main.py:276
 #, python-format
 msgid "Internal server error, please try again later or contact administrator.\n"
 "Here is the error message: %s"
@@ -623,7 +628,7 @@ msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:85
+#: code:addons/website_slides/static/src/js/slides_upload.js:84
 #, python-format
 msgid "Invalid file type. Please select pdf or image file"
 msgstr ""
@@ -787,29 +792,19 @@ msgid "Please <a href=\"/web?redirect=%s\">login</a> to vote this slide"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/models/slides.py:324
-#: code:addons/website_slides/models/slides.py:548
+#: code:addons/website_slides/models/slides.py:325
+#: code:addons/website_slides/models/slides.py:545
 #, python-format
 msgid "Please enter valid Youtube or Google Doc URL"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/controllers/main.py:282
+#: code:addons/website_slides/controllers/main.py:236
 #, python-format
 msgid "Please enter valid youtube or google doc url"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Post"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Post comment with email address (confirmation of email is required in order to publish comment on website) or please"
-msgstr ""
-
-#. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_embed_slide_id
 #: selection:slide.slide,slide_type:0
 msgid "Presentation"
@@ -970,6 +965,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:website_slides.field_slide_channel_slide_ids
 #: model:ir.ui.menu,name:website_slides.menu_website_slides_root
 #: model:ir.ui.menu,name:website_slides.submenu_action_slides_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_tree
 msgid "Slides"
 msgstr ""
@@ -991,7 +987,7 @@ msgstr ""
 
 #. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:274
+#: code:addons/website_slides/static/src/js/slides_upload.js:273
 #: code:addons/website_slides/static/src/xml/website_slides.xml:48
 #: model:ir.actions.act_window,name:website_slides.action_slide_tag
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_tag_ids
@@ -1034,7 +1030,7 @@ msgid "This channel is private and its content is restricted to some users."
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/controllers/main.py:286
+#: code:addons/website_slides/controllers/main.py:240
 #, python-format
 msgid "This video already exists in this channel <a target=\"_blank\" href=\"/slides/slide/%s\">click here to view it </a>"
 msgstr ""
@@ -1087,7 +1083,7 @@ msgid "Uncategorized presentation"
 msgstr ""
 
 #. module: website_slides
-#: code:addons/website_slides/models/slides.py:537
+#: code:addons/website_slides/models/slides.py:534
 #, python-format
 msgid "Unknown document"
 msgstr ""
@@ -1169,23 +1165,8 @@ msgid "Website"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_slide_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Write a comment..."
-msgstr ""
-
-#. module: website_slides
 #. openerp-web
-#: code:addons/website_slides/static/src/js/slides_upload.js:115
+#: code:addons/website_slides/static/src/js/slides_upload.js:114
 #, python-format
 msgid "You can not upload password protected file."
 msgstr ""
@@ -1198,11 +1179,6 @@ msgid "You have already voted for this slide"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Your Name"
-msgstr ""
-
-#. module: website_slides
 #. openerp-web
 #: code:addons/website_slides/static/src/xml/website_slides.xml:36
 #, python-format
@@ -1248,14 +1224,13 @@ msgid "is private."
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
 #: model:ir.ui.view,arch_db:website_slides.slide_social_email
 msgid "login"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "on"
+#: model:ir.model,name:website_slides.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: website_slides
@@ -1269,21 +1244,11 @@ msgid "suggest_slide.name"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "to post comment"
-msgstr ""
-
-#. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slide_social_email
 msgid "to send this"
 msgstr ""
 
 #. module: website_slides
-#: model:ir.model,name:website_slides.model_website_config_settings
-msgid "website.config.settings"
-msgstr ""
-
-#. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slide_social_email
 msgid "your-friend@domain.com"
 msgstr ""
diff --git a/addons/website_twitter/i18n/website_twitter.pot b/addons/website_twitter/i18n/website_twitter.pot
index 11e2a54fda6..4c685650553 100644
--- a/addons/website_twitter/i18n/website_twitter.pot
+++ b/addons/website_twitter/i18n/website_twitter.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-09-20 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,64 +21,24 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Twitter Scroller</span>"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "<strong>Callback URL: </strong> leave it blank"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "<strong>Description: </strong> Odoo Tweet Scroller"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "<strong>Name: </strong> Odoo Tweet Scroller"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "<strong>Website: </strong>"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.model.fields,field_description:website_twitter.field_website_config_settings_twitter_api_key
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
+#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_api_key
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "API Key"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.model.fields,field_description:website_twitter.field_website_config_settings_twitter_api_secret
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
+#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_api_secret
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "API secret"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Accept terms of use and click on the Create button at the bottom"
-msgstr ""
-
-#. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:14
+#: code:addons/website_twitter/models/res_config_settings.py:16
 #, python-format
 msgid "Authentication credentials were missing or incorrect. Maybe screen name tweets are protected."
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Close"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Copy/Paste API Key and Secret below"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Create a new Twitter application on"
-msgstr ""
-
-#. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_create_uid
 msgid "Created by"
 msgstr ""
@@ -94,13 +54,8 @@ msgid "Display Name"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Enter the screen name from which you want to load favorite Tweets (does not need to be the same as the API keys)"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.model.fields,field_description:website_twitter.field_website_config_settings_twitter_screen_name
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
+#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_screen_name
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "Favorites From"
 msgstr ""
 
@@ -110,23 +65,18 @@ msgid "Get favorites from this screen name"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:46
+#: code:addons/website_twitter/models/res_config_settings.py:48
 #, python-format
 msgid "HTTP Error: Something is misconfigured"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "How to configure the Twitter API access"
-msgstr ""
-
-#. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_id
 msgid "ID"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:57
+#: code:addons/website_twitter/models/res_config_settings.py:59
 #, python-format
 msgid "Internet connection refused"
 msgstr ""
@@ -147,8 +97,8 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:59
-#: code:addons/website_twitter/models/website_twitter_config.py:60
+#: code:addons/website_twitter/models/res_config_settings.py:61
+#: code:addons/website_twitter/models/res_config_settings.py:62
 #, python-format
 msgid "Please double-check your Twitter API Key and Secret!"
 msgstr ""
@@ -173,7 +123,7 @@ msgid "Reload"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:16
+#: code:addons/website_twitter/models/res_config_settings.py:18
 #, python-format
 msgid "Request cannot be served due to the applications rate limit having been exhausted for the resource."
 msgstr ""
@@ -184,52 +134,47 @@ msgid "Screen Name"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.model.fields,help:website_twitter.field_website_config_settings_twitter_screen_name
+#: model:ir.model.fields,help:website_twitter.field_res_config_settings_twitter_screen_name
 msgid "Screen Name of the Twitter Account from which you want to load favorites.It does not have to match the API Key/Secret."
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.model.fields,field_description:website_twitter.field_website_config_settings_twitter_tutorial
+#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_tutorial
 msgid "Show me how to obtain the Twitter API Key and Secret"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "Switch to the API Keys tab: <br/>"
-msgstr ""
-
-#. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:19
+#: code:addons/website_twitter/models/res_config_settings.py:21
 #, python-format
 msgid "The Twitter servers are up, but overloaded with requests. Try again later."
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:20
+#: code:addons/website_twitter/models/res_config_settings.py:22
 #, python-format
 msgid "The Twitter servers are up, but the request could not be serviced due to some failure within our stack. Try again later."
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:15
+#: code:addons/website_twitter/models/res_config_settings.py:17
 #, python-format
 msgid "The request is understood, but it has been refused or access is not allowed. Please check your Twitter API Key and Secret."
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:13
+#: code:addons/website_twitter/models/res_config_settings.py:15
 #, python-format
 msgid "The request was invalid or cannot be otherwise served. Requests without authentication are considered invalid and will yield this response."
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:12
+#: code:addons/website_twitter/models/res_config_settings.py:14
 #, python-format
 msgid "There was no new data to return."
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "Tutorial"
 msgstr ""
 
@@ -244,6 +189,11 @@ msgid "Tweets"
 msgstr ""
 
 #. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Twitter API Credentials"
+msgstr ""
+
+#. module: website_twitter
 #: model:ir.model.fields,help:website_twitter.field_website_twitter_api_key
 msgid "Twitter API Key"
 msgstr ""
@@ -259,7 +209,7 @@ msgid "Twitter API key"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.model.fields,help:website_twitter.field_website_config_settings_twitter_api_key
+#: model:ir.model.fields,help:website_twitter.field_res_config_settings_twitter_api_key
 msgid "Twitter API key you can get it from https://apps.twitter.com/"
 msgstr ""
 
@@ -269,7 +219,7 @@ msgid "Twitter API secret"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.model.fields,help:website_twitter.field_website_config_settings_twitter_api_secret
+#: model:ir.model.fields,help:website_twitter.field_res_config_settings_twitter_api_secret
 msgid "Twitter API secret you can get it from https://apps.twitter.com/"
 msgstr ""
 
@@ -281,19 +231,24 @@ msgid "Twitter Configuration"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:60
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Twitter Roller"
+msgstr ""
+
+#. module: website_twitter
+#: code:addons/website_twitter/models/res_config_settings.py:62
 #, python-format
 msgid "Twitter authorization error!"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:18
+#: code:addons/website_twitter/models/res_config_settings.py:20
 #, python-format
 msgid "Twitter is down or being upgraded."
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:17
+#: code:addons/website_twitter/models/res_config_settings.py:19
 #, python-format
 msgid "Twitter seems broken. Please retry later. You may consider posting an issue on Twitter forums to get help."
 msgstr ""
@@ -312,8 +267,8 @@ msgid "Twitter: Fetch new favorites"
 msgstr ""
 
 #. module: website_twitter
-#: code:addons/website_twitter/models/website_twitter_config.py:56
-#: code:addons/website_twitter/models/website_twitter_config.py:57
+#: code:addons/website_twitter/models/res_config_settings.py:58
+#: code:addons/website_twitter/models/res_config_settings.py:59
 #, python-format
 msgid "We failed to reach a twitter server."
 msgstr ""
@@ -325,18 +280,8 @@ msgid "Website"
 msgstr ""
 
 #. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "https://apps.twitter.com/"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "https://www.odoo.com"
-msgstr ""
-
-#. module: website_twitter
-#: model:ir.model,name:website_twitter.model_website_config_settings
-msgid "website.config.settings"
+#: model:ir.model,name:website_twitter.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
 #. module: website_twitter
@@ -344,8 +289,3 @@ msgstr ""
 msgid "website.twitter.tweet"
 msgstr ""
 
-#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.website_config_settings_view_form_inherit_website_twitter
-msgid "with the following values:"
-msgstr ""
-
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index 7cc018a6be5..a63a84f6b3f 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-25 10:18+0000\n"
-"PO-Revision-Date: 2017-07-25 10:18+0000\n"
+"POT-Creation-Date: 2017-09-20 09:57+0000\n"
+"PO-Revision-Date: 2017-09-20 09:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,61 +16,24 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base
-#: model:ir.module.module,description:base.module_pos_reprint
+#: model:ir.module.module,description:base.module_l10n_cn
+#: model:ir.module.module,description:base.module_l10n_cn_small_business
 msgid "\n"
 "\n"
-"=======================\n"
-"\n"
-"Allow cashier to reprint receipts\n"
-"\n"
-""
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_pos_sale
-msgid "\n"
-"\n"
-"=======================\n"
-"\n"
-"This module adds a custom Sales Channel for the point of sale to be able to view and manage your point of sale sales with more ease.\n"
-""
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_pos_restaurant
-msgid "\n"
-"\n"
-"=======================\n"
-"\n"
-"This module adds several restaurant features to the Point of Sale:\n"
-"- Bill Printing: Allows you to print a receipt before the order is paid\n"
-"- Bill Splitting: Allows you to split an order into different orders\n"
-"- Kitchen Order Printing: allows you to print orders updates to kitchen or bar printers\n"
-"\n"
-""
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_pos_discount
-msgid "\n"
+"    科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
 "\n"
-"=======================\n"
+"    添加中文省份数据\n"
 "\n"
-"This module allows the cashier to quickly give a percentage\n"
-"sale discount to a customer.\n"
+"    增加小企业会计科目表\n"
 "\n"
-""
+"    "
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_pos_loyalty
+#: model:ir.module.module,description:base.module_pos_reprint
 msgid "\n"
 "\n"
-"=======================\n"
-"\n"
-"This module allows you to define a loyalty program in\n"
-"the point of sale, where the customers earn loyalty points\n"
-"and get rewards.\n"
+"Allow cashier to reprint receipts\n"
 "\n"
 ""
 msgstr ""
@@ -186,7 +149,7 @@ msgstr ""
 msgid "\n"
 "\n"
 "Revenue recognitions\n"
-"===================\n"
+"====================\n"
 "Manage revenue recognitions on product sales.\n"
 "Keeps track of the revenue recognition installments, and creates corresponding journal entries.\n"
 "\n"
@@ -194,7 +157,7 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:332
+#: code:addons/base/res/res_config.py:315
 #, python-format
 msgid "\n"
 "\n"
@@ -202,6 +165,47 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_pos_sale
+msgid "\n"
+"\n"
+"This module adds a custom Sales Channel for the point of sale to be able to view and manage your point of sale sales with more ease.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pos_restaurant
+msgid "\n"
+"\n"
+"This module adds several restaurant features to the Point of Sale:\n"
+"- Bill Printing: Allows you to print a receipt before the order is paid\n"
+"- Bill Splitting: Allows you to split an order into different orders\n"
+"- Kitchen Order Printing: allows you to print orders updates to kitchen or bar printers\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pos_discount
+msgid "\n"
+"\n"
+"This module allows the cashier to quickly give a percentage\n"
+"sale discount to a customer.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pos_loyalty
+msgid "\n"
+"\n"
+"This module allows you to define a loyalty program in\n"
+"the point of sale, where the customers earn loyalty points\n"
+"and get rewards.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_l10n_be_invoice_bba
 msgid "\n"
 "    \n"
@@ -227,6 +231,14 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_helpdesk_timesheet
+msgid "\n"
+"        - Allow to set project for Helpdesk team\n"
+"        - Track timesheet for task from ticket\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_account_tax_python
 msgid "\n"
 "        A tax defined as python code consists in two snippets of python code which are executed in a local environment containing data such as the unit price, product or partner.\n"
@@ -259,6 +271,15 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_de_reports
+msgid "\n"
+"        Accounting reports for Deutschland\n"
+"        Contains Balance sheet, Profit and Loss, VAT and Partner VAT reports\n"
+"        Also add DATEV export options to general ledger\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_l10n_hu_reports
 msgid "\n"
 "        Accounting reports for Hungarian\n"
@@ -308,6 +329,13 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_us_reports
+msgid "\n"
+"        Accounting reports for US\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_l10n_uy_reports
 msgid "\n"
 "        Accounting reports for Uruguay\n"
@@ -325,15 +353,23 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_voip
+msgid "\n"
+"        Allow to make call from next activities or with click-to-dial.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_account_tax_python
 msgid "\n"
 "        Allows to use python code to define taxes"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm_voip
+#: model:ir.module.module,description:base.module_helpdesk_sale_timesheet
 msgid "\n"
-"        Automate calls transfers, logs and emails"
+"        Bill timesheets logged on helpdesk tickets.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -390,30 +426,21 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm_voip
-msgid "\n"
-"        Long description of module's purpose\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense_check
+#: model:ir.module.module,summary:base.module_voip
 msgid "\n"
-"        Print amount in words on checks issued for expenses\n"
-"    "
+"        Make Call from all modules using the VOIP system."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_voip
+#: model:ir.module.module,summary:base.module_website_quote_subscription
 msgid "\n"
-"        Technical core for all the modules using the VOIP system."
+"        Online Quotes for subscriptions products"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_voip
+#: model:ir.module.module,description:base.module_hr_expense_check
 msgid "\n"
-"        Technical core for all the modules using the VOIP system. \n"
-"        Contains the library needed in order to make the VOIP usable by other modules.\n"
+"        Print amount in words on checks issued for expenses\n"
 "    "
 msgstr ""
 
@@ -428,51 +455,51 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock_calendar
+#: model:ir.module.module,description:base.module_delivery_barcode
 msgid "\n"
-"        The stock_calendar module handles minimum stock rules (=orderpoints / reordering rules) differently by\n"
-"        the possibility to take into account the purchase and delivery calendars.\n"
-"\n"
-"        Normally, the scheduler will go through all orderpoints and will create a procurement with a quantity taking\n"
-"        into account the current stock and all future stock moves.  For companies working with fresh products, this is\n"
-"        a problem, because if you order the products needed over 2 weeks now and they arrive tomorrow, then\n"
-"        these products won't be fresh anymore in two weeks.\n"
-"\n"
-"        To solve this, we added a delivery calendar to the orderpoint.  The future stock moves (they represent the needs)\n"
-"        taken into account will be limited to those until the second delivery according to the calendar.\n"
-"        So if I am delivered every week on Tuesday and on Friday, when I order on Monday, I will be delivered on Tuesday\n"
-"        with all what is needed until Friday.\n"
-"\n"
-"        This however is not good enough as you want to create a purchase order only before the date of the delivery as the\n"
-"        future needs might change.  (otherwise you could have ordered too much already)  For this, we added a\n"
-"        purchase calendar and the orderpoint will only be triggered when the scheduler is run within the time specified\n"
-"        by the purchase calendar.  (a last execution date will also check if it has not already been triggered within this time)\n"
-"\n"
-"        However, sometimes we have double orders: suppose we need to order twice on Friday: a purchase order for Monday\n"
-"        and a purchase order for Tuesday.  Then we need to have two orders at the same time.\n"
-"        To handle this, we put a procurement group on the calendar line and for the purchase calendar line we need to do,\n"
-"        we will check the corresponding delivery line.  On the procurement group, we can tell to propagate itself to the purchase\n"
-"        and this way it is possible to have an order for Monday and one for Tuesday.\n"
-"\n"
-"        With normal orderpoints, the dates put on the purchase order are based on the delays in the system for the product/company.\n"
-"        This does not correspond to what is done with the calendars, so the purchase/delivery dates will be set according to the calendars also.\n"
-"\n"
-"        The calendars we use are on weekly basis.  It is possible however to have a start date and end date for e.g. the Tuesday delivery.\n"
-"        It is also possible to put exceptions for days when there is none.\n"
+"        This module adds support for barcodes scanning to the delivery packages.\n"
 "    "
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_delivery_barcode
+#: model:ir.module.module,description:base.module_stock_barcode
 msgid "\n"
-"        This module adds support for barcodes scanning to the delivery packages.\n"
+"        This module adds support for barcodes scanning to the warehouse management system.\n"
 "    "
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock_barcode
+#: model:ir.module.module,description:base.module_account_sepa_direct_debit
 msgid "\n"
-"        This module adds support for barcodes scanning to the warehouse management system.\n"
+"        This module enables the generation of SEPA Direct Debit (SDD)-compliant XML files (consistent\n"
+"        with pain.008.001.02 specification) to send to your bank in order to\n"
+"        collect a set of payments.\n"
+"\n"
+"        To be elligible for this payment method, a customer must have first\n"
+"        returned a mandate to the company, giving his consent to use direct debit.\n"
+"        This consent must have been encoded as a 'customer mandate' into Odoo.\n"
+"\n"
+"        You also need to meet the following requirements in order to properly\n"
+"        generate a SDD file:\n"
+"        - Your company account must be set to a valid IBAN number\n"
+"        - Your company account must be associated to a bank having a valid BIC\n"
+"        - Your company must have been given a creditor identifier (this can be done in the 'settings' menu of the accounting module)\n"
+"        - Your company must have defined a journal to receive SDD payments (again, in 'settings' of accounting module)\n"
+"        - Every customer for which you generate a payment must have a valid IBAN account number in a bank associated with a correct BIC.\n"
+"\n"
+"        Odoo will let you know if any of these requirements are not satisfied.\n"
+"\n"
+"        Any invoice that gets validated for a customer with a mandate will be\n"
+"        automatically set in 'paid' state, and a payment will be generated. An\n"
+"        option in the dashboard will then allow you to view all the payments generated\n"
+"        via SDD and to generate a XML collection file for them, grouping them as\n"
+"        you see fit.\n"
+"\n"
+"        A dedicated 'SEPA Direct Debit' payment method is also available for\n"
+"        open invoices, when selecting a bank account in the 'register payment' wizard.\n"
+"        Use it to generate a SDD payment for the invoices if you added a mandate\n"
+"        for its owner after its validation. You will see an error message if you\n"
+"        try to use this method on an invoice for whose payment no mandate can be used.\n"
 "    "
 msgstr ""
 
@@ -646,17 +673,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_contract_dashboard
-msgid "\n"
-"Accounting Contract Dashboard\n"
-"========================\n"
-"It adds dashboards to :\n"
-"1) Analyse the recurrent revenue and other metrics for contracts\n"
-"2) Analyse the contracts modifications by salesman and compute their value.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
 msgid "\n"
 "Accounting Data for Belgian Payroll Rules.\n"
@@ -668,7 +684,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_account_reports
 msgid "\n"
 "Accounting Reports\n"
-"====================\n"
+"==================\n"
 "    "
 msgstr ""
 
@@ -707,20 +723,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_de_skr03_reports
-msgid "\n"
-"Accounting reports for Deutschland\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_de_skr04_reports
-msgid "\n"
-"Accounting reports for Deutschland SKR04\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_l10n_et_reports
 msgid "\n"
 "Accounting reports for Ethiopia\n"
@@ -767,7 +769,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_l10n_lu_reports
 msgid "\n"
 "Accounting reports for Luxembourg\n"
-"================================\n"
+"=================================\n"
 "    "
 msgstr ""
 
@@ -859,21 +861,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_project_issue_sheet
-msgid "\n"
-"Add timesheet support on issue in the frontend.\n"
-"==================================================================================================\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_website_portal_sale
-msgid "\n"
-"Add your sales document in the frontend portal. Your customers will be able to connect to their portal to see the list (and the state) of their invoices (pdf report), sales orders and quotations (web pages).\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_product_margin
 msgid "\n"
 "Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.\n"
@@ -943,9 +930,18 @@ msgid "\n"
 "Allows canceling accounting entries.\n"
 "====================================\n"
 "\n"
-"This module adds 'Allow Canceling Entries' field on form view of account journal.\n"
-"If set to true it allows user to cancel entries & invoices.\n"
-"    "
+"This module adds a checkbox on the accounting journals to allow the cancellation of journal entries.\n"
+"\n"
+"This checkbox is only visible on the accounting journals when the debug mode is active.\n"
+"\n"
+"If this checkbox is set to TRUE, it allows users to cancel journal entries.\n"
+"\n"
+"The accounting entry that is cancelled can then be modified and reposted or deleted.\n"
+"\n"
+"It also operates on invoices, bank statements, payments ...\n"
+"\n"
+"Be careful with this module as it has audit implications. Cancelling accounting entries is not authorized in all countries.\n"
+""
 msgstr ""
 
 #. module: base
@@ -972,13 +968,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_portal
-msgid "\n"
-"Allows your customers to manage their account from a beautiful web interface.\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_mrp_account
 msgid "\n"
 "Analytic Accounting in MRP\n"
@@ -1065,6 +1054,16 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_base_vat_autocomplete
+msgid "\n"
+"Auto-Complete Addresses based on VAT numbers\n"
+"============================================\n"
+"\n"
+"    This module requires the python library stdnum to work.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_base_gengo
 msgid "\n"
 "Automated Translations through Gengo API\n"
@@ -1171,7 +1170,7 @@ msgid "\n"
 "    * Allow to configure Basic/Gross/Net Salary\n"
 "    * Employee Payslip\n"
 "    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
+"    * Integrated with Leaves Management\n"
 "    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
 "    "
 msgstr ""
@@ -1209,9 +1208,16 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_rating
+msgid "\n"
+"Bridge module for rating on website stuff.\n"
+"        "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_project_timesheet_holidays
 msgid "\n"
-"Bridge module to integrate holidays in timesheet\n"
+"Bridge module to integrate leaves in timesheet\n"
 "================================================\n"
 "\n"
 "This module allows to automatically log timesheets when employees are\n"
@@ -1228,28 +1234,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mail
-msgid "\n"
-"Business oriented Social Networking\n"
-"===================================\n"
-"The Social Networking module provides a unified social network abstraction layer allowing applications to display a complete\n"
-"communication history on documents with a fully-integrated email and message management system.\n"
-"\n"
-"It enables the users to read and send messages as well as emails. It also provides a feeds page combined to a subscription mechanism that allows to follow documents and to be constantly updated about recent news.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Clean and renewed communication history for any Odoo document that can act as a discussion topic\n"
-"* Subscription mechanism to be updated about new messages on interesting documents\n"
-"* Unified feeds page to see recent messages and activity on followed documents\n"
-"* User communication through the feeds page\n"
-"* Threaded discussion design on documents\n"
-"* Relies on the global outgoing mail server - an integrated email management system - allowing to send emails with a configurable scheduler-based processing engine\n"
-"* Includes an extensible generic email composition assistant, that can turn into a mass-mailing assistant and is capable of interpreting simple *placeholder expressions* that will be replaced with dynamic data when each email is actually sent.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_crm_phone_validation
 msgid "\n"
 "CRM Phone Numbers Validation\n"
@@ -1362,13 +1346,20 @@ msgid "\n"
 "Contact Number Validation on Website\n"
 "====================================\n"
 "\n"
-"Validate contact (phone,mobile,fax) numbers and normalize them on leads and contacts:\n"
+"Validate contact (phone,mobile) numbers and normalize them on leads and contacts:\n"
 "- use the national format for your company country\n"
 "- use the international format for all others\n"
 "        "
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_account
+msgid "\n"
+"Core mechanisms for the accounting modules. To display the menuitems, install the module account_invoicing.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_survey
 msgid "\n"
 "Create beautiful web surveys and visualize answers\n"
@@ -1395,7 +1386,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_event_sale
 msgid "\n"
 "Creating registration with sales orders.\n"
-"=======================================\n"
+"========================================\n"
 "\n"
 "This module allows you to automate and connect your registration creation with\n"
 "your main sale flow and therefore, to enable the invoicing feature of registrations.\n"
@@ -1449,16 +1440,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
-msgid "\n"
-"Demo data for the module marketing_campaign.\n"
-"============================================\n"
-"\n"
-"Creates demo data like leads, campaigns and segments for the module marketing_campaign.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_mass_mailing_themes
 msgid "\n"
 "Design gorgeous mails\n"
@@ -1487,14 +1468,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_project_timesheet
-msgid "\n"
-"Display Timesheet on Task in the Website Portal\n"
-"===============================================\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_website_twitter
 msgid "\n"
 "Display best tweets\n"
@@ -1504,10 +1477,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_portal_purchase
+#: model:ir.module.module,description:base.module_website_sale_management
 msgid "\n"
-"Display purchase orders on your website. Customers will be able to access their purchase orders in their own portal, see their state and communicate with salesmen.\n"
-"        "
+"Display orders to invoice in website dashboard.\n"
+""
 msgstr ""
 
 #. module: base
@@ -1594,15 +1567,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mass_mailing
-msgid "\n"
-"Easily send mass mailing to your leads, opportunities or customers. Track\n"
-"marketing campaigns performance to improve conversion rates. Design\n"
-"professional emails and reuse templates in a few clicks.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_utm
 msgid "\n"
 "Enable UTM trackers in shared links.\n"
@@ -1740,23 +1704,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_hr_payroll
-msgid "\n"
-"Generic Payroll system.\n"
-"=======================\n"
-"\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances/Deductions\n"
-"    * Allow to configure Basic/Gross/Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_mail_push
 msgid "\n"
 "Google Firebase Messaging Integration\n"
@@ -1805,30 +1752,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_hr_timesheet_sheet_timesheet_grid
-msgid "\n"
-"Hide hr_timesheet_sheet menu items.\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_hr
-msgid "\n"
-"Human Resources Management\n"
-"==========================\n"
-"\n"
-"This application enables you to manage important aspects of your company's staff and other details such as their skills, contacts, working time...\n"
-"\n"
-"\n"
-"You can manage:\n"
-"---------------\n"
-"* Employees and hierarchies : You can define your employee with User and display hierarchies\n"
-"* HR Departments\n"
-"* HR Jobs\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_base_import_module
 msgid "\n"
 "Import a custom data module\n"
@@ -1902,7 +1825,7 @@ msgid "\n"
 "    * Allow to configure Basic / Gross / Net Salary\n"
 "    * Employee PaySlip\n"
 "    * Allowance / Deduction\n"
-"    * Integrated with Holiday Management\n"
+"    * Integrated with Leaves Management\n"
 "    * Medical Allowance, Travel Allowance, Child Allowance, ...\n"
 "    - Payroll Advice and Report\n"
 "    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
@@ -1931,7 +1854,7 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account
+#: model:ir.module.module,description:base.module_account_invoicing
 msgid "\n"
 "Invoicing & Payments\n"
 "====================\n"
@@ -1951,12 +1874,26 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm_project_issue
+#: model:ir.module.module,description:base.module_website_crm_score
 msgid "\n"
-"Lead to Issues\n"
-"==============\n"
+"Lead Scoring\n"
+"============\n"
 "\n"
-"Link module to map leads to issues\n"
+"This module allows you to...\n"
+"    - Track specific page view on your website.\n"
+"    - Assign score on lead: sort your lead automatically and consider the more important at first.\n"
+"    - Assign lead to salesteams: define your own filters and sort automatically your leads by saleteam.\n"
+"    - Assign lead to salesmen: define filter by saleman and dispatch automatically your leads to the right saleman.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_project
+msgid "\n"
+"Lead to Tasks\n"
+"=============\n"
+"\n"
+"Link module to map leads to tasks\n"
 "        "
 msgstr ""
 
@@ -1998,6 +1935,31 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_account_3way_match
+msgid "\n"
+"Manage 3-way matching on vendor bills\n"
+"=====================================\n"
+"\n"
+"In the manufacturing industry, people often receive the vendor bills before\n"
+"receiving their purchase, but they don't want to pay the bill until the goods\n"
+"have been delivered.\n"
+"\n"
+"The solution to this situation is to create the vendor bill when you get it\n"
+"(based on ordered quantities) but only pay the invoice when the received\n"
+"quantities (on the PO lines) match the recorded vendor bill.\n"
+"\n"
+"This module introduces a \"release to pay\" mechanism that marks for each vendor\n"
+"bill whether it can be paid or not.\n"
+"\n"
+"Each vendor bill receives one of the following three states:\n"
+"\n"
+"    - Yes (The bill can be paid)\n"
+"    - No (The bill cannot be paid, nothing has been delivered yet)\n"
+"    - Exception (Received and invoiced quantities differ)\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_stock_dropshipping
 msgid "\n"
 "Manage drop shipping orders\n"
@@ -2037,40 +1999,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_purchase
-msgid "\n"
-"Manage goods requirement by Purchase Orders easily\n"
-"==================================================\n"
-"\n"
-"Purchase management enables you to track your vendors' price quotations and convert them into purchase orders if necessary.\n"
-"Odoo has several methods of monitoring invoices and tracking the receipt of ordered goods. You can handle partial deliveries in Odoo, so you can keep track of items that are still to be delivered in your orders, and you can issue reminders automatically.\n"
-"\n"
-"Odoo's replenishment management rules enable the system to generate draft purchase orders automatically, or you can configure it to run a lean process driven entirely by current production needs.\n"
-"\n"
-"Dashboard / Reports for Purchase Management will include:\n"
-"---------------------------------------------------------\n"
-"* Request for Quotations\n"
-"* Purchase Orders Waiting Approval\n"
-"* Monthly Purchases by Category\n"
-"* Receipt Analysis\n"
-"* Purchase Analysis\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid "\n"
-"Manage job positions and the recruitment process\n"
-"================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to <jobs@yourcompany.com> in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it may integrated with the survey module to allow you to define interviews for different jobs.		\n"
-"You can define the different phases of interviews and easily rate the applicant from the kanban view.\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_hr_holidays
 msgid "\n"
 "Manage leave requests and allocations\n"
@@ -2091,37 +2019,7 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid "\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location structure, from warehouses to storage bins.\n"
-"The double entry inventory system allows you to manage customers, vendors as well as manufacturing inventories.\n"
-"\n"
-"Odoo has the capacity to manage lots and serial numbers ensuring compliance with the traceability requirements imposed by the majority of industries.\n"
-"\n"
-"Key Features\n"
-"------------\n"
-"* Moves history and planning,\n"
-"* Minimum stock rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Serial Numbers, Packages, ...)\n"
-"\n"
-"Dashboard / Reports for Inventory Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_sale
+#: model:ir.module.module,description:base.module_sale_management
 msgid "\n"
 "Manage sales quotations and orders\n"
 "==================================\n"
@@ -2180,33 +2078,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp
-msgid "\n"
-"Manage the Manufacturing process in Odoo\n"
-"===========================================\n"
-"\n"
-"The manufacturing module allows you to cover planning, ordering, stocks and the manufacturing or assembly of products from raw materials and components. It handles the consumption and production of products according to a bill of materials and the necessary operations on machinery, tools or human resources according to routings.\n"
-"\n"
-"It supports complete integration and planification of stockable goods, consumables or services. Services are completely integrated with the rest of the software. For instance, you can set up a sub-contracting service in a bill of materials to automatically purchase on order the assembly of your production.\n"
-"\n"
-"Key Features\n"
-"------------\n"
-"* Make to Stock/Make to Order\n"
-"* Multi-level bill of materials, no limit\n"
-"* Multi-level routing, no limit\n"
-"* Routings and work center integrated with analytic accounting\n"
-"* Periodical scheduler computation\n"
-"* Allows to browse bills of materials in a complete structure that includes child and phantom bills of materials\n"
-"\n"
-"Dashboard / Reports for MRP will include:\n"
-"-----------------------------------------\n"
-"* Procurements in Exception (Graph)\n"
-"* Stock Value Variation (Graph)\n"
-"* Work Order Analysis\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_mass_mailing_event
 msgid "\n"
 "Mass mail event attendees\n"
@@ -2264,7 +2135,7 @@ msgid "\n"
 " - Minimal chart of account tested in production environments.\n"
 " - Minimal chart of taxes, to comply with SAT_ requirements.\n"
 "\n"
-".. SAT: http://www.sat.gob.mx/\n"
+".. _SAT: http://www.sat.gob.mx/\n"
 "    "
 msgstr ""
 
@@ -2293,6 +2164,14 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_mail
+msgid "\n"
+"Module holding mail improvements for website.\n"
+"It is responsible of comments moderation for published documents (forum, slides, blog, ...)\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_account_reports_followup
 msgid "\n"
 "Module to automate letters for unpaid invoices, with multi-level recalls.\n"
@@ -2420,15 +2299,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_sale_expense
+#: model:ir.module.module,description:base.module_voip_onsip
 msgid "\n"
-"Module used for demo data\n"
-"=========================\n"
-"\n"
-"Create some products for which you can re-invoice the costs.\n"
-"This module does not add any feature, despite a few demo data to\n"
-"test the features easily.\n"
-""
+"Module with the required configuration to connect to OnSIP.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -2482,21 +2356,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_blog
-msgid "\n"
-"Odoo Blog\n"
-"============\n"
-"\n"
-"        "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_website_crm
-#: model:ir.module.module,description:base.module_website_hr_recruitment
-#: model:ir.module.module,description:base.module_website_issue
+#: model:ir.module.module,description:base.module_website_form_project
 msgid "\n"
 "Odoo Contact Form\n"
-"====================\n"
+"=================\n"
 "\n"
 "        "
 msgstr ""
@@ -2510,7 +2373,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_sale
 #: model:ir.module.module,description:base.module_website_sale_options
 msgid "\n"
 "Odoo E-Commerce\n"
@@ -2520,6 +2382,15 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_sale_stock_options
+msgid "\n"
+"Odoo E-Commerce\n"
+"==================\n"
+"Adds stock limitations on products options.\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_web_enterprise
 msgid "\n"
 "Odoo Enterprise Web Client.\n"
@@ -2549,15 +2420,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_quote
-msgid "\n"
-"Odoo Sale Quote Roller\n"
-"=========================\n"
-"\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_web_editor
 msgid "\n"
 "Odoo Web Editor widget.\n"
@@ -2586,15 +2448,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website
-msgid "\n"
-"Odoo Website CMS\n"
-"===================\n"
-"\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_website_google_map
 msgid "\n"
 "Odoo Website Google Map\n"
@@ -2627,22 +2480,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_event_track
-msgid "\n"
-"Online Advanced Events\n"
-"======================\n"
-"\n"
-"Adds support for:\n"
-"- sponsors\n"
-"- dedicated menu per event\n"
-"- news per event\n"
-"- tracks\n"
-"- agenda\n"
-"- call for proposals\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_website_event_sale
 msgid "\n"
 "Online Event's Tickets\n"
@@ -2652,13 +2489,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_event
-msgid "\n"
-"Online Events\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_web_gantt
 msgid "\n"
 "OpenERP Web Gantt chart view.\n"
@@ -2753,7 +2583,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_hr_appraisal
 msgid "\n"
 "Periodical Employees appraisal\n"
-"==============================================\n"
+"==============================\n"
 "\n"
 "By using this application you can maintain the motivational process by doing periodical appraisals of your employees performance. The regular assessment of human resources can benefit your people as well your organization.\n"
 "\n"
@@ -2856,6 +2686,14 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_http_routing
+msgid "\n"
+"Proposes advanced routing options not available in web or base to keep\n"
+"base modules simple.\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_website_crm_partner_assign
 msgid "\n"
 "Publish and Assign Partner\n"
@@ -2867,7 +2705,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_sale_ebay
 msgid "\n"
 "Publish your products on eBay\n"
-"==============================================================\n"
+"=============================\n"
 "\n"
 "The eBay integrator gives you the opportunity to manage your Odoo's products on eBay.\n"
 "\n"
@@ -2897,56 +2735,14 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid "\n"
-"Quick and Easy sale process\n"
-"===========================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment methods.\n"
-"\n"
-"Product selection can be done in several ways:\n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_hr_timesheet_sheet
+#: model:ir.module.module,description:base.module_sale_expense
 msgid "\n"
-"Record and validate timesheets and attendances easily\n"
-"=====================================================\n"
-"\n"
-"This application supplies a new screen enabling you to manage your work encoding (timesheet) by period. Timesheet entries are made by employees each day. At the end of the defined period, employees validate their sheet and the manager must then approve his team's entries. Periods are defined in the company forms and you can set them to run monthly or weekly.\n"
-"\n"
-"The complete timesheet validation process is:\n"
-"---------------------------------------------\n"
-"* Draft sheet\n"
-"* Confirmation at the end of the period by the employee\n"
-"* Validation by the project manager\n"
+"Reinvoice Employee Expense\n"
+"==========================\n"
 "\n"
-"The validation can be configured in the company:\n"
-"------------------------------------------------\n"
-"* Period size (Day, Week, Month)\n"
-"* Maximal difference between timesheet and attendances\n"
-"    "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_report
-msgid "\n"
-"Report\n"
-"        "
+"Create some products for which you can re-invoice the costs.\n"
+"This module allow to reinvoice employee expense, by setting the SO directly on the expense.\n"
+""
 msgstr ""
 
 #. module: base
@@ -2982,6 +2778,17 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_sale_subscription_dashboard
+msgid "\n"
+"Sale Subscription Dashboard\n"
+"===========================\n"
+"It adds dashboards to :\n"
+"1) Analyse the recurrent revenue and other metrics for subscriptions\n"
+"2) Analyse the subscriptions modifications by salesman and compute their value.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_hw_screen
 msgid "\n"
 "Screen Driver\n"
@@ -3001,6 +2808,19 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_delivery_bpost
+msgid "\n"
+"Send your shippings through bpost and track them online\n"
+"=======================================================\n"
+"\n"
+"Companies located in Belgium can take advantage of shipping with the\n"
+"local Post company.\n"
+"\n"
+"See: https://www.bpost.be/portal/goHome\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
 msgid "\n"
 "Set default values for your analytic accounts.\n"
@@ -3072,8 +2892,9 @@ msgid "\n"
 "        * Spanish general chart of accounts 2008 for small and medium companies\n"
 "        * Spanish general chart of accounts 2008 for associations\n"
 "    * Defines templates for sale and purchase VAT\n"
-"    * Defines tax code templates\n"
+"    * Defines tax templates\n"
 "    * Defines fiscal positions for spanish fiscal legislation\n"
+"    * Defines tax reports mod 111, 115 and 303\n"
 ""
 msgstr ""
 
@@ -3106,6 +2927,16 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_quote_subscription
+msgid "\n"
+"Subscription integration  the Online Quotes\n"
+"-------------------------------------------\n"
+"\n"
+"Categorize the lines per subscription template when an online quote contains subscription products.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_survey_crm
 msgid "\n"
 "Survey - CRM (bridge module)\n"
@@ -3150,7 +2981,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_project_timesheet_synchro
 msgid "\n"
 "Synchronization of timesheet entries with the external timesheet application.\n"
-"====================================================================\n"
+"=============================================================================\n"
 "\n"
 "If you use the external timesheet application, this module alows you to synchronize timesheet entries between Odoo and the application.\n"
 "    "
@@ -3214,30 +3045,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid "\n"
-"The generic Odoo Customer Relationship Management\n"
-"====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently manage leads, opportunities, meetings and activities.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.\n"
-"\n"
-"Odoo ensures that all cases are successfully tracked by users, customers and vendors. It can automatically send reminders, trigger specific methods and many other actions based on your own enterprise rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and Odoo. That way, users can just send emails to the request tracker.\n"
-"\n"
-"Odoo will take care of thanking them for their message, automatically routing it to the appropriate staff and make sure all future correspondence gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_base
 msgid "\n"
 "The kernel of Odoo, needed for all installation.\n"
@@ -3262,14 +3069,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_google_calendar
-msgid "\n"
-"The module adds the possibility to synchronize Google Calendar with Odoo\n"
-"===========================================================================\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_pos_cache
 msgid "\n"
 "This creates a product cache per POS config. It drastically lowers the\n"
@@ -3456,31 +3255,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_procurement
-msgid "\n"
-"This is the module for computing Procurements.\n"
-"==============================================\n"
-"\n"
-"This procurement module only depends on the product module and is not useful\n"
-"on itself.  Procurements represent needs that need to be solved by a procurement\n"
-"rule.  When a procurement is created, it is confirmed.  When a rule is found,\n"
-"it will be put in running state.  After, it will check if what needed to be done\n"
-"for the rule has been executed.  Then it will go to the done state.  A procurement\n"
-"can also go into exception, for example when it can not find a rule and it can be cancelled.\n"
-"\n"
-"The mechanism will be extended by several modules.  The procurement rule of stock will\n"
-"create a move and the procurement will be fulfilled when the move is done.\n"
-"The procurement rule of sale_service will create a task.  Those of purchase or\n"
-"mrp will create a purchase order or a manufacturing order.\n"
-"\n"
-"The scheduler will check if it can assign a rule to confirmed procurements and if\n"
-"it can put running procurements to done.\n"
-"\n"
-"Procurements in exception should be checked manually and can be re-run.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_l10n_ro
 msgid "\n"
 "This is the module to manage the Accounting Chart, VAT structure, Fiscal Position and Tax Mapping.\n"
@@ -3591,6 +3365,14 @@ msgid "\n"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_test_main_flows
+msgid "\n"
+"This mobule will test the main workflow of Odoo.\n"
+"It will install some main apps and will try to execute the most important actions.\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_rating_project
 msgid "\n"
 "This module Allows a customer to give rating on Project.\n"
@@ -3621,11 +3403,16 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_project_issue
+#: model:ir.module.module,description:base.module_portal
 msgid "\n"
-"This module adds project issues inside your account's page on website if project_issue and website_portal are installed.\n"
-"==================================================================================================\n"
-"    "
+"This module adds required base code for a fully integrated customer portal.\n"
+"It contains the base controller class and base templates. Business addons\n"
+"will add their specific templates and controllers to extend the customer\n"
+"portal.\n"
+"\n"
+"This module contains most code coming from odoo v10 website_portal. Purpose\n"
+"of this module is to allow the display of a customer portal without having\n"
+"a dependency towards website edition and customization capabilities."
 msgstr ""
 
 #. module: base
@@ -3674,20 +3461,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_project_issue_sheet
-msgid "\n"
-"This module adds the Timesheet support for the Issues/Bugs Management in Project.\n"
-"=================================================================================\n"
-"\n"
-"Worklogs can be maintained to signify number of hours spent by users to handle an issue.\n"
-"                "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_stock_picking_wave
+#: model:ir.module.module,description:base.module_stock_picking_batch
 msgid "\n"
-"This module adds the picking wave option in warehouse management\n"
-"================================================================\n"
+"This module adds the batch picking option in warehouse management\n"
+"=================================================================\n"
 "    "
 msgstr ""
 
@@ -3703,13 +3480,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_rating_project_issue
-msgid "\n"
-"This module allows a customer to give rating on Project Issue.\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_sale_service_rating
 msgid "\n"
 "This module allows a customer to give rating on task which are created from sales order.\n"
@@ -3780,22 +3550,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note
-msgid "\n"
-"This module allows users to create their own notes inside Odoo\n"
-"=================================================================\n"
-"\n"
-"Use notes to write meeting minutes, organize ideas, organize personal todo\n"
-"lists, etc. Each user manages his own personal Notes. Notes are available to\n"
-"their authors only, but they can share notes to others users so that several\n"
-"people can work on the same note in real time. It's very efficient to share\n"
-"meeting minutes.\n"
-"\n"
-"Notes can be found in the 'Home' menu.\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_anonymization
 msgid "\n"
 "This module allows you to anonymize a database.\n"
@@ -3830,9 +3584,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_sale_contract
+#: model:ir.module.module,description:base.module_sale_subscription
 msgid "\n"
 "This module allows you to manage subscriptions.\n"
+"\n"
 "Features:\n"
 "    - Create & edit subscriptions\n"
 "    - Modify subscriptions with sales orders\n"
@@ -3879,17 +3634,24 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_sale_contract_asset
+#: model:ir.module.module,description:base.module_sale_subscription_asset
 msgid "\n"
-"This module allows you to set a deferred revenue on your subscription contracts.\n"
+"This module allows you to set a deferred revenue on your subscriptions.\n"
 ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_rating_project_issue
+#: model:ir.module.module,description:base.module_sale
+msgid "\n"
+"This module contains all the common features of Sales Management and eCommerce.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_website_rating_project
 msgid "\n"
 "This module display project customer satisfaction on your website.\n"
-"==================================================================================================\n"
+"==================================================================\n"
 "    "
 msgstr ""
 
@@ -3990,7 +3752,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_purchase_mrp
 msgid "\n"
 "This module provides facility to the user to install mrp and purchase modules at a time.\n"
-"====================================================================================\n"
+"========================================================================================\n"
 "\n"
 "It is basically used when we want to keep track of production orders generated\n"
 "from purchase order.\n"
@@ -4009,34 +3771,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing_campaign
-msgid "\n"
-"This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).\n"
-"=========================================================================================================================================\n"
-"\n"
-"The campaigns are dynamic and multi-channels. The process is as follows:\n"
-"------------------------------------------------------------------------\n"
-"    * Design marketing campaigns like workflows, including email templates to\n"
-"      send, reports to print and send by email, custom actions\n"
-"    * Define input segments that will select the items that should enter the\n"
-"      campaign (e.g leads from certain countries.)\n"
-"    * Run your campaign in simulation mode to test it real-time or accelerated,\n"
-"      and fine-tune it\n"
-"    * You may also start the real campaign in manual mode, where each action\n"
-"      requires manual validation\n"
-"    * Finally launch your campaign live, and watch the statistics as the\n"
-"      campaign does everything fully automatically.\n"
-"\n"
-"While the campaign runs you can of course continue to fine-tune the parameters,\n"
-"input segments, workflow.\n"
-"\n"
-"**Note:** If you need demo data, you can install the marketing_campaign_crm_demo\n"
-"      module, but this will also install the CRM application as it depends on\n"
-"      CRM Leads.\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_l10n_at
 #: model:ir.module.module,description:base.module_l10n_at_reports
 msgid "\n"
@@ -4061,7 +3795,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_procurement_jit
 msgid "\n"
 "This module will automatically reserve the picking from stock when a sales order is confirmed\n"
-"============================================================================================\n"
+"=============================================================================================\n"
 "Upon confirmation of a sales order or when quantities are added,\n"
 "the picking that reserves from stock will be reserved if the\n"
 "necessary quantities are available.\n"
@@ -4077,21 +3811,18 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_kanban_gauge
+#: model:ir.module.module,description:base.module_website_delivery_ups
 msgid "\n"
-"This widget allows to display gauges using d3 library.\n"
-""
+"This module will give an option of bill my account on ups delivery methods\n"
+"==========================================================================\n"
+"    "
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_project_issue
+#: model:ir.module.module,description:base.module_web_kanban_gauge
 msgid "\n"
-"Track Issues/Bugs Management for Projects\n"
-"=========================================\n"
-"This application allows you to manage the issues you might face in a project like bugs in a system, client complaints or material breakdowns.\n"
-"\n"
-"It allows the manager to quickly check the issues, assign them and decide on their status quickly as they evolve.\n"
-"    "
+"This widget allows to display gauges using d3 library.\n"
+""
 msgstr ""
 
 #. module: base
@@ -4112,25 +3843,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_project
-msgid "\n"
-"Track multi-level projects, tasks, work done on tasks\n"
-"=====================================================\n"
-"\n"
-"This application allows an operational project management system to organize your activities into tasks and plan the work you need to get the tasks completed.\n"
-"\n"
-"Gantt diagrams will give you a graphical representation of your project plans, as well as resources availability and workload.\n"
-"\n"
-"Dashboard / Reports for Project Management will include:\n"
-"--------------------------------------------------------\n"
-"* My Tasks\n"
-"* Open Tasks\n"
-"* Tasks Analysis\n"
-"* Cumulative Flow\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid "\n"
 "Türkiye için Tek düzen hesap planı şablonu Odoo Modülü.\n"
@@ -4160,21 +3872,10 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_contract
-msgid "\n"
-"Use this app to manage Subscriptions:\n"
-"Features:\n"
-"    - Create & edit susbcriptions with sales orders (automatic creation on confirmation)\n"
-"    - Generate invoice and credit card payments automatically at fixed intervals\n"
-"    - Let your customer edit their subscriptions themselves (options, close their contract) with granular control\n"
-"        "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_sales_team
 msgid "\n"
 "Using this application you can manage Sales Channels  with CRM and/or Sales\n"
-"=======================================================================\n"
+"===========================================================================\n"
 " "
 msgstr ""
 
@@ -4254,7 +3955,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_website_helpdesk_forum
 msgid "\n"
 "Website Forum integration for the helpdesk module\n"
-"===============================================\n"
+"=================================================\n"
 "\n"
 "    Allow your teams to have a related forum to answer customer questions.\n"
 "    Transform tickets into questions on the forum with a single click.\n"
@@ -4276,7 +3977,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_website_helpdesk_livechat
 msgid "\n"
 "Website IM Livechat integration for the helpdesk module\n"
-"====================================================\n"
+"=======================================================\n"
 "\n"
 "Features:\n"
 "\n"
@@ -4290,7 +3991,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_website_helpdesk_slides
 msgid "\n"
 "Website Slides integration for the helpdesk module\n"
-"===============================================\n"
+"==================================================\n"
 "\n"
 "    Add slide presentations to your team so customers seeking help can see them those before submitting new tickets.\n"
 "\n"
@@ -4309,7 +4010,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_website_helpdesk_form
 msgid "\n"
 "Website form integration for the helpdesk module\n"
-"===============================================\n"
+"================================================\n"
 "\n"
 "    Allow customers to easily submit tickets through a form on your website.\n"
 "\n"
@@ -4326,14 +4027,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_project
-msgid "\n"
-"Website portal for Project and Tasks\n"
-"====================================\n"
-"    "
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_hw_scale
 msgid "\n"
 "Weighing Scale Hardware Driver\n"
@@ -4355,19 +4048,6 @@ msgid "\n"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_crm_score
-msgid "    Lead Scoring\n"
-"===================\n"
-"\n"
-"This module allows you to...\n"
-"    - Track specific page view on your website.\n"
-"    - Assign score on lead: sort your lead automatically and consider the more important at first.\n"
-"    - Assign lead to salesteams: define your own filters and sort automatically your leads by saleteam.\n"
-"    - Assign lead to salesmen: define filter by saleman and dispatch automatically your leads to the right saleman.\n"
-""
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_inter_company_rules
 msgid " Module for synchronization of Documents between several companies. For example, this allow you to have a Sales Order created automatically when a Purchase Order is validated with another company of the system as vendor, and inversely.\n"
 "\n"
@@ -4442,10 +4122,10 @@ msgstr ""
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:38
-#: code:addons/base/res/res_partner.py:332
-#: code:addons/base/res/res_users.py:144
-#: code:addons/base/res/res_users.py:400
-#: code:addons/base/res/res_users.py:402
+#: code:addons/base/res/res_partner.py:296
+#: code:addons/base/res/res_users.py:145
+#: code:addons/base/res/res_users.py:399
+#: code:addons/base/res/res_users.py:401
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -4461,7 +4141,7 @@ msgid "%y - Year without century [00,99].\""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1394
+#: code:addons/base/ir/ir_model.py:1401
 #, python-format
 msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
@@ -4492,6 +4172,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 msgid "(edit)"
 msgstr ""
 
@@ -4511,12 +4192,6 @@ msgid ", required"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_key
-msgid "- Action: an action attached to one slot of the given model\n"
-"- Default: a default value for a model field"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "- domain ="
 msgstr ""
@@ -4637,6 +4312,11 @@ msgid "9. %w              ==&gt; 5 ( Friday is the 6th day)"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
 msgid "<b>No module found!</b>"
 msgstr ""
@@ -4674,6 +4354,11 @@ msgid "<code>time</code> (Python module)"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_currency_kanban
+msgid "<strong><span>Current Rate: </span></strong>"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Apps</strong>"
 msgstr ""
@@ -4689,6 +4374,11 @@ msgid "<strong>Dependencies :</strong>"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_res_company_kanban
+msgid "<strong>Email:</strong>"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Group</strong>"
 msgstr ""
@@ -4719,6 +4409,11 @@ msgid "<strong>Name</strong>"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_res_company_kanban
+msgid "<strong>Phone</strong>"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
 msgid "<strong>Reports :</strong>"
 msgstr ""
@@ -4784,7 +4479,7 @@ msgid "A AGRICULTURE, FORESTRY AND FISHING"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2752
+#: code:addons/models.py:2748
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -4846,14 +4541,59 @@ msgid "A module with dummy methods."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_qweb/fields.py:369
+#: code:addons/base/ir/ir_qweb/fields.py:370
 #, python-format
 msgid "A unit must be provided to duration widgets"
 msgstr ""
 
 #. module: base
-#: selection:res.company,rml_paper_format:0
-msgid "A4"
+#: selection:report.paperformat,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "A9  13  37 x 52 mm"
 msgstr ""
 
 #. module: base
@@ -4942,11 +4682,6 @@ msgid "Account Charts"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_account_contract_dashboard
-msgid "Account Contract Dashboard"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_account_extension
 msgid "Account Extension"
 msgstr ""
@@ -4957,11 +4692,6 @@ msgid "Account Holder"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_website_portal
-msgid "Account Management Frontend for your Customers"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_company_account_no
 msgid "Account No."
 msgstr ""
@@ -4992,6 +4722,11 @@ msgid "Account TaxCloud - Sale"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_account_payment
+msgid "Account and Payment Link and Portal"
+msgstr ""
+
+#. module: base
 #: model:ir.module.category,name:base.module_category_accounting
 msgid "Accounting"
 msgstr ""
@@ -5052,6 +4787,13 @@ msgid "Accounting chart for Netherlands\n"
 msgstr ""
 
 #. module: base
+#: selection:ir.actions.act_url,binding_type:0
+#: selection:ir.actions.act_window,binding_type:0
+#: selection:ir.actions.act_window_close,binding_type:0
+#: selection:ir.actions.actions,binding_type:0
+#: selection:ir.actions.client,binding_type:0
+#: selection:ir.actions.report,binding_type:0
+#: selection:ir.actions.server,binding_type:0
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view_act_window_id
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_action_id
 #: model:ir.model.fields,field_description:base.field_ir_filters_action_id
@@ -5060,35 +4802,17 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.action_view_search
 #: model:ir.ui.view,arch_db:base.action_view_tree
 #: model:ir.ui.view,arch_db:base.view_window_action_search
-#: selection:ir.values,key:0
 msgid "Action"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_values_action_id
-msgid "Action (change only)"
-msgstr ""
-
-#. module: base
-#: model:ir.actions.act_window,name:base.act_values_form_action
-#: model:ir.ui.menu,name:base.menu_values_form_action
-#: model:ir.ui.view,arch_db:base.values_view_form_action
-msgid "Action Bindings"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.values_view_tree_action
-msgid "Action Bindings/Defaults"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_client_help
 #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_help
 #: model:ir.model.fields,field_description:base.field_ir_act_server_help
 #: model:ir.model.fields,field_description:base.field_ir_act_url_help
 #: model:ir.model.fields,field_description:base.field_ir_act_window_help
 #: model:ir.model.fields,field_description:base.field_ir_actions_help
-#: model:ir.model.fields,field_description:base.field_ir_actions_help_299
+#: model:ir.model.fields,field_description:base.field_ir_actions_help_273
 #: model:ir.model.fields,field_description:base.field_ir_cron_help
 msgid "Action Description"
 msgstr ""
@@ -5103,11 +4827,6 @@ msgid "Action Name"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.values_view_form_action
-msgid "Action Reference"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_url_target
 msgid "Action Target"
 msgstr ""
@@ -5125,7 +4844,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_url_type
 #: model:ir.model.fields,field_description:base.field_ir_act_window_type
 #: model:ir.model.fields,field_description:base.field_ir_actions_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_type_304
+#: model:ir.model.fields,field_description:base.field_ir_actions_type_270
 #: model:ir.model.fields,field_description:base.field_ir_cron_type
 #: model:ir.ui.view,arch_db:base.view_server_action_search
 msgid "Action Type"
@@ -5142,17 +4861,6 @@ msgid "Action Usage"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_action_id
-msgid "Action bound to this entry - helper field for binding an action, will automatically set the correct reference"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_menu_ir_values_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_menu_ir_values_id
-msgid "Action on Object"
-msgstr ""
-
-#. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
 #: model:ir.ui.menu,name:base.menu_ir_sequence_actions
 #: model:ir.ui.menu,name:base.next_id_6
@@ -5161,11 +4869,6 @@ msgid "Actions"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
-msgid "Activate more currencies"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_cron_active
 #: model:ir.model.fields,field_description:base.field_ir_filters_active
 #: model:ir.model.fields,field_description:base.field_ir_mail_server_active
@@ -5193,11 +4896,6 @@ msgid "Add Delivery Costs to Online Sales"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_header
-msgid "Add RML Header"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,summary:base.module_base_address_city
 msgid "Add a many2one field city on addresses"
 msgstr ""
@@ -5233,29 +4931,15 @@ msgid "Add in the 'Print' menu"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_header
-msgid "Add or not the corporate RML header"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,summary:base.module_website_twitter
 msgid "Add twitter scroller snippet in website builder"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_website_portal_purchase
-msgid "Add your purchase orders in the frontend portal"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,summary:base.module_website_portal_sale
-msgid "Add your sales document in the frontend portal (sales order, quotations, invoices)"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "Address"
 msgstr ""
@@ -5358,9 +5042,9 @@ msgid "Administrative divisions of a country. E.g. Fed. State, Departement, Cant
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:900
-#: code:addons/base/ir/ir_model.py:1012
-#: code:addons/base/ir/ir_model.py:1510
+#: code:addons/base/ir/ir_model.py:907
+#: code:addons/base/ir/ir_model.py:1019
+#: code:addons/base/ir/ir_model.py:1517
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -5395,7 +5079,12 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.af
-msgid "Afghanistan, Islamic State of"
+msgid "Afghanistan"
+msgstr ""
+
+#. module: base
+#: selection:res.country,name_position:0
+msgid "After Address"
 msgstr ""
 
 #. module: base
@@ -5424,11 +5113,6 @@ msgid "All"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_base_module_configuration_form
-msgid "All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,summary:base.module_pos_reprint
 msgid "Allow cashier to reprint receipts"
 msgstr ""
@@ -5449,6 +5133,11 @@ msgid "Allowed Companies"
 msgstr ""
 
 #. module: base
+#: model:ir.model,name:base.model_report_paperformat
+msgid "Allows customization of a report."
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_sale_coupon_delivery
 msgid "Allows to offer free shippings in coupon reward"
 msgstr ""
@@ -5511,7 +5200,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.ad
-msgid "Andorra, Principality of"
+msgid "Andorra"
 msgstr ""
 
 #. module: base
@@ -5546,18 +5235,22 @@ msgid "App Switcher"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_rml_header1
+#: model:ir.model.fields,help:base.field_res_company_report_header
 msgid "Appears by default on the top right corner of your printed documents (report header)."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:716
 #: model:ir.model,name:base.model_ir_module_category
 #: model:ir.model.fields,field_description:base.field_ir_module_module_application
 #: model:ir.model.fields,field_description:base.field_res_groups_category_id
+msgid "Application"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:720
 #: model:ir.ui.view,arch_db:base.user_groups_view
 #, python-format
-msgid "Application"
+msgid "Application Accesses"
 msgstr ""
 
 #. module: base
@@ -5576,7 +5269,7 @@ msgid "Apply"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:565
+#: code:addons/base/module/module.py:594
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade_install
 #, python-format
@@ -5619,7 +5312,6 @@ msgid "Appraisals"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_module_open_categ
 #: model:ir.actions.act_window,name:base.open_module_tree
 #: model:ir.ui.menu,name:base.menu_management
 #: model:ir.ui.menu,name:base.menu_module_tree
@@ -5699,6 +5391,11 @@ msgid "Assets Management"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_report_ids
+msgid "Associated reports"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_association
 msgid "Associations Management"
 msgstr ""
@@ -5812,6 +5509,11 @@ msgid "Auto Search"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_marketing_automation
+msgid "Automate Marketing Campaigns"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_base_automation
 msgid "Automated Action Rules"
 msgstr ""
@@ -5832,7 +5534,7 @@ msgid "Automatic Installation"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:658
+#: code:addons/base/module/module.py:687
 #, python-format
 msgid "Automatic install of downloaded Apps is currently disabled."
 msgstr ""
@@ -5863,6 +5565,61 @@ msgid "B MINING AND QUARRYING"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr ""
+
+#. module: base
+#: selection:report.paperformat,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr ""
+
+#. module: base
+#: selection:res.company,external_report_layout:0
+msgid "Background"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.bs
 msgid "Bahamas"
 msgstr ""
@@ -5967,18 +5724,12 @@ msgid "Base Field"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:238
+#: code:addons/base/res/res_lang.py:233
 #, python-format
 msgid "Base Language 'en_US' can not be deleted!"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_model_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_model_id
-msgid "Base Model"
-msgstr ""
-
-#. module: base
 #: selection:ir.model,state:0
 msgid "Base Object"
 msgstr ""
@@ -6000,12 +5751,6 @@ msgid "Base import module"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_model_id
-#: model:ir.model.fields,help:base.field_ir_cron_model_id
-msgid "Base model on which the server action runs."
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,description:base.module_website_partner
 msgid "Base module holding website-related stuff for partner model"
 msgstr ""
@@ -6038,6 +5783,11 @@ msgid "Batch Deposit"
 msgstr ""
 
 #. module: base
+#: selection:res.country,name_position:0
+msgid "Before Address"
+msgstr ""
+
+#. module: base
 #: selection:res.currency,position:0
 msgid "Before Amount"
 msgstr ""
@@ -6129,6 +5879,30 @@ msgid "Binary"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_client_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_act_server_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_act_url_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_act_window_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_binding_model_id_274
+#: model:ir.model.fields,field_description:base.field_ir_cron_binding_model_id
+msgid "Binding Model"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_client_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_act_server_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_act_url_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_act_window_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_binding_type_275
+#: model:ir.model.fields,field_description:base.field_ir_cron_binding_type
+msgid "Binding Type"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_hw_blackbox_be
 msgid "Blackbox Hardware Driver"
 msgstr ""
@@ -6170,7 +5944,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.ba
-msgid "Bosnia-Herzegovina"
+msgid "Bosnia and Herzegovina"
 msgstr ""
 
 #. module: base
@@ -6179,11 +5953,21 @@ msgid "Botswana"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_bottom
+msgid "Bottom Margin (mm)"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.bv
 msgid "Bouvet Island"
 msgstr ""
 
 #. module: base
+#: selection:res.company,external_report_layout:0
+msgid "Boxed"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.br
 msgid "Brazil"
 msgstr ""
@@ -6266,6 +6050,11 @@ msgid "C MANUFACTURING"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_crm
 msgid "CRM"
 msgstr ""
@@ -6304,18 +6093,8 @@ msgid "Calendar SMS"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_stock_calendar
-msgid "Calendars "
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_stock_calendar
-msgid "Calendars on Orderpoints"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.kh
-msgid "Cambodia, Kingdom of"
+msgid "Cambodia"
 msgstr ""
 
 #. module: base
@@ -6330,13 +6109,13 @@ msgid "Can not create Many-To-One records indirectly, import the field separatel
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:548
+#: code:addons/base/module/module.py:577
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:661
+#: code:addons/base/ir/ir_model.py:668
 #, python-format
 msgid "Can only rename one field at a time!"
 msgstr ""
@@ -6356,6 +6135,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.res_config_view_base
 #: model:ir.ui.view,arch_db:base.view_base_import_language
 #: model:ir.ui.view,arch_db:base.view_base_language_install
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
 #: model:ir.ui.view,arch_db:base.view_base_module_update
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade_install
@@ -6387,13 +6167,13 @@ msgid "Cancel Upgrade"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:399
+#: code:addons/base/res/res_config.py:382
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:561
+#: code:addons/base/ir/ir_model.py:568
 #, python-format
 msgid "Cannot rename/delete fields that are still present in views:"
 msgstr ""
@@ -6443,7 +6223,6 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.change_password_wizard_action
 #: model:ir.ui.view,arch_db:base.change_password_wizard_view
-#: model:ir.ui.view,arch_db:base.view_users_form
 msgid "Change Password"
 msgstr ""
 
@@ -6463,29 +6242,24 @@ msgid "Change password"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_users_form
-msgid "Change the user password."
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_country_form
 msgid "Change the way addresses are displayed in reports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:345
+#: code:addons/base/res/res_partner.py:309
 #, python-format
 msgid "Changing the company of a contact should only be done if it was never correctly set. If an existing contact starts working for a new company then a new contact should be created under that new company. You can use the \"Discard\" button to abandon this change."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:648
+#: code:addons/base/ir/ir_model.py:655
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:651
+#: code:addons/base/ir/ir_model.py:658
 #, python-format
 msgid "Changing the type of a field is not yet supported. Please drop it and create it again!"
 msgstr ""
@@ -6602,6 +6376,12 @@ msgid "China"
 msgstr ""
 
 #. module: base
+#: code:addons/base/ir/ir_actions_report.py:682
+#, python-format
+msgid "Choose Your Document Layout"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_country_form
 msgid "Choose a subview of partners that includes only address fields, to change the way users can input addresses."
 msgstr ""
@@ -6627,6 +6407,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "City"
 msgstr ""
@@ -6637,6 +6418,11 @@ msgid "City Addresses"
 msgstr ""
 
 #. module: base
+#: selection:res.company,external_report_layout:0
+msgid "Clean"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view_custom
 msgid "Click here to create a customized view"
 msgstr ""
@@ -6684,24 +6470,14 @@ msgid "Client"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.values_view_search_action
-msgid "Client Action"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.values_view_search_action
-msgid "Client Actions"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_client_tag
 msgid "Client action tag"
 msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_base_language_install
-#: model:ir.ui.view,arch_db:base.view_base_module_configuration_form
 #: model:ir.ui.view,arch_db:base.view_base_module_update
+#: model:ir.ui.view,arch_db:base.view_company_report_form
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
 msgid "Close"
 msgstr ""
@@ -6734,6 +6510,11 @@ msgid "Collaborative Pads"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_account_sepa_direct_debit
+msgid "Collect payments from your customers through SEPA direct debit."
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
 msgstr ""
@@ -6782,6 +6563,11 @@ msgid "Column referring to the record in the model table"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,help:base.field_ir_act_window_view_mode
 msgid "Comma-separated list of allowed view modes, such as 'form', 'tree', 'calendar', etc. (Default: tree,form)"
 msgstr ""
@@ -6835,16 +6621,18 @@ msgstr ""
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_attachment_company_id
+#: model:ir.model.fields,field_description:base.field_ir_default_company_id
 #: model:ir.model.fields,field_description:base.field_ir_property_company_id
 #: model:ir.model.fields,field_description:base.field_ir_sequence_company_id
-#: model:ir.model.fields,field_description:base.field_ir_values_company_id
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_company_id
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_company_id
 #: model:ir.model.fields,field_description:base.field_res_partner_company_id
 #: model:ir.model.fields,field_description:base.field_res_users_company_id
+#: model:ir.ui.view,arch_db:base.ir_default_search_view
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_partner_simple_form
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 #: model:ir.ui.view,arch_db:base.view_users_search
@@ -6882,7 +6670,7 @@ msgid "Company Registry"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_header1
+#: model:ir.model.fields,field_description:base.field_res_company_report_header
 msgid "Company Tagline"
 msgstr ""
 
@@ -6931,7 +6719,7 @@ msgid "Computed fields are defined with the fields\n"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.values_view_form_defaults
+#: model:ir.model.fields,field_description:base.field_ir_default_condition
 msgid "Condition"
 msgstr ""
 
@@ -6970,6 +6758,7 @@ msgid "Configure timesheet invoicing"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade
 msgid "Confirm"
 msgstr ""
@@ -6980,11 +6769,6 @@ msgid "Congo"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.cd
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,summary:base.module_hw_proxy
 msgid "Connect the Web Client to Hardware Peripherals"
 msgstr ""
@@ -7000,14 +6784,14 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:179
+#: code:addons/base/ir/ir_mail_server.py:164
 #, python-format
 msgid "Connection Test Failed! Here is what we got instead:\n"
 " %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:187
+#: code:addons/base/ir/ir_mail_server.py:172
 #, python-format
 msgid "Connection Test Succeeded! Everything seems properly set up!"
 msgstr ""
@@ -7126,11 +6910,6 @@ msgid "Contributors"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "Controller"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.ck
 msgid "Cook Islands"
 msgstr ""
@@ -7151,12 +6930,17 @@ msgid "Costa Rica - Accounting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:625
+#: code:addons/base/res/res_partner.py:585
 #, python-format
 msgid "Couldn't create contact without email address!"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_count
+msgid "Count (incl. archived)"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,name:base.action_country
 #: model:ir.model.fields,field_description:base.field_res_country_group_country_ids
 msgid "Countries"
@@ -7175,6 +6959,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_country_tree
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Country"
@@ -7235,24 +7020,24 @@ msgid "Create Date"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_website_issue
-msgid "Create Issues From Contact Form"
+#: model:ir.module.module,summary:base.module_website_crm
+msgid "Create Leads From Contact Form"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm_project_issue
-msgid "Create Issues from Leads"
+#: model:ir.actions.act_window,name:base.act_menu_create
+#: model:ir.ui.view,arch_db:base.view_model_menu_create
+msgid "Create Menu"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_website_crm
-msgid "Create Leads From Contact Form"
+#: model:ir.module.module,summary:base.module_website_form_project
+msgid "Create Tasks From Contact Form"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.act_menu_create
-#: model:ir.ui.view,arch_db:base.view_model_menu_create
-msgid "Create Menu"
+#: model:ir.module.module,summary:base.module_crm_project
+msgid "Create Tasks from Leads"
 msgstr ""
 
 #. module: base
@@ -7282,6 +7067,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 msgid "Create company"
 msgstr ""
 
@@ -7325,7 +7111,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_create_uid
 #: model:ir.model.fields,field_description:base.field_base_language_import_create_uid
 #: model:ir.model.fields,field_description:base.field_base_language_install_create_uid
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_create_uid
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_create_uid
 #: model:ir.model.fields,field_description:base.field_base_module_update_create_uid
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_create_uid
 #: model:ir.model.fields,field_description:base.field_base_update_translations_create_uid
@@ -7338,10 +7124,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_actions_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_296
+#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_278
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_cron_create_uid
+#: model:ir.model.fields,field_description:base.field_ir_default_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_exports_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_filters_create_uid
@@ -7364,7 +7151,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_create_uid
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_values_create_uid
+#: model:ir.model.fields,field_description:base.field_report_paperformat_create_uid
 #: model:ir.model.fields,field_description:base.field_res_bank_create_uid
 #: model:ir.model.fields,field_description:base.field_res_company_create_uid
 #: model:ir.model.fields,field_description:base.field_res_config_create_uid
@@ -7375,7 +7162,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_state_create_uid
 #: model:ir.model.fields,field_description:base.field_res_currency_create_uid
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_create_uid
-#: model:ir.model.fields,field_description:base.field_res_font_create_uid
 #: model:ir.model.fields,field_description:base.field_res_groups_create_uid
 #: model:ir.model.fields,field_description:base.field_res_lang_create_uid
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_create_uid
@@ -7394,7 +7180,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_create_date
 #: model:ir.model.fields,field_description:base.field_base_language_import_create_date
 #: model:ir.model.fields,field_description:base.field_base_language_install_create_date
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_create_date
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_create_date
 #: model:ir.model.fields,field_description:base.field_base_module_update_create_date
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_create_date
 #: model:ir.model.fields,field_description:base.field_base_update_translations_create_date
@@ -7407,10 +7193,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_create_date
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_date
 #: model:ir.model.fields,field_description:base.field_ir_actions_create_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_303
+#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_279
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_date
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_date
 #: model:ir.model.fields,field_description:base.field_ir_cron_create_date
+#: model:ir.model.fields,field_description:base.field_ir_default_create_date
 #: model:ir.model.fields,field_description:base.field_ir_exports_create_date
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_create_date
 #: model:ir.model.fields,field_description:base.field_ir_filters_create_date
@@ -7432,7 +7219,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_server_object_lines_create_date
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_create_date
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_create_date
-#: model:ir.model.fields,field_description:base.field_ir_values_create_date
+#: model:ir.model.fields,field_description:base.field_report_paperformat_create_date
 #: model:ir.model.fields,field_description:base.field_res_bank_create_date
 #: model:ir.model.fields,field_description:base.field_res_company_create_date
 #: model:ir.model.fields,field_description:base.field_res_config_create_date
@@ -7443,7 +7230,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_state_create_date
 #: model:ir.model.fields,field_description:base.field_res_currency_create_date
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_create_date
-#: model:ir.model.fields,field_description:base.field_res_font_create_date
 #: model:ir.model.fields,field_description:base.field_res_groups_create_date
 #: model:ir.model.fields,field_description:base.field_res_lang_create_date
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_create_date
@@ -7515,6 +7301,7 @@ msgid "Curaçao"
 msgstr ""
 
 #. module: base
+#: model:ir.actions.act_window,name:base.action_currency_all_form
 #: model:ir.actions.act_window,name:base.action_currency_form
 #: model:ir.ui.view,arch_db:base.view_currency_search
 #: model:ir.ui.view,arch_db:base.view_currency_tree
@@ -7552,6 +7339,26 @@ msgid "Currency Rates"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_res_currency_currency_subunit_label
+msgid "Currency Subunit"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,help:base.field_res_currency_currency_subunit_label
+msgid "Currency Subunit Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_currency_currency_unit_label
+msgid "Currency Unit"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,help:base.field_res_currency_currency_unit_label
+msgid "Currency Unit Name"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,help:base.field_res_currency_symbol
 msgid "Currency sign, to be used when printing amounts."
 msgstr ""
@@ -7585,6 +7392,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
 #: model:ir.ui.view,arch_db:base.view_model_search
+#: selection:report.paperformat,format:0
 msgid "Custom"
 msgstr ""
 
@@ -7599,22 +7407,28 @@ msgid "Custom Object"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_auto
-msgid "Custom Python Parser"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:367
+#: code:addons/base/ir/ir_model.py:373
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_res_country_name_position
+msgid "Customer Name Position"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal
+#: model:ir.module.module,summary:base.module_portal
+msgid "Customer Portal"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_rating
 msgid "Customer Rating"
 msgstr ""
@@ -7661,6 +7475,11 @@ msgid "Czech Republic"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.ci
+msgid "Côte d'Ivoire"
+msgstr ""
+
+#. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_D
 msgid "D ELECTRICITY,GAS,STEAM AND AIR CONDITIONING SUPPLY"
 msgstr ""
@@ -7671,6 +7490,11 @@ msgid "DHL Shipping"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_board
 #: model:ir.ui.menu,name:base.menu_board_root
 #: model:ir.ui.menu,name:base.menu_reporting_dashboard
@@ -7718,17 +7542,12 @@ msgid "Database Structure"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2674
+#: code:addons/models.py:2671
 #, python-format
 msgid "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a type incoherence in a previous request"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_res_id
-msgid "Database identifier of the record to which this applies. 0 = for all records"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_currency_date
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_name
 #: model:ir.model.fields,field_description:base.field_res_partner_date
@@ -7804,11 +7623,6 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: selection:ir.values,key:0
-msgid "Default"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_filters_is_default
 msgid "Default Filter"
 msgstr ""
@@ -7819,19 +7633,18 @@ msgid "Default Theme"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_limit
-msgid "Default limit for the list view"
+#: model:ir.model.fields,field_description:base.field_ir_default_json_value
+msgid "Default Value (JSON format)"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_value
-msgid "Default value (pickled) or reference to an action"
+#: model:ir.model.fields,help:base.field_ir_act_window_limit
+msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_values_value_unpickle
-#: model:ir.ui.view,arch_db:base.values_view_form_defaults
-msgid "Default value or action reference"
+#: model:ir.model.fields,field_description:base.field_report_paperformat_default
+msgid "Default paper format ?"
 msgstr ""
 
 #. module: base
@@ -7840,8 +7653,13 @@ msgid "Default website theme to showcase customization possibilities."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_sale_contract_asset
-msgid "Deferred revenue management for contracts"
+#: model:ir.module.module,shortdesc:base.module_account_deferred_revenue
+msgid "Deferred Revenues"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_subscription_asset
+msgid "Deferred Revenues Management for Subscriptions"
 msgstr ""
 
 #. module: base
@@ -7870,13 +7688,6 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:215
-#: code:addons/base/ir/ir_actions.py:546
-#, python-format
-msgid "Deletion of the action record failed."
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery_barcode
 msgid "Delivery Barcode Scanning"
 msgstr ""
@@ -7892,6 +7703,11 @@ msgid "Demo Data"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.cd
+msgid "Democratic Republic of the Congo"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
 msgstr ""
@@ -7957,18 +7773,23 @@ msgid "Determines where the currency symbol should be placed after or before the
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_res_country_name_position
+msgid "Determines where the customer/company name should be placed, i.e. after or before the address."
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
 msgid "Deutschland - Accounting"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_de_skr03
-msgid "Deutschland SKR03 - Accounting"
+#: model:ir.module.module,shortdesc:base.module_l10n_de_reports
+msgid "Deutschland - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_de_skr03_reports
-msgid "Deutschland SKR03 - Accounting Reports"
+#: model:ir.module.module,shortdesc:base.module_l10n_de_skr03
+msgid "Deutschland SKR03 - Accounting"
 msgstr ""
 
 #. module: base
@@ -7977,11 +7798,6 @@ msgid "Deutschland SKR04 - Accounting"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_de_skr04_reports
-msgid "Deutschland SKR04 - Accounting Reports"
-msgstr ""
-
-#. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
 msgstr ""
@@ -7997,13 +7813,18 @@ msgid "Directory"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:445
+#: code:addons/base/res/res_config.py:428
 #, python-format
 msgid "Disabling this option will also uninstall the following modules \n"
 "%s"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
+msgid "Discard"
+msgstr ""
+
+#. module: base
 #: model:ir.module.category,name:base.module_category_discuss
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Discuss"
@@ -8025,7 +7846,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_display_name
 #: model:ir.model.fields,field_description:base.field_base_language_import_display_name
 #: model:ir.model.fields,field_description:base.field_base_language_install_display_name
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_display_name
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_display_name
 #: model:ir.model.fields,field_description:base.field_base_module_update_display_name
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_display_name
 #: model:ir.model.fields,field_description:base.field_base_update_translations_display_name
@@ -8039,12 +7860,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_display_name
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view_display_name
 #: model:ir.model.fields,field_description:base.field_ir_actions_display_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_298
+#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_277
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_display_name
 #: model:ir.model.fields,field_description:base.field_ir_attachment_display_name
 #: model:ir.model.fields,field_description:base.field_ir_autovacuum_display_name
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_display_name
 #: model:ir.model.fields,field_description:base.field_ir_cron_display_name
+#: model:ir.model.fields,field_description:base.field_ir_default_display_name
 #: model:ir.model.fields,field_description:base.field_ir_exports_display_name
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_display_name
 #: model:ir.model.fields,field_description:base.field_ir_fields_converter_display_name
@@ -8064,6 +7886,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_display_name
 #: model:ir.model.fields,field_description:base.field_ir_property_display_name
 #: model:ir.model.fields,field_description:base.field_ir_qweb_display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode_display_name
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact_display_name
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_date_display_name
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime_display_name
@@ -8087,8 +7910,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_display_name
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_display_name
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_display_name
-#: model:ir.model.fields,field_description:base.field_ir_values_display_name
 #: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference_display_name
+#: model:ir.model.fields,field_description:base.field_report_paperformat_display_name
 #: model:ir.model.fields,field_description:base.field_res_bank_display_name
 #: model:ir.model.fields,field_description:base.field_res_company_display_name
 #: model:ir.model.fields,field_description:base.field_res_config_display_name
@@ -8099,7 +7922,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_state_display_name
 #: model:ir.model.fields,field_description:base.field_res_currency_display_name
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_display_name
-#: model:ir.model.fields,field_description:base.field_res_font_display_name
 #: model:ir.model.fields,field_description:base.field_res_groups_display_name
 #: model:ir.model.fields,field_description:base.field_res_lang_display_name
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_display_name
@@ -8120,6 +7942,11 @@ msgid "Display Website Elements in Studio"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_header_line
+msgid "Display a header line"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "Display an option in the 'More' top-menu in order to run this action."
 msgstr ""
@@ -8161,13 +7988,23 @@ msgid "Doctor"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
+msgid "Document"
+msgstr ""
+
+#. module: base
 #: model:ir.module.category,name:base.module_category_document_management
 msgid "Document Management"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1167
-#: code:addons/base/ir/ir_model.py:1170
+#: model:ir.model.fields,field_description:base.field_res_company_external_report_layout
+msgid "Document Template"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:1174
+#: code:addons/base/ir/ir_model.py:1177
 #, python-format
 msgid "Document model"
 msgstr ""
@@ -8227,7 +8064,7 @@ msgid "Drop Shipping"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_qweb/fields.py:366
+#: code:addons/base/ir/ir_qweb/fields.py:367
 #, python-format
 msgid "Durations can't be negative"
 msgstr ""
@@ -8263,11 +8100,6 @@ msgid "Easily create and customize your applications"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tp
-msgid "East Timor"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
 msgstr ""
@@ -8404,7 +8236,7 @@ msgid "Employees"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:429
 #, python-format
 msgid "Empty dependency in %r"
 msgstr ""
@@ -8455,32 +8287,38 @@ msgid "Eritrea"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:91
+#: code:addons/base/res/res_partner.py:86
 #, python-format
 msgid "Error ! You can not create recursive tags."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:355
+#: code:addons/base/res/res_company.py:241
 #, python-format
 msgid "Error ! You cannot create recursive companies."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:478
+#: code:addons/base/res/report_paperformat.py:68
+#, python-format
+msgid "Error ! You cannot select a format AND specific page width/height."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_view.py:472
 #, python-format
 msgid "Error context:\n"
 "View `%(view_name)s`"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:946
+#: code:addons/models.py:962
 #, python-format
 msgid "Error details:"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:959
+#: code:addons/models.py:975
 #, python-format
 msgid "Error while validating constraint"
 msgstr ""
@@ -8598,6 +8436,11 @@ msgid "Execution"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expense Tracker"
 msgstr ""
@@ -8613,6 +8456,11 @@ msgid "Expenses Validation, Invoicing"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_report_paperformat_report_ids
+msgid "Explicitly associated reports"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_export_id
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
 msgid "Export"
@@ -8683,7 +8531,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_url_xml_id
 #: model:ir.model.fields,field_description:base.field_ir_act_window_xml_id
 #: model:ir.model.fields,field_description:base.field_ir_actions_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_297
+#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_272
 #: model:ir.model.fields,field_description:base.field_ir_cron_xml_id
 #: model:ir.model.fields,field_description:base.field_ir_module_category_xml_id
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_xml_id
@@ -8753,19 +8601,6 @@ msgid "Faroe Islands"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_fax
-#: model:ir.model.fields,field_description:base.field_res_company_fax
-#: model:ir.model.fields,field_description:base.field_res_partner_fax
-#: model:ir.model.fields,field_description:base.field_res_users_fax
-msgid "Fax"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_partner_form
-msgid "Fax:"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_bank_state
 #: model:ir.model.fields,field_description:base.field_res_company_state_id
 msgid "Fed. State"
@@ -8832,6 +8667,7 @@ msgid "Fichier d'Échange Informatisé (FEC) pour la France\n"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_default_field_id
 #: model:ir.model.fields,field_description:base.field_ir_property_fields_id
 #: model:ir.model.fields,field_description:base.field_ir_server_object_lines_col1
 #: selection:ir.translation,type:0
@@ -8840,19 +8676,19 @@ msgid "Field"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:193
+#: code:addons/base/ir/ir_model.py:199
 #, python-format
 msgid "Field \"Model\" cannot be modified on models."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:197
+#: code:addons/base/ir/ir_model.py:203
 #, python-format
 msgid "Field \"Transient Model\" cannot be modified on models."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:195
+#: code:addons/base/ir/ir_model.py:201
 #, python-format
 msgid "Field \"Type\" cannot be modified on models."
 msgstr ""
@@ -8890,7 +8726,7 @@ msgid "Field `%(field_name)s` does not exist"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:371
+#: code:addons/base/ir/ir_model.py:377
 #, python-format
 msgid "Field names can only contain characters, digits and underscores (up to 63)."
 msgstr ""
@@ -8918,9 +8754,9 @@ msgid "Fields Description"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:562
+#: code:addons/base/ir/ir_model.py:569
 #, python-format
-msgid "Fields:"
+msgid "Fields: %s"
 msgstr ""
 
 #. module: base
@@ -9043,23 +8879,8 @@ msgid "Float"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_font
-msgid "Font"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_res_font_name
-msgid "Font Name"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_res_font_family
-msgid "Font family"
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_res_font
-msgid "Fonts available"
+#: selection:report.paperformat,format:0
+msgid "Folio 27  210 x 330 mm"
 msgstr ""
 
 #. module: base
@@ -9068,7 +8889,7 @@ msgid "Food"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_rml_footer
+#: model:ir.model.fields,help:base.field_res_company_report_footer
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
@@ -9078,16 +8899,6 @@ msgid "For QWeb reports, name of the template used in the rendering. The method
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_key2
-msgid "For actions, one of the possible action slots: \n"
-"  - client_action_multi\n"
-"  - client_print_multi\n"
-"  - client_action_relate\n"
-"  - tree_but_open\n"
-"For defaults, an optional condition"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
 msgid "For more details about translating Odoo in your language, please refer to the"
 msgstr ""
@@ -9103,13 +8914,13 @@ msgid "For relationship fields, the technical name of the target model"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:604
+#: code:addons/base/ir/ir_model.py:611
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2812
+#: code:addons/models.py:2808
 #, python-format
 msgid "For this kind of document, you may only access records you created yourself.\n"
 "\n"
@@ -9173,11 +8984,6 @@ msgid "France - Accounting"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_fr_certification
-msgid "France - Accounting - Certified CGI 286 I-3 bis"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_reports
 msgid "France - Accounting Reports"
 msgstr ""
@@ -9189,7 +8995,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.gf
-msgid "French Guyana"
+msgid "French Guiana"
 msgstr ""
 
 #. module: base
@@ -9198,6 +9004,11 @@ msgid "French Payroll"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.pf
+msgid "French Polynesia"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.tf
 msgid "French Southern Territories"
 msgstr ""
@@ -9264,6 +9075,26 @@ msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_in_purchase
+msgid "GST Purchase Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in_sale
+msgid "GST Sale Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in_stock
+msgid "GST Stock Report"
+msgstr ""
+
+#. module: base
+#: model:res.country,vat_label:base.in
+msgid "GSTIN"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.ga
 msgid "Gabon"
 msgstr ""
@@ -9374,12 +9205,7 @@ msgid "Global rules (non group-specific) are restrictions, and cannot be bypasse
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_website_mail
-msgid "Glue module holding mail improvements for website."
-msgstr ""
-
-#. module: base
-#: code:addons/base/res/res_config.py:668
+#: code:addons/base/res/res_config.py:670
 #, python-format
 msgid "Go to the configuration panel"
 msgstr ""
@@ -9390,6 +9216,63 @@ msgid "Google Calendar"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_google_calendar
+msgid "Google Calendar\n"
+"---------------\n"
+"\n"
+"Get your meetings, your leaves... Get your calendar anywhere and never\n"
+"forget an event, fully synchronized with the Odoo <a href=\"https://www.odoo.com/page/crm\">Open Source CRM</a>.\n"
+"\n"
+"Keep an eye on your events\n"
+"--------------------------\n"
+"\n"
+"See easily the purpose of the meeting, the start time and also the\n"
+"attendee(s)... All that without click on anything...\n"
+"\n"
+"Create so easily an event\n"
+"-------------------------\n"
+"\n"
+"In just one click you can create an event...  You can drag and drop your event\n"
+"if you want moved it to another timing.  You can shrink or extend the event if\n"
+"you need to change the start's hours or the duration of your meeting.\n"
+"\n"
+"Create recurrent event\n"
+"----------------------\n"
+"\n"
+"You can also create recurrent events with only one event.  You need to create\n"
+"an event each monday of the week ? With only one it's possible, you could\n"
+"specify the recurrence and if one of this event is moved, or deleted, it's not\n"
+"a problem, you can untie your event from the others recurrences.\n"
+"\n"
+"See all events you wants\n"
+"------------------------\n"
+"\n"
+"See in your calendar, the event from others peoples where your are attendee,\n"
+"but also their events by simply adding your favorites coworkers.  Every\n"
+"coworker will have their own color in your calendar, and every attendee will\n"
+"have their avatar in the event...\n"
+"\n"
+"Get an email\n"
+"------------\n"
+"\n"
+"You will receive an email at creation of an event where you are attendee, but\n"
+"also when this event is updated for some fields as date start, ...\n"
+"\n"
+"Be notified\n"
+"-----------\n"
+"\n"
+"You can ask to have a alarm of type 'notification' in your Odoo.  You will have\n"
+"a notification in you Odoo which ever the page you are.\n"
+"\n"
+"Google Calendar\n"
+"---------------\n"
+"\n"
+"With the plugin Google\\_calendar, you can synchronize your Odoo calendar with Google Calendar.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_google_drive
 msgid "Google Drive™ integration"
 msgstr ""
@@ -9457,9 +9340,9 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.act_report_xml_search_view
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 #: model:ir.ui.view,arch_db:base.ir_cron_view_search
+#: model:ir.ui.view,arch_db:base.ir_default_search_view
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
-#: model:ir.ui.view,arch_db:base.values_view_search_action
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 #: model:ir.ui.view,arch_db:base.view_model_data_search
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
@@ -9490,14 +9373,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_groups
 #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_groups_id
 #: model:ir.model.fields,field_description:base.field_ir_act_window_groups_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_groups_id
 #: model:ir.model.fields,field_description:base.field_ir_model_fields_groups
 #: model:ir.model.fields,field_description:base.field_ir_rule_groups
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_groups_id
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_groups_id
 #: model:ir.model.fields,field_description:base.field_res_users_groups_id
 #: model:ir.ui.menu,name:base.menu_action_res_groups
-#: model:ir.ui.view,arch_db:base.config_wizard_step_view_form
 #: model:ir.ui.view,arch_db:base.view_groups_form
 #: model:ir.ui.view,arch_db:base.view_groups_search
 msgid "Groups"
@@ -9510,12 +9391,12 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.gp
-msgid "Guadeloupe (French)"
+msgid "Guadeloupe"
 msgstr ""
 
 #. module: base
 #: model:res.country,name:base.gu
-msgid "Guam (USA)"
+msgid "Guam"
 msgstr ""
 
 #. module: base
@@ -9540,7 +9421,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.gw
-msgid "Guinea Bissau"
+msgid "Guinea-Bissau"
 msgstr ""
 
 #. module: base
@@ -9574,16 +9455,11 @@ msgid "HR Org Chart"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
+#: selection:ir.actions.report,report_type:0
 msgid "HTML"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_type
-msgid "HTML will open the report directly in your browser, PDF will use wkhtmltopdf to render the HTML into a PDF file and let you download it, Controller allows you to define the url of a custom controller outputting any kind of report."
-msgstr ""
-
-#. module: base
 #: model:ir.model,name:base.model_ir_http
 msgid "HTTP routing"
 msgstr ""
@@ -9624,13 +9500,18 @@ msgid "Hardware Proxy"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_header_spacing
+msgid "Header spacing"
+msgstr ""
+
+#. module: base
 #: model:res.partner.industry,name:base.res_partner_industry_Q
 msgid "Health/Social"
 msgstr ""
 
 #. module: base
 #: model:res.country,name:base.hm
-msgid "Heard and McDonald Islands"
+msgid "Heard Island and McDonald Islands"
 msgstr ""
 
 #. module: base
@@ -9657,6 +9538,11 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_helpdesk_timesheet
+msgid "Helpdesk Timesheet"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk_forum
 msgid "Helpdesk: Knowledge Base"
 msgstr ""
@@ -9717,13 +9603,13 @@ msgid "Helps you manage your expenses."
 msgstr ""
 
 #. module: base
-#: model:ir.module.category,description:base.module_category_hr_holidays
-msgid "Helps you manage your holidays."
+#: model:ir.module.category,description:base.module_category_warehouse_management
+msgid "Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."
 msgstr ""
 
 #. module: base
-#: model:ir.module.category,description:base.module_category_warehouse_management
-msgid "Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."
+#: model:ir.module.category,description:base.module_category_hr_holidays
+msgid "Helps you manage your leaves."
 msgstr ""
 
 #. module: base
@@ -9769,7 +9655,6 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_theme_hidden
-#: model:ir.module.module,summary:base.module_report
 msgid "Hidden"
 msgstr ""
 
@@ -9779,16 +9664,6 @@ msgid "History"
 msgstr ""
 
 #. module: base
-#: model:ir.module.category,name:base.module_category_hr_holidays
-msgid "Holidays"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,summary:base.module_hr_holidays
-msgid "Holidays, Allocation and Leave Requests"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
 msgstr ""
@@ -9896,7 +9771,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_id
 #: model:ir.model.fields,field_description:base.field_base_language_import_id
 #: model:ir.model.fields,field_description:base.field_base_language_install_id
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_id
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_id
 #: model:ir.model.fields,field_description:base.field_base_module_update_id
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_id
 #: model:ir.model.fields,field_description:base.field_base_update_translations_id
@@ -9908,14 +9783,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_server_id
 #: model:ir.model.fields,field_description:base.field_ir_act_url_id
 #: model:ir.model.fields,field_description:base.field_ir_act_window_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_295
+#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_263
 #: model:ir.model.fields,field_description:base.field_ir_actions_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_id_305
+#: model:ir.model.fields,field_description:base.field_ir_actions_id_276
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_id
 #: model:ir.model.fields,field_description:base.field_ir_attachment_id
 #: model:ir.model.fields,field_description:base.field_ir_autovacuum_id
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_id
 #: model:ir.model.fields,field_description:base.field_ir_cron_id
+#: model:ir.model.fields,field_description:base.field_ir_default_id
 #: model:ir.model.fields,field_description:base.field_ir_exports_id
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_id
 #: model:ir.model.fields,field_description:base.field_ir_fields_converter_id
@@ -9934,6 +9810,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_id
 #: model:ir.model.fields,field_description:base.field_ir_module_module_id
 #: model:ir.model.fields,field_description:base.field_ir_property_id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode_id
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact_id
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_date_id
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime_id
@@ -9958,8 +9835,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_id
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_id
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_id
-#: model:ir.model.fields,field_description:base.field_ir_values_id
 #: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference_id
+#: model:ir.model.fields,field_description:base.field_report_paperformat_id
 #: model:ir.model.fields,field_description:base.field_res_bank_id
 #: model:ir.model.fields,field_description:base.field_res_company_id
 #: model:ir.model.fields,field_description:base.field_res_config_id
@@ -9970,13 +9847,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_state_id
 #: model:ir.model.fields,field_description:base.field_res_currency_id
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_id
-#: model:ir.model.fields,field_description:base.field_res_font_id
 #: model:ir.model.fields,field_description:base.field_res_groups_id
 #: model:ir.model.fields,field_description:base.field_res_lang_id
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_id
 #: model:ir.model.fields,field_description:base.field_res_partner_category_id
 #: model:ir.model.fields,field_description:base.field_res_partner_id
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_id_914
+#: model:ir.model.fields,field_description:base.field_res_partner_industry_id_933
 #: model:ir.model.fields,field_description:base.field_res_partner_title_id
 #: model:ir.model.fields,field_description:base.field_res_request_link_id
 #: model:ir.model.fields,field_description:base.field_res_users_id
@@ -10067,16 +9943,21 @@ msgid "If set to true, the action will not be displayed on the right toolbar of
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_company_id
+#: model:ir.model.fields,help:base.field_ir_default_company_id
 msgid "If set, action binding only applies for this company"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_user_id
+#: model:ir.model.fields,help:base.field_ir_default_user_id
 msgid "If set, action binding only applies for this user."
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_ir_default_condition
+msgid "If set, applies the default upon condition."
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "If several child actions return an action, only the last one will be executed.\n"
 "                                    This may happen when having server actions executing code that returns an action, or server actions returning a client action."
@@ -10159,6 +10040,16 @@ msgid "Impacted Apps"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_model_ids
+msgid "Impacted data models"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_module_ids
+msgid "Impacted modules"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_sequence_implementation
 msgid "Implementation"
 msgstr ""
@@ -10255,11 +10146,26 @@ msgid "Indian - Accounting Reports"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_purchase
+msgid "Indian - Purchase Report(GST)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_sale
+msgid "Indian - Sale Report(GST)"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_schedule6
 msgid "Indian - Schedule VI Accounting"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_stock
+msgid "Indian - Stock Report(GST)"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
 msgstr ""
@@ -10337,7 +10243,7 @@ msgid "Input View"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:408
+#: code:addons/base/module/module.py:405
 #: model:ir.ui.view,arch_db:base.module_form
 #: model:ir.ui.view,arch_db:base.module_view_kanban
 #, python-format
@@ -10379,13 +10285,13 @@ msgid "Instant Messaging Bus allow you to send messages to users, in live."
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:1183
+#: code:addons/models.py:1198
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:1193
+#: code:addons/models.py:1208
 #, python-format
 msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay"
 msgstr ""
@@ -10482,13 +10388,13 @@ msgid "Introspection report on objects"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:3484
+#: code:addons/models.py:3482
 #, python-format
 msgid "Invalid \"order\" specified. A valid \"order\" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:312
+#: code:addons/base/res/res_users.py:311
 #, python-format
 msgid "Invalid 'group by' parameter"
 msgstr ""
@@ -10506,13 +10412,19 @@ msgid "Invalid date/time format directive specified. Please refer to the list of
 msgstr ""
 
 #. module: base
+#: code:addons/base/ir/ir_default.py:68
+#, python-format
+msgid "Invalid field %s.%s"
+msgstr ""
+
+#. module: base
 #: sql_constraint:ir.ui.view:0
 msgid "Invalid inheritance mode: if the mode is 'extension', the view must extend an other view"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:247
-#: code:addons/base/ir/ir_actions.py:249
+#: code:addons/base/ir/ir_actions.py:125
+#: code:addons/base/ir/ir_actions.py:127
 #, python-format
 msgid "Invalid model name %r in action definition."
 msgstr ""
@@ -10524,13 +10436,13 @@ msgid "Invalid position attribute: '%s'"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:193
+#: code:addons/base/ir/ir_sequence.py:209
 #, python-format
 msgid "Invalid prefix or suffix for sequence '%s'"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:320
+#: code:addons/base/res/res_users.py:319
 #, python-format
 msgid "Invalid search criterion"
 msgstr ""
@@ -10542,14 +10454,13 @@ msgid "Invalid type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_values.py:232
+#: code:addons/base/ir/ir_default.py:70
 #, python-format
 msgid "Invalid value for %s.%s: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:333
-#: code:addons/base/ir/ir_ui_view.py:335
+#: code:addons/base/ir/ir_ui_view.py:325
 #, python-format
 msgid "Invalid view definition"
 msgstr ""
@@ -10590,9 +10501,9 @@ msgid "Invoicing & Payments"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_menu_ir_values_id
-#: model:ir.model.fields,help:base.field_ir_cron_menu_ir_values_id
-msgid "IrValues entry of the related more menu entry action"
+#: model:ir.module.category,name:base.module_category_invoicing_management
+#: model:ir.module.module,shortdesc:base.module_account_invoicing
+msgid "Invoicing Management"
 msgstr ""
 
 #. module: base
@@ -10644,21 +10555,6 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_rating_project_issue
-msgid "Issue Rating"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_project_issue
-msgid "Issue Tracking"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_issue
-msgid "Issues Form"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.it
 msgid "Italy"
 msgstr ""
@@ -10669,11 +10565,6 @@ msgid "Italy - Accounting"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ci
-msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
-
-#. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_J
 msgid "J INFORMATION AND COMMUNICATION"
 msgstr ""
@@ -10795,7 +10686,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.kg
-msgid "Kyrgyz Republic (Kyrgyzstan)"
+msgid "Kyrgyzstan"
 msgstr ""
 
 #. module: base
@@ -10814,6 +10705,11 @@ msgid "Landed Costs"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,orientation:0
+msgid "Landscape"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_base_language_export_lang
 #: model:ir.model.fields,field_description:base.field_base_language_install_lang
 #: model:ir.model.fields,field_description:base.field_base_update_translations_lang
@@ -10877,7 +10773,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export___last_update
 #: model:ir.model.fields,field_description:base.field_base_language_import___last_update
 #: model:ir.model.fields,field_description:base.field_base_language_install___last_update
-#: model:ir.model.fields,field_description:base.field_base_module_configuration___last_update
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall___last_update
 #: model:ir.model.fields,field_description:base.field_base_module_update___last_update
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade___last_update
 #: model:ir.model.fields,field_description:base.field_base_update_translations___last_update
@@ -10891,12 +10787,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window___last_update
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view___last_update
 #: model:ir.model.fields,field_description:base.field_ir_actions___last_update
-#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_300
+#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_282
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo___last_update
 #: model:ir.model.fields,field_description:base.field_ir_attachment___last_update
 #: model:ir.model.fields,field_description:base.field_ir_autovacuum___last_update
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter___last_update
 #: model:ir.model.fields,field_description:base.field_ir_cron___last_update
+#: model:ir.model.fields,field_description:base.field_ir_default___last_update
 #: model:ir.model.fields,field_description:base.field_ir_exports___last_update
 #: model:ir.model.fields,field_description:base.field_ir_exports_line___last_update
 #: model:ir.model.fields,field_description:base.field_ir_fields_converter___last_update
@@ -10917,6 +10814,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_property___last_update
 #: model:ir.model.fields,field_description:base.field_ir_qweb___last_update
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field___last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode___last_update
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact___last_update
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_date___last_update
 #: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime___last_update
@@ -10939,8 +10837,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu___last_update
 #: model:ir.model.fields,field_description:base.field_ir_ui_view___last_update
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom___last_update
-#: model:ir.model.fields,field_description:base.field_ir_values___last_update
 #: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference___last_update
+#: model:ir.model.fields,field_description:base.field_report_paperformat___last_update
 #: model:ir.model.fields,field_description:base.field_res_bank___last_update
 #: model:ir.model.fields,field_description:base.field_res_company___last_update
 #: model:ir.model.fields,field_description:base.field_res_config___last_update
@@ -10951,7 +10849,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_state___last_update
 #: model:ir.model.fields,field_description:base.field_res_currency___last_update
 #: model:ir.model.fields,field_description:base.field_res_currency_rate___last_update
-#: model:ir.model.fields,field_description:base.field_res_font___last_update
 #: model:ir.model.fields,field_description:base.field_res_groups___last_update
 #: model:ir.model.fields,field_description:base.field_res_lang___last_update
 #: model:ir.model.fields,field_description:base.field_res_partner___last_update
@@ -10970,7 +10867,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_write_uid
 #: model:ir.model.fields,field_description:base.field_base_language_import_write_uid
 #: model:ir.model.fields,field_description:base.field_base_language_install_write_uid
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_write_uid
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_write_uid
 #: model:ir.model.fields,field_description:base.field_base_module_update_write_uid
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_write_uid
 #: model:ir.model.fields,field_description:base.field_base_update_translations_write_uid
@@ -10984,10 +10881,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_actions_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_301
+#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_280
 #: model:ir.model.fields,field_description:base.field_ir_attachment_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_cron_write_uid
+#: model:ir.model.fields,field_description:base.field_ir_default_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_exports_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_filters_write_uid
@@ -11011,7 +10909,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_write_uid
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_values_write_uid
+#: model:ir.model.fields,field_description:base.field_report_paperformat_write_uid
 #: model:ir.model.fields,field_description:base.field_res_bank_write_uid
 #: model:ir.model.fields,field_description:base.field_res_company_write_uid
 #: model:ir.model.fields,field_description:base.field_res_config_installer_write_uid
@@ -11022,7 +10920,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_write_uid
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_write_uid
 #: model:ir.model.fields,field_description:base.field_res_currency_write_uid
-#: model:ir.model.fields,field_description:base.field_res_font_write_uid
 #: model:ir.model.fields,field_description:base.field_res_groups_write_uid
 #: model:ir.model.fields,field_description:base.field_res_lang_write_uid
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_write_uid
@@ -11041,7 +10938,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_base_language_export_write_date
 #: model:ir.model.fields,field_description:base.field_base_language_import_write_date
 #: model:ir.model.fields,field_description:base.field_base_language_install_write_date
-#: model:ir.model.fields,field_description:base.field_base_module_configuration_write_date
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_write_date
 #: model:ir.model.fields,field_description:base.field_base_module_update_write_date
 #: model:ir.model.fields,field_description:base.field_base_module_upgrade_write_date
 #: model:ir.model.fields,field_description:base.field_base_update_translations_write_date
@@ -11055,10 +10952,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_write_date
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_date
 #: model:ir.model.fields,field_description:base.field_ir_actions_write_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_302
+#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_281
 #: model:ir.model.fields,field_description:base.field_ir_attachment_write_date
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_date
 #: model:ir.model.fields,field_description:base.field_ir_cron_write_date
+#: model:ir.model.fields,field_description:base.field_ir_default_write_date
 #: model:ir.model.fields,field_description:base.field_ir_exports_line_write_date
 #: model:ir.model.fields,field_description:base.field_ir_exports_write_date
 #: model:ir.model.fields,field_description:base.field_ir_filters_write_date
@@ -11081,7 +10979,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_server_object_lines_write_date
 #: model:ir.model.fields,field_description:base.field_ir_ui_menu_write_date
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_write_date
-#: model:ir.model.fields,field_description:base.field_ir_values_write_date
+#: model:ir.model.fields,field_description:base.field_report_paperformat_write_date
 #: model:ir.model.fields,field_description:base.field_res_bank_write_date
 #: model:ir.model.fields,field_description:base.field_res_company_write_date
 #: model:ir.model.fields,field_description:base.field_res_config_installer_write_date
@@ -11092,7 +10990,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_country_write_date
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_write_date
 #: model:ir.model.fields,field_description:base.field_res_currency_write_date
-#: model:ir.model.fields,field_description:base.field_res_font_write_date
 #: model:ir.model.fields,field_description:base.field_res_groups_write_date
 #: model:ir.model.fields,field_description:base.field_res_lang_write_date
 #: model:ir.model.fields,field_description:base.field_res_partner_bank_write_date
@@ -11129,27 +11026,12 @@ msgid "Launch"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Launch Automatically"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.config_wizard_step_view_form
 #: model:ir.ui.view,arch_db:base.ir_actions_todo_tree
 msgid "Launch Configuration Wizard"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Launch Manually"
-msgstr ""
-
-#. module: base
-#: selection:ir.actions.todo,type:0
-msgid "Launch Manually Once"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
 msgid "Launchpad"
 msgstr ""
@@ -11170,8 +11052,8 @@ msgid "Lead Scoring"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_crm_project_issue
-msgid "Lead to Issue"
+#: model:ir.module.module,shortdesc:base.module_crm_project
+msgid "Lead to Tasks"
 msgstr ""
 
 #. module: base
@@ -11185,6 +11067,16 @@ msgid "Leave Management"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_hr_holidays
+msgid "Leave allocations and leave requests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hr_holidays
+msgid "Leaves"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays_gantt
 msgid "Leaves Gantt"
 msgstr ""
@@ -11195,6 +11087,16 @@ msgid "Lebanon"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_left
+msgid "Left Margin (mm)"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_category_parent_left
 msgid "Left parent"
 msgstr ""
@@ -11205,6 +11107,11 @@ msgid "Left-to-Right"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.sequence_view
 msgid "Legend (for prefix, suffix)"
 msgstr ""
@@ -11225,6 +11132,11 @@ msgid "Let returning shoppers save products in a wishlist"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_logging_level
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
 msgid "Level"
@@ -11261,6 +11173,35 @@ msgid "Line"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_account_payment
+msgid "Link Account and Payment and add Portal Payment\n"
+"\n"
+"Provide tools for account-related payment as well as portal options to\n"
+"enable payment.\n"
+"\n"
+" * UPDATE ME\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale_payment
+msgid "Link Sales and Payment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_payment
+msgid "Link Sales and Payment\n"
+"\n"
+"Provide tools for sale-related payment\n"
+"\n"
+" * specific management of transactions like sale order confirmation\n"
+" * tools method to handle transactions when allowing to pay / sell\n"
+" * JS code to handle a payment form (eCommerce\n"
+" * add payment-related fields on SO\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_link_tracker
 msgid "Link Tracker"
 msgstr ""
@@ -11437,13 +11378,13 @@ msgid "Madam"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/ir/ir_mail_server.py:466
 #, python-format
 msgid "Mail Delivery Failed"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:474
+#: code:addons/base/ir/ir_mail_server.py:464
 #, python-format
 msgid "Mail delivery failed via SMTP server '%s'.\n"
 "%s: %s"
@@ -11455,11 +11396,6 @@ msgid "Mailing List Archive"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_rml
-msgid "Main Report File Path/controller"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_sequence_id
 msgid "Main Sequence"
 msgstr ""
@@ -11511,6 +11447,50 @@ msgid "Manage Events and Sell Tickets Online"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid "Manage Recruitment and Job applications\n"
+"---------------------------------------\n"
+"\n"
+"Publish, promote and organize your job offers with the Odoo\n"
+"<a href=\"https://www.odoo.com/page/recruitment\">Open Source Recruitment Application</a>.\n"
+"\n"
+"Organize your job board, promote your job announces and keep track of\n"
+"application submissions easily. Follow every applicant and build up a database\n"
+"of skills and profiles with indexed documents.\n"
+"\n"
+"Post Your Jobs on Best Job Boards\n"
+"---------------------------------\n"
+"\n"
+"Connect automatically to most famous job board websites; linkedIn, Monster,\n"
+"Craigslist, ... Every job position has a new email address automatically\n"
+"assigned to route applications automatically to the right job position.\n"
+"\n"
+"Whether applicants contact you by email or using an online form, you get all\n"
+"the data indexed automatically (resumes, motivation letter) and you can answer\n"
+"in just a click, reusing templates of answers.\n"
+"\n"
+"Customize Your Recruitment Process\n"
+"----------------------------------\n"
+"\n"
+"Use the kanban view and customize the steps of your recruitments process;\n"
+"pre-qualification, first interview, second interview, negociaiton, ...\n"
+"\n"
+"Get accurate statistics on your recruitment pipeline. Get reports to compare\n"
+"the performance of your different investments on external job boards.\n"
+"\n"
+"Streamline Your Recruitment Process\n"
+"-----------------------------------\n"
+"\n"
+"Follow applicants in your recruitment process with the smart kanban view. Save\n"
+"time by automating some communications with email templates.\n"
+"\n"
+"Documents like resumes and motivation letters are indexed automatically,\n"
+"allowing you to easily find for specific skills and build up a database of\n"
+"profiles.\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
 msgid "Manage and customize the items available and displayed in your Odoo system menu. You can delete an item by clicking on the box at the beginning of each line and then delete it through the button that appeared. Items can be assigned to specific groups in order to make them accessible to some users within the system."
 msgstr ""
@@ -11552,13 +11532,6 @@ msgid "Manage your employee payroll records"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_actions_todo_type
-msgid "Manual: Launched manually.\n"
-"                                    Automatic: Runs whenever the system is reconfigured.\n"
-"                                    Launch Manually Once: after having been launched manually, it sets automatically to Done."
-msgstr ""
-
-#. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
 #: model:ir.module.module,shortdesc:base.module_mrp
 #: model:res.partner.industry,name:base.res_partner_industry_C
@@ -11581,7 +11554,7 @@ msgid "Many2One"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:615
+#: code:addons/base/ir/ir_model.py:622
 #, python-format
 msgid "Many2one %s on model %s does not exist!"
 msgstr ""
@@ -11610,13 +11583,8 @@ msgid "Marketing"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
-msgid "Marketing Campaign - Demo"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_marketing_campaign
-msgid "Marketing Campaigns"
+#: model:ir.module.module,shortdesc:base.module_marketing_automation
+msgid "Marketing Automation"
 msgstr ""
 
 #. module: base
@@ -11636,7 +11604,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.mq
-msgid "Martinique (French)"
+msgid "Martinique"
 msgstr ""
 
 #. module: base
@@ -11749,6 +11717,18 @@ msgid "Messaging and Social"
 msgstr ""
 
 #. module: base
+#: code:addons/base/res/res_config.py:499
+#, python-format
+msgid "Methods that start with `get_default_` are deprecated. Override `get_values` instead(Method %s)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:543
+#, python-format
+msgid "Methods that start with `set_` are deprecated. Override `set_values` instead (Method %s)"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_l10n_mx_edi
 msgid "Mexican Localization for EDI documents"
 msgstr ""
@@ -11806,25 +11786,25 @@ msgid "Miss"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:232
+#: code:addons/base/ir/ir_mail_server.py:217
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2781
+#: code:addons/models.py:2777
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:5102
+#: code:addons/models.py:5130
 #, python-format
 msgid "Missing required value for the field '%s' (%s)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:379
+#: code:addons/base/ir/ir_ui_view.py:369
 #, python-format
 msgid "Missing view architecture."
 msgstr ""
@@ -11848,13 +11828,10 @@ msgid "Mobile:"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_font_mode
-msgid "Mode"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_model
+#: model:ir.model.fields,field_description:base.field_ir_act_server_model_id
 #: model:ir.model.fields,field_description:base.field_ir_act_server_model_name
+#: model:ir.model.fields,field_description:base.field_ir_cron_model_id
 #: model:ir.model.fields,field_description:base.field_ir_cron_model_name
 #: model:ir.model.fields,field_description:base.field_ir_filters_model_id
 #: model:ir.model.fields,field_description:base.field_ir_model_constraint_model
@@ -11865,7 +11842,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_model_ids
 #: model:ir.ui.view,arch_db:base.act_report_xml_search_view
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
-#: model:ir.ui.view,arch_db:base.values_view_search_action
 #: model:ir.ui.view,arch_db:base.view_model_search
 #: model:ir.ui.view,arch_db:base.view_server_action_search
 #: model:ir.ui.view,arch_db:base.view_translation_search
@@ -11873,23 +11849,18 @@ msgid "Model"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:611
+#: code:addons/base/ir/ir_model.py:618
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:173
+#: code:addons/base/ir/ir_model.py:179
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_values_model_id
-msgid "Model (change only)"
-msgstr ""
-
-#. module: base
 #: model:ir.actions.act_window,name:base.action_model_constraint
 #: model:ir.ui.menu,name:base.ir_model_constraint_menu
 #: model:ir.ui.view,arch_db:base.view_model_constraint_form
@@ -11914,12 +11885,11 @@ msgstr ""
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_data_model
-#: model:ir.model.fields,field_description:base.field_ir_values_model
 msgid "Model Name"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.report.xml,name:base.report_ir_model_overview
+#: model:ir.actions.report,name:base.report_ir_model_overview
 msgid "Model Overview"
 msgstr ""
 
@@ -11942,24 +11912,22 @@ msgid "Model not found: %(model)s"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_values_model
-msgid "Model to which this entry applies"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,help:base.field_ir_values_model_id
-msgid "Model to which this entry applies - helper field for setting a model, will automatically set the correct model name"
+#: model:ir.model.fields,help:base.field_ir_act_server_model_id
+#: model:ir.model.fields,help:base.field_ir_cron_model_id
+msgid "Model on which the server action runs."
 msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
 #: model:ir.model,name:base.model_ir_model
 #: model:ir.ui.menu,name:base.ir_model_model_menu
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
 msgid "Models"
 msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_module_id
 #: model:ir.model.fields,field_description:base.field_ir_model_constraint_module
 #: model:ir.model.fields,field_description:base.field_ir_model_data_module
 #: model:ir.model.fields,field_description:base.field_ir_model_relation_module
@@ -11986,6 +11954,11 @@ msgid "Module Name"
 msgstr ""
 
 #. module: base
+#: model:ir.model,name:base.model_base_module_uninstall
+msgid "Module Uninstallation"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
 msgid "Module Update"
 msgstr ""
@@ -12026,14 +11999,14 @@ msgid "Modules"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:384
+#: code:addons/base/module/module.py:381
 #, python-format
 msgid "Modules \"%s\" and \"%s\" are incompatible."
 msgstr ""
 
 #. module: base
 #: model:res.country,name:base.md
-msgid "Moldavia"
+msgid "Moldova"
 msgstr ""
 
 #. module: base
@@ -12072,16 +12045,6 @@ msgid "Montserrat"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_ir_values_id
-msgid "More Menu entry"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_ir_values_id
-msgid "More menu entry."
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
 msgstr ""
@@ -12150,7 +12113,7 @@ msgstr ""
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_name
 #: model:ir.model.fields,field_description:base.field_ir_actions_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_name_306
+#: model:ir.model.fields,field_description:base.field_ir_actions_name_271
 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_name
 #: model:ir.model.fields,field_description:base.field_ir_cron_cron_name
 #: model:ir.model.fields,field_description:base.field_ir_logging_name
@@ -12161,7 +12124,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_property_name
 #: model:ir.model.fields,field_description:base.field_ir_rule_name
 #: model:ir.model.fields,field_description:base.field_ir_sequence_name
-#: model:ir.model.fields,field_description:base.field_ir_values_name
+#: model:ir.model.fields,field_description:base.field_report_paperformat_name
 #: model:ir.model.fields,field_description:base.field_res_bank_name
 #: model:ir.model.fields,field_description:base.field_res_country_group_name
 #: model:ir.model.fields,field_description:base.field_res_groups_name
@@ -12174,6 +12137,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.ir_property_view_search
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_partner_simple_form
 #: model:ir.ui.view,arch_db:base.view_partner_tree
 msgid "Name"
@@ -12215,18 +12179,8 @@ msgid "Netherlands - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.an
-msgid "Netherlands Antilles"
-msgstr ""
-
-#. module: base
-#: model:res.country,name:base.nt
-msgid "Neutral Zone"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.nc
-msgid "New Caledonia (French)"
+msgid "New Caledonia"
 msgstr ""
 
 #. module: base
@@ -12313,7 +12267,12 @@ msgid "Niue"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:1272
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
+msgid "No Record Found"
+msgstr ""
+
+#. module: base
+#: code:addons/models.py:1287
 #, python-format
 msgid "No default view of type '%s' could be found !"
 msgstr ""
@@ -12324,7 +12283,7 @@ msgid "No gap"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:2228
+#: code:addons/fields.py:2184
 #, python-format
 msgid "No inverse field %r found for %r"
 msgstr ""
@@ -12352,13 +12311,13 @@ msgid "Non-Portal Groups"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:432
+#: code:addons/base/ir/ir_model.py:438
 #, python-format
 msgid "Non-relational field %r in dependency %r"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:389
+#: code:addons/base/ir/ir_model.py:395
 #, python-format
 msgid "Non-relational field name '%s' in related field '%s'"
 msgstr ""
@@ -12484,11 +12443,534 @@ msgid "Object:"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_blog
+msgid "Odoo Blogs\n"
+"----------\n"
+"\n"
+"Write, Design, Promote and Engage with <a href=\"https://www.odoo.com/page/blog-engine\">Odoo Blogs</a>.\n"
+"\n"
+"Express yourself with the Odoo enterprise grade blogging platform. Write\n"
+"beautiful blog posts, engage with visitors, translate content and moderate\n"
+"social streams.\n"
+"\n"
+"Get your blog posts efficiently referenced in Google and translated in mutiple\n"
+"languages in just a few clicks.\n"
+"\n"
+"Write Beautiful Blog Posts\n"
+"--------------------------\n"
+"\n"
+"Drag & Drop well designed *'Building Blocks'* to create beautifull blog posts\n"
+"that perfectly integrates images, videos, call-to-actions, quotes, banners,\n"
+"etc.\n"
+"\n"
+"With our unique *'edit inline'* approach, you don't need to be a designer to\n"
+"create awsome, good-looking, content. Each blog post will look like it's\n"
+"designed by a professional designer.\n"
+"\n"
+"Automated Translation by Professionals\n"
+"--------------------------------------\n"
+"\n"
+"Get your blog posts translated in multiple languages with no effort. Our\n"
+"translation \"on demand\" feature allows you to benefit from professional\n"
+"translators to translate all your changes automatically. (\\$0.05 per word)\n"
+"Translated versions are updated automatically once translated by professionals\n"
+"(around 32 hours).\n"
+"\n"
+"Engage With Your Visitors\n"
+"-------------------------\n"
+"\n"
+"The integrated website live chat feature allows you to start chatting in real time with\n"
+"your visitors to get feedback on your recent posts or get ideas to write new\n"
+"posts.\n"
+"\n"
+"Engaging with your visitors is also a great way to convert visitors into\n"
+"customers.\n"
+"\n"
+"Build Visitor Loyalty\n"
+"---------------------\n"
+"\n"
+"The one click *follow* button will allow visitors to receive your blog posts by\n"
+"email with no effort, without having to register. Social media icons allow\n"
+"visitors to share your best blog posts easily.\n"
+"\n"
+"Google Analytics Integration\n"
+"----------------------------\n"
+"\n"
+"Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers\n"
+"are configured by default to track all kinds of events related to shopping\n"
+"carts, call-to-actions, etc.\n"
+"\n"
+"As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with\n"
+"Google Analytics, you get a 360° view of your business.\n"
+"\n"
+"SEO Optimized Blog Posts\n"
+"------------------------\n"
+"\n"
+"SEO tools are ready to use, with no configuration required. Odoo suggests\n"
+"keywords for your titles according to Google's most searched terms, Google\n"
+"Analytics tracks interests of your visitors, sitemaps are created automatically\n"
+"for quick Google indexing, etc.\n"
+"\n"
+"The system even creates structured content automatically to promote your\n"
+"products and events effectively in Google.\n"
+"\n"
+"Designer-Friendly Themes\n"
+"------------------------\n"
+"\n"
+"Themes are awesome and easy to design. You don't need to develop to create new\n"
+"pages, themes or building blocks. We use a clean HTML structure, a\n"
+"[bootstrap](http://getbootstrap.com/) CSS and our modularity allows you to\n"
+"distribute your themes easily.\n"
+"\n"
+"The building block approach allows the website to remain clean after end-users\n"
+"start creating new contents.\n"
+"\n"
+"Easy Access Rights\n"
+"------------------\n"
+"\n"
+"Not everyone requires the same access to your website. Designers manage the\n"
+"layout of the site, editors approve content and authors write that content.\n"
+"This lets you organize your publishing process according to your needs.\n"
+"\n"
+"Other access rights are related to business objects (products, people, events,\n"
+"etc) and directly following Odoo's standard access rights management, so you do\n"
+"not have to configure things twice.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm
+msgid "Odoo CRM\n"
+"--------\n"
+"\n"
+"Boost sales productivity, improve win rates, grow revenue with the Odoo\n"
+"<a href=\"https://www.odoo.com/page/crm\">Open Source CRM</a>.\n"
+"\n"
+"Manage your sales funnel with no effort. Attract leads, follow-up on phone\n"
+"calls and meetings. Analyse the quality of your leads to make informed\n"
+"decisions and save time by integrating emails directly into the application.\n"
+"\n"
+"Your Sales Funnel, The Way You Like It\n"
+"--------------------------------------\n"
+"\n"
+"Track your opportunities pipeline with the revolutionary kanban view. Work\n"
+"inside your sales funnel and get instant visual information about next actions,\n"
+"new messages, top opportunities and expected revenues.\n"
+"\n"
+"Lead Management Made Easy\n"
+"-------------------------\n"
+"\n"
+"Create leads automatically from incoming emails. Analyse leads efficiency and\n"
+"compare performance by campaigns, channels or sales channel.\n"
+"\n"
+"Find duplicates, merge leads and assign them to the right salesperson in one\n"
+"operation. Spend less time on administration and more time on qualifying leads.\n"
+"\n"
+"Organize Your Opportunities\n"
+"---------------------------\n"
+"\n"
+"Get your opportunities organized to stay focused on the best deals. Manage all\n"
+"your customer interactions from the opportunity like emails, phone calls,\n"
+"internal notes, meetings and quotations.\n"
+"\n"
+"Follow opportunities that interest you to get notified upon specific events:\n"
+"deal won or lost, stage changed, new customer demand, etc.\n"
+"\n"
+"Email Integration and Automation\n"
+"--------------------------------\n"
+"\n"
+"Work with the email applications you already use every day. Whether your\n"
+"company uses Microsoft Outlook or Gmail, no one needs to change the way they\n"
+"work, so everyone stays productive.\n"
+"\n"
+"Route, sort and filter incoming emails automatically. Odoo CRM handles incoming\n"
+"emails and route them to the right opportunities or sales channel. New leads are\n"
+"created on the fly and interested salespersons are notified automatically.\n"
+"\n"
+"Collaborative Agenda\n"
+"--------------------\n"
+"\n"
+"Schedule your meetings and phone calls using the integrated calendar. You can\n"
+"see your agenda and your colleagues' in one view. As a manager, it's easy to\n"
+"see what your team is busy with.\n"
+"\n"
+"Lead Automation and Marketing Campaigns\n"
+"---------------------------------------\n"
+"\n"
+"Drive performance by automating tasks with Odoo <a href=\"https://www.odoo.com/page/crm\">CRM</a>.\n"
+"\n"
+"Use our marketing campaigns to automate lead acquisition, follow ups and\n"
+"promotions. Define automated actions (e.g. ask a salesperson to call, send an\n"
+"email, ...) based on triggers (no activity since 20 days, answered a\n"
+"promotional email, etc.)\n"
+"\n"
+"Optimize campaigns from lead to close, on every channel. Make smarter decisions\n"
+"about where to invest and show the impact of your marketing activities on your\n"
+"company's bottom line.\n"
+"\n"
+"Customize Your Sales Cycle\n"
+"--------------------------\n"
+"\n"
+"Customize your sales cycle by configuring sales stages that perfectly fit your\n"
+"sales approach. Control statistics to get accurate forecasts to improve your\n"
+"sales performance at every stage of your customer relationship.\n"
+"\n"
+"Drive Engagement with Gamification\n"
+"----------------------------------\n"
+"\n"
+"### Leverage your team's natural desire for competition\n"
+"\n"
+"Reinforce good habits and improve win rates with real-time recognition and\n"
+"rewards inspired by [game mechanics](http://en.wikipedia.org/wiki/Gamification).\n"
+"Align sales channels around clear business objectives with challenges, personal\n"
+"objectives and team leader boards.\n"
+"\n"
+"### Leaderboards\n"
+"\n"
+"Promote leaders and competition amongst sales channel with performance ratios.\n"
+"\n"
+"### Personal Objectives\n"
+"\n"
+"Assign clear goals to users to align them with the company objectives.\n"
+"\n"
+"### Team Targets\n"
+"\n"
+"Compare revenues with forecasts and budgets in real time.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: selection:ir.module.module,license:0
 msgid "Odoo Enterprise Edition License v1.0"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_mail
+msgid "Odoo Enterprise Social Network\n"
+"------------------------------\n"
+"\n"
+"Connect with experts, follow what interests you, share documents and promote\n"
+"best practices with Odoo <a href=\"https://www.odoo.com/page/enterprise-social-network\">Enterprise Social Network</a>. Get work done with\n"
+"effective collaboration across departments, geographies, documents and business\n"
+"applications. All of this while decreasing email overload.\n"
+"\n"
+"Connect with experts\n"
+"--------------------\n"
+"\n"
+"Next time you have a question for the marketing, sales, R&D or any other\n"
+"department, don't send an email blast-post the question to Odoo and get answers\n"
+"from the right persons.\n"
+"\n"
+"Follow what interests you\n"
+"-------------------------\n"
+"\n"
+"Want to get informed about new product features, hot deals, bottlenecks in\n"
+"projects or any other event? Just follow what interests you to get the\n"
+"information you need what you need; no more, no less.\n"
+"\n"
+"Get Things Done\n"
+"---------------\n"
+"\n"
+"You can process (not only read) the inbox and easily mark messages for future\n"
+"actions. Start feeling the pleasure of having an empty inbox every day; no more\n"
+"overload of information.\n"
+"\n"
+"Promote best practices\n"
+"----------------------\n"
+"\n"
+"Cut back on meetings and email chains by working together in groups of\n"
+"interests. Create a group to let people share files, discuss ideas, and vote to\n"
+"promote best practices.\n"
+"\n"
+"Improve Access to Information and Expertise\n"
+"-------------------------------------------\n"
+"\n"
+"Break down information silos. Search across your existing systems to find the\n"
+"answers and expertise you need to complete projects quickly.\n"
+"\n"
+"Collaborate securely\n"
+"--------------------\n"
+"\n"
+"Set the right security policy; public, private or on invitation only --\n"
+"according to the information sensitivity.\n"
+"\n"
+"A Twitter-like Network For My Company\n"
+"---------------------------------------\n"
+"\n"
+"Make every employee feel more connected and engaged with twitter-like features\n"
+"for your own company. Follow people, share best practices, 'like' top ideas,\n"
+"etc.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr
+msgid "Odoo Human Resources\n"
+"--------------------\n"
+"\n"
+"With Odoo <a href=\"https://www.odoo.com/page/employees\">Human Resources</a>,\n"
+"manage the most important asset in your company: People\n"
+"\n"
+"Get all your HR operations managed easily: knowledge sharing, recruitments,\n"
+"appraisals, timesheets, contracts, attendances, payroll, etc.\n"
+"\n"
+"Each need is provided by a specific app that you activate on demand.\n"
+"\n"
+"Manage Your Employees\n"
+"---------------------\n"
+"\n"
+"Oversee all important information in your company address book. Some\n"
+"information are restricted to HR managers, others are public to easily look\n"
+"colleagues.\n"
+"\n"
+"Record employee contracts and get alerts when they have to be renewed.\n"
+"\n"
+"Streamline Your Recruitment Process\n"
+"-----------------------------------\n"
+"\n"
+"Index resumes, track applicants, search profiles with <a href=\"https://www.odoo.com/page/employees\">Odoo HR</a>.\n"
+"\n"
+"Post job offers and keep track of each application received. Follow applicants\n"
+"in your recruitment process with the smart kanban view.\n"
+"\n"
+"Save time by automating some communications with email templates. Resumes are\n"
+"indexed automatically, allowing you to easily find for specific profiles.\n"
+"\n"
+"Enterprise Social Network\n"
+"-------------------------\n"
+"\n"
+"Break down information silos. Share knowledge and best practices amongst all\n"
+"employees. Follow specific people or documents and join groups of interests to\n"
+"share expertise and documents.\n"
+"\n"
+"Interact with your coworkers in real time with website live chat.\n"
+"\n"
+"Track time and attendances\n"
+"--------------------------\n"
+"\n"
+"Keep track of the time spent by project, client or task. It's easy to record\n"
+"timesheets or check attendances for each employee. Get your analytic accounting\n"
+"posted automatically based on time spent on your projects.\n"
+"\n"
+"Leaves Management\n"
+"-----------------\n"
+"\n"
+"Keep track of the vacation days accrued by each employee. Employees enter their\n"
+"requests (paid leaves, sick leaves, etc), for managers to approve and\n"
+"validate. It's all done in just a few clicks. The agenda of each employee is\n"
+"updated accordingly.\n"
+"\n"
+"Keep Track of Employee Expenses\n"
+"-------------------------------\n"
+"\n"
+"Get rid of the paper work and follow employee's expenses directly in Odoo.\n"
+"Don't loose time or money by controlling the full flow: expense validation,\n"
+"reimbursement of employees, posting in the accounting and re-invoicing to\n"
+"customers.\n"
+"\n"
+"Follow Periodic Appraisals\n"
+"--------------------------\n"
+"\n"
+"Set-up appraisals plans and/or surveys for your employees and watch their\n"
+"evolution. Define steps for interviews and Odoo will notify managers or\n"
+"subordinates automatically to prepare appraisals. Keep track of the progress of\n"
+"your staff periodically.\n"
+"\n"
+"Boost Engagement With Gamification\n"
+"----------------------------------\n"
+"\n"
+"### Define clear objective and provide real time feedback\n"
+"\n"
+"Inspire achievement with challenges, goals and rewards. Define clear objectives\n"
+"and provide real time feedback and tangible results. Showcase the top\n"
+"performers to the entire channel and publicly recognize a job well done.\n"
+"\n"
+"### Leaderboards\n"
+"\n"
+"Promote leaders and competition amongst sales channel with performance ratios.\n"
+"\n"
+"### Personal Objectives\n"
+"\n"
+"Assign clear goals to users to align them with the company objectives.\n"
+"\n"
+"### Team Targets\n"
+"\n"
+"Compare revenues with forecasts and budgets in real time.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp
+msgid "Odoo Manufacturing Resource Planning\n"
+"------------------------------------\n"
+"\n"
+"Manage Bill of Materials, plan manufacturing orders, track work orders with the\n"
+"Odoo <a href=\"https://www.odoo.com/page/manufacturing\">Open Source MRP</a> app.\n"
+"\n"
+"Get all your assembly or manufacturing operations managed by Odoo. Schedule\n"
+"manufacturing orders and work orders automatically. Review the proposed\n"
+"planning with the smart kanban and gantt views. Use the advanced analytics\n"
+"features to detect bottleneck in resources capacities and inventory locations.\n"
+"\n"
+"Schedule Manufacturing Orders Efficiently\n"
+"-----------------------------------------\n"
+"\n"
+"Get manufacturing orders and work orders scheduled automatically based on your\n"
+"procurement rules, quantities forecasted and dependent demand (demand for this\n"
+"part based on another part consuming it).\n"
+"\n"
+"Define Flexible Master Data\n"
+"---------------------------\n"
+"\n"
+"Get the flexibility to create multi-level bill of materials, optional routing,\n"
+"version changes and phantom bill of materials. You can use BoM for kits or for\n"
+"manufacturing orders.\n"
+"\n"
+"Get Flexibility In All Operations\n"
+"---------------------------------\n"
+"\n"
+"Edit manually all proposed operations at any level of the progress. With Odoo,\n"
+"you will not be frustrated by a rigid system.\n"
+"\n"
+"Schedule Work Orders\n"
+"--------------------\n"
+"\n"
+"Check resources capacities and fix bottlenecks.  Define routings and plan the\n"
+"working time and capacity of your resources. Quickly identify resource\n"
+"requirements and bottlenecks to ensure your production meets your delivery\n"
+"schedule dates.\n"
+"\n"
+"\n"
+"A Productive User Interface\n"
+"---------------------------\n"
+"\n"
+"Organize manufacturing orders and work orders the way you like it. Process next\n"
+"orders from the list view, control in the calendar view and edit the proposed\n"
+"schedule in the Gantt view.\n"
+"\n"
+"\n"
+"Inventory & Manufacturing Analytics\n"
+"-----------------------------------\n"
+"\n"
+"Track the evolution of the stock value, according to the level of manufacturing\n"
+"activities as they progress in the transformation process.\n"
+"\n"
+"Fully Integrated with Operations\n"
+"--------------------------------\n"
+"\n"
+"Get your manufacturing resource planning accurate with it's full integration\n"
+"with sales and purchases apps. The accounting integration allows real time\n"
+"accounting valuation and deeper reporting on costs and revenues on your\n"
+"manufacturing operations.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mass_mailing
+msgid "Odoo Mass Mailing\n"
+"-----------------\n"
+"\n"
+"Easily send mass mailing to your leads, opportunities or customers\n"
+"with Odoo <a href=\"https://www.odoo.com/page/mailing#\">Mass Mailing</a>. Track\n"
+"marketing campaigns performance to improve conversion rates. Design\n"
+"professional emails and reuse templates in a few clicks.\n"
+"\n"
+"Send Professional Emails\n"
+"------------------------\n"
+"\n"
+"Import database of prospects or filter on existing leads, opportunities and\n"
+"customers in just a few clicks.\n"
+"\n"
+"Define email templates to reuse content or specific design for your newsletter.\n"
+"Setup several email servers with their own IP/domain to optimise opening rates.\n"
+"\n"
+"Organize Marketing Campaigns\n"
+"----------------------------\n"
+"\n"
+"Design, Send, Track by Campaigns with our <a href=\"https://www.odoo.com/page/mailing\">Lead Automation</a> app.\n"
+"\n"
+"Get real time statistics on campaigns performance to improve your conversion\n"
+"rate. Track mails sent, received, opened and answered.\n"
+"\n"
+"Easily manage your marketing campaigns, discussion groups, leads and\n"
+"opportunities in one simple and powerful platform.\n"
+"\n"
+"Integrated with Odoo Apps\n"
+"-------------------------\n"
+"\n"
+"Get access to mass mailing features from every Odoo app to improve the way your\n"
+"users communicate.\n"
+"\n"
+"Send template of emails from Odoo <a href=\"https://www.odoo.com/page/mailing\">CRM opportunities</a>, select leads based\n"
+"on marketing segments, send <a href=\"https://www.odoo.com/page/recruitment\">job offers</a> and automate\n"
+"answers to applicants, reuse email template in the lead automation marketing\n"
+"campaigns.\n"
+"\n"
+"Answers to your emails appears automatically in the history of every document\n"
+"with the social network module.\n"
+"\n"
+"Clean Your Lead Database\n"
+"------------------------\n"
+"\n"
+"Get a clean lead database that improves over the time using the performance of\n"
+"your mails. Odoo handle bounce mails efficiently, flag erroneous leads\n"
+"accordingly and gives you statistics on the quality of your leads.\n"
+"\n"
+"One click emails send\n"
+"---------------------\n"
+"\n"
+"The marketing department will love working on campaigns. But you can also give\n"
+"a one click mass mailing facility to all others users on their own prospects or\n"
+"documents.\n"
+"\n"
+"Select a few documents (e.g. leads, support tickets, suppliers, applicants,\n"
+"...) and send emails to their contacts in one click, reusing existing emails\n"
+"templates.\n"
+"\n"
+"Follow-up On Answers\n"
+"--------------------\n"
+"\n"
+"The chatter feature enables you to communicate faster and more efficiently with\n"
+"your customer. Get documents created automatically (leads, opportunities,\n"
+"tasks, ...) based on answers to your mass mailing campaigns Follow the\n"
+"discussion directly on the business documents within Odoo or via email.\n"
+"\n"
+"Get all the negotiations and discussions attached to the right document and\n"
+"relevent managers notified on specific events.\n"
+"\n"
+"Campaigns Dashboard\n"
+"-------------------\n"
+"\n"
+"Get the insights you need to make smarter marketing campaign. Track statistics\n"
+"per campaign: bounce rates, sent mails, best content, etc. The clear dashboards\n"
+"gives you a direct overview of your campaign performance.\n"
+"\n"
+"Fully Integrated With Others Apps\n"
+"---------------------------------\n"
+"\n"
+"Define automated actions (e.g. ask a salesperson to call, send an email, ...)\n"
+"based on triggers (no activity since 20 days, answered a promotional email,\n"
+"etc.)\n"
+"\n"
+"Optimize campaigns from lead to close, on every channel. Make smarter decisions\n"
+"about where to invest and show the impact of your marketing activities on your\n"
+"company's bottom line.\n"
+"\n"
+"Integrate a contact form in your website easily. Forms submissions create leads\n"
+"automatically in Odoo CRM. Leads can be used in marketing campaigns.\n"
+"\n"
+"Manage your <a href=\"https://www.odoo.com/page/crm\">sales funnel</a> with no\n"
+"effort. Attract leads, follow-up on phone calls and meetings. Analyse the\n"
+"quality of your leads to make informed decisions and save time by integrating\n"
+"emails directly into the application.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx_reports
 msgid "Odoo Mexican Localization Reports"
 msgstr ""
@@ -12499,6 +12981,183 @@ msgid "Odoo Mobile Core module"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_note
+msgid "Odoo Notes\n"
+"----------\n"
+"\n"
+"Organize yourself with efficient <a href=\"https://www.odoo.com/page/notes\">todo lists and notes</a>.\n"
+"From personal tasks to collaborative meeting minutes, increase your user's\n"
+"productivity by giving them the tools to prioritize their work, share their\n"
+"ideas and collaborate on documents.\n"
+"\n"
+"Personal to-do lists that works\n"
+"-------------------------------\n"
+"\n"
+"Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.\n"
+"\n"
+"### Beat Work Overload\n"
+"\n"
+"Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to [Get Things Done](http://en.wikipedia.org/wiki/Getting_Things_Done).\n"
+"\n"
+"### Prioritize Efficiently\n"
+"\n"
+"Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks.\n"
+"\n"
+"### Find Motivation to Close Tasks\n"
+"\n"
+"People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done.\n"
+"\n"
+"Adapts to Your Creative Process\n"
+"-------------------------------\n"
+"\n"
+"### Customize to your own workflow\n"
+"\n"
+"Everyone has their own way to organize activities. Odoo Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes.\n"
+"\n"
+"### A Creative Person\n"
+"\n"
+"A creative person will organize notes based on idea's maturity level: Draft Ideas ** Mature Ideas ** Specified **To Do\n"
+"\n"
+"### A Frequent Traveler\n"
+"\n"
+"An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home\n"
+"\n"
+"### A Manager\n"
+"\n"
+"A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later\n"
+"\n"
+"Personnal Notes\n"
+"---------------\n"
+"\n"
+"### Notes are private but can be shared\n"
+"\n"
+"Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad.\n"
+"\n"
+"Collaborative Meeting Minutes\n"
+"-----------------------------\n"
+"\n"
+"### Real-time sharing and edition of notes\n"
+"\n"
+"The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid "Odoo Point of Sale\n"
+"-----------------------------\n"
+"\n"
+"Odoo's <a href=\"https://www.odoo.com/page/point-of-sale\">Point of Sale</a>\n"
+"introduces a super clean interface with no installation required that runs\n"
+"online and offline on modern hardwares.\n"
+"\n"
+"It's full integration with the company inventory and accounting, gives you real\n"
+"time statistics and consolidations amongst all shops without the hassle of\n"
+"integrating several applications.\n"
+"\n"
+"Work with the hardware you already have\n"
+"---------------------------------------\n"
+"\n"
+"### In your web browser\n"
+"\n"
+"Odoo's POS is a web application that can run on any device that can display\n"
+"websites with little to no setup required.\n"
+"\n"
+"### Touchscreen or Keyboard ?\n"
+"\n"
+"The Point of Sale works perfectly on any kind of touch enabled device, whether\n"
+"it's multi-touch tablets like an iPad or keyboardless resistive touchscreen\n"
+"terminals.\n"
+"\n"
+"### Scales and Printers\n"
+"\n"
+"Barcode scanners and printers are supported out of the box with no setup\n"
+"required. Scales, cashboxes, and other peripherals can be used with the proxy\n"
+"API.\n"
+"\n"
+"Online and Offline\n"
+"------------------\n"
+"\n"
+"### Odoo's POS stays reliable even if your connection isn't\n"
+"\n"
+"Deploy new stores with just an internet connection: **no installation, no\n"
+"specific hardware required**. It works with any **iPad, Tablet PC, laptop** or\n"
+"industrial POS machine.\n"
+"\n"
+"While an internet connection is required to start the Point of Sale, it will\n"
+"stay operational even after a complete disconnection.\n"
+"\n"
+"\n"
+"A super clean user interface\n"
+"----------------------------\n"
+"\n"
+"### Simple and beautifull\n"
+"\n"
+"Say goodbye to ugly, outdated POS software and enjoy the Odoo web interface\n"
+"designed for modern retailer.\n"
+"\n"
+"### Designed for Productivity\n"
+"\n"
+"Whether it's for a restaurant or a shop, you can activate the multiple tickets\n"
+"in parallel to not make your customers wait.\n"
+"\n"
+"### Blazing fast search\n"
+"\n"
+"Scan products, browse through hierarchical categories, or get quick information\n"
+"about products with the blasting fast filter accross all your products.\n"
+"\n"
+"Integrated Inventory Management\n"
+"-------------------------------\n"
+"\n"
+"Consolidate all your sales channels in real time: stores, ecommerce, sales\n"
+"teams. Get real time control of the inventory and accurate forecasts to manage\n"
+"procurements.\n"
+"\n"
+"A full warehouse management system at your fingertips: get information about\n"
+"products availabilities, trigger procurement requests, etc.\n"
+"\n"
+"Deliver in-store customer services\n"
+"----------------------------------\n"
+"\n"
+"Give your shopper a strong experience by integrating in-store customer\n"
+"services. Handle reparations, track warantees, follow customer claims, plan\n"
+"delivery orders, etc.\n"
+"\n"
+"Invoicing & Accounting Integration\n"
+"----------------------------------\n"
+"\n"
+"Produce customer invoices in just a few clicks. Control sales and cash in real\n"
+"time and use Odoo's powerful reporting to make smarter decisions to improve\n"
+"your store's efficiency.\n"
+"\n"
+"No more hassle of having to integrate softwares: get all your sales and\n"
+"inventory operations automatically posted in your G/L.\n"
+"\n"
+"Unified Data Amongst All Shops\n"
+"------------------------------\n"
+"\n"
+"Get new products, pricing strategies and promotions applied automatically to\n"
+"selected stores. Work on a unified customer base. No complex interface is\n"
+"required to pilot a global strategy amongst all your stores.\n"
+"\n"
+"With Odoo as a backend, you have a system proven to be perfectly suitable for\n"
+"small stores or large multinationals.\n"
+"\n"
+"Know your customers - in store and out\n"
+"--------------------------------------\n"
+"\n"
+"Successful brands integrates all their customer relationship accross all their\n"
+"channels to develop accurate customer profile and communicate with shoppers as\n"
+"they make buying decisions, in store or online.\n"
+"\n"
+"With Odoo, you get a 360° customer view, including cross-channel sales,\n"
+"interaction history, profiles, and more.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: selection:ir.module.module,license:0
 msgid "Odoo Proprietary License v1.0"
 msgstr ""
@@ -12509,8 +13168,71 @@ msgid "Odoo Settings Dashboard"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_crm_voip
-msgid "Odoo VOIP"
+#: model:ir.module.module,description:base.module_purchase
+msgid "Odoo Supply Chain\n"
+"-----------------\n"
+"\n"
+"Automate requisition-to-pay, control invoicing with the Odoo\n"
+"<a href=\"https://www.odoo.com/page/purchase\">Open Source Supply Chain</a>.\n"
+"\n"
+"Automate procurement propositions, launch request for quotations, track\n"
+"purchase orders, manage vendors' information, control products reception and\n"
+"check vendors' invoices.\n"
+"\n"
+"Automated Procurement Propositions\n"
+"----------------------------------\n"
+"\n"
+"Reduce inventory level with procurement rules. Get the right purchase\n"
+"proposition at the right time to reduce your inventory level. Improve your\n"
+"purchase and inventory performance with procurement rules depending on stock\n"
+"levels, logistic rules, sales orders, forecasted manufacturing orders, etc.\n"
+"\n"
+"Send requests for quotations or purchase orders to your vendor in one click.\n"
+"Get access to product receptions and invoices from your purchase order.\n"
+"\n"
+"Purchase Tenders\n"
+"----------------\n"
+"\n"
+"Launch purchase tenders, integrate vendor's answers in the process and\n"
+"compare propositions. Choose the best offer and send purchase orders easily.\n"
+"Use reporting to analyse the quality of your vendors afterwards.\n"
+"\n"
+"\n"
+"Email integrations\n"
+"------------------\n"
+"\n"
+"Integrate all vendor's communications on the purchase orders (or RfQs) to get\n"
+"a strong traceability on the negotiation or after sales service issues. Use the\n"
+"claim management module to track issues related to vendors.\n"
+"\n"
+"Standard Price, Average Price, FIFO\n"
+"-----------------------------------\n"
+"\n"
+"Use the costing method that reflects your business: standard price, average\n"
+"price, fifo or lifo. Get your accounting entries and the right inventory\n"
+"valuation in real-time; Odoo manages everything for you, transparently.\n"
+"\n"
+"Import Vendor Pricelists\n"
+"--------------------------\n"
+"\n"
+"Take smart purchase decisions using the best prices.  Easily import vendor's\n"
+"pricelists to make smarter purchase decisions based on promotions, prices\n"
+"depending on quantities and special contract conditions. You can even base your\n"
+"sale price depending on your vendor's prices.\n"
+"\n"
+"Control Products and Invoices\n"
+"-----------------------------\n"
+"\n"
+"No product or order is left behind, the inventory control allows you to manage\n"
+"back orders, refunds, product reception and quality control. Choose the right\n"
+"control method according to your need.\n"
+"\n"
+"Control vendor bills with no effort. Choose the right method according to\n"
+"your need: pre-generate draft invoices based on purchase orders, on products\n"
+"receptions, create invoices manually and import lines from purchase orders,\n"
+"etc.\n"
+"\n"
+""
 msgstr ""
 
 #. module: base
@@ -12519,6 +13241,287 @@ msgid "Odoo Web Diagram"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website
+msgid "Odoo Website Builder\n"
+"--------------------\n"
+"\n"
+"Get an awesome and <a href=\"https://www.odoo.com/page/website-builder\">free website</a>,\n"
+"easily customizable with the Odoo <a href=\"https://www.odoo.com/page/website-builder\">website builder</a>.\n"
+"\n"
+"Create enterprise grade website with our super easy builder. Use finely\n"
+"designed building blocks and edit everything inline.\n"
+"\n"
+"Benefit from out-of-the-box business features; e-Commerce, events, blogs, jobs\n"
+"announces, customer references, call-to-actions, etc.\n"
+"\n"
+"Edit Anything Inline\n"
+"--------------------\n"
+"\n"
+"Create beautiful websites with no technical knowledge. Odoo's unique *'edit\n"
+"inline'* approach makes website creation surprisingly easy. No more complex\n"
+"backend; just click anywhere to change any content.\n"
+"\n"
+"\"Want to change the price of a product? or put it in bold? Want to change a\n"
+"blog title?\" Just click and change. What you see is what you get. Really.\n"
+"\n"
+"Awesome. Astonishingly Beautiful.\n"
+"---------------------------------\n"
+"\n"
+"Odoo's building blocks allow to design modern websites that are not possible\n"
+"with traditional WYSIWYG page editors.\n"
+"\n"
+"Whether it's for products descriptions, blogs or static pages, you don't need\n"
+"to be a professioanl designer to create clean contents. Just drag and drop and\n"
+"customize predefined building blocks.\n"
+"\n"
+"Enterprise-Ready, out-of-the-box\n"
+"--------------------------------\n"
+"\n"
+"Activate ready-to-use enterprise features in just a click; e-commerce,\n"
+"call-to-actions, jobs announces, events, customer references, blogs, etc.\n"
+"\n"
+"Traditional eCommerce and CMS have poorly designed backends as it's not their\n"
+"core focus. With the Odoo integration, you benefit from the best management\n"
+"software to follow-up on your orders, your jobs applicants, your leads, etc.\n"
+"\n"
+"A Great Mobile Experience\n"
+"-------------------------\n"
+"\n"
+"Get a mobile friendly website thanks to our responsive design based on\n"
+"bootstrap. All your pages adapt automatically to the screen size. (mobile\n"
+"phones, tablets, desktop) You don't have to worry about mobile contents, it\n"
+"works by default.\n"
+"\n"
+"SEO tools at your finger tips\n"
+"-----------------------------\n"
+"\n"
+"The *Promote* tool suggests keywords according to Google most searched terms.\n"
+"Search Engine Optimization tools are ready to use, with no configuration\n"
+"required.\n"
+"\n"
+"Google Analytics tracks your shopping cart events by default. Sitemap and\n"
+"structured content are created automatically for Google indexation.\n"
+"\n"
+"Multi-Languages Made Easy\n"
+"-------------------------\n"
+"\n"
+"Get your website translated in multiple languages with no effort. Odoo proposes\n"
+"and propagates translations automatically across pages, following what you edit\n"
+"on the master page.\n"
+"\n"
+"Benefit from professional translators to translate all your contents\n"
+"automatically with the [Gengo](http://gengo.com) integration. Update any part\n"
+"of your website and the translated versions are pushed automatically in a few\n"
+"hours.\n"
+"\n"
+"Designer-Friendly Templates\n"
+"---------------------------\n"
+"\n"
+"Templates are awesome and easy to design. You don't need to develop to create\n"
+"new pages, themes or building blocks. We use a clean HTML structure, a\n"
+"[bootstrap](http://getbootstrap.com/) CSS.\n"
+"\n"
+"Customize every page on the fly with the integrated template editor. Distribute\n"
+"your work easily as an Odoo module.\n"
+"\n"
+"Fluid Grid Layouting\n"
+"--------------------\n"
+"\n"
+"Design perfect pages by drag and dropping building blocks. Move and scale them\n"
+"to fit the layout you are looking for.\n"
+"\n"
+"Building blocks are based on a responsive, mobile friendly fluid grid system\n"
+"that appropriately scales up to 12 columns as the device or viewport size\n"
+"increases.\n"
+"\n"
+"Professional Themes\n"
+"-------------------\n"
+"\n"
+"Design a custom theme or reuse pre-defined themes to customize the look and\n"
+"feel of your website.\n"
+"\n"
+"Test new color scheme easily; you can change your theme at any time in just a\n"
+"click.\n"
+"\n"
+"Integrated With Odoo Apps\n"
+"-------------------------\n"
+"\n"
+"### e-Commerce\n"
+"\n"
+"Promote products, sell online, optimize visitors' shopping experience.\n"
+"\n"
+"\n"
+"### Blogs\n"
+"\n"
+"Write news, attract new visitors, build customer loyalty.\n"
+"\n"
+"\n"
+"### Online Events\n"
+"\n"
+"Schedule, organize, promote or sell events online; conferences, trainings, webinars, etc.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_website_sale
+msgid "Odoo e-Commerce\n"
+"---------------\n"
+"\n"
+"### Optimize sales with an awesome online store.\n"
+"\n"
+"Odoo is an <a href=\"https://www.odoo.com/page/e-commerce\">Open Source eCommerce</a>\n"
+"unlike anything you have ever seen before. Get an awesome catalog of products\n"
+"and great product description pages.\n"
+"\n"
+"It's full-featured, integrated with your management software, fully\n"
+"customizable and super easy.\n"
+"\n"
+"Create Awesome Product Pages\n"
+"----------------------------\n"
+"\n"
+"Odoo's unique *'edit inline'* and building blocks approach makes product pages\n"
+"creation surprisingly easy. \"Want to change the price of a product? or put it\n"
+"in bold? Want to add a banner for a specific product?\" just click and change.\n"
+"What you see is what you get. Really.\n"
+"\n"
+"Drag & Drop well designed *'Building Blocks'* to create beautifull product\n"
+"pages that your customer will love.\n"
+"\n"
+"Increase Your Revenue Per Order\n"
+"-------------------------------\n"
+"\n"
+"The built-in cross-selling feature helps you offer extra products related to\n"
+"what the shopper put in his cart. (e.g. accessories)\n"
+"\n"
+"Odoo's upselling algorythm allows you to show visitors similar but more\n"
+"expensive products than the one in view, with incentives.\n"
+"\n"
+"The inline editing feature allows you to easily change a price, launch a\n"
+"promotion or fine tune the description of a product, in a just a click.\n"
+"\n"
+"A Clean Google Analytics Integration\n"
+"------------------------------------\n"
+"\n"
+"Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers\n"
+"are configured by default to track all kind of events related to shopping\n"
+"carts, call-to-actions, etc.\n"
+"\n"
+"As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with\n"
+"Google Analytics, you get a complete view of your business.\n"
+"\n"
+"Target New Markets\n"
+"------------------\n"
+"\n"
+"Get your website translated in multiple languages with no effort. Odoo proposes\n"
+"and propagates translations automatically across pages.\n"
+"\n"
+"Our translation \"on demand\" features allows you to benefit from professional\n"
+"translators to translate all your changes automatically. Just change any part\n"
+"of your website (a new blog post, a page modification, product descriptions,\n"
+"...) and the translated versions are updated automatically in around 32 hours.\n"
+"\n"
+"Fine Tune Your Catalog\n"
+"----------------------\n"
+"\n"
+"Get a full control on how you display your products in the catalog page:\n"
+"promotional ribbons, related sized of products, discounts, variants, grid/list\n"
+"view, etc.\n"
+"\n"
+"Edit any product inline to make your website evolve with your customer need.\n"
+"\n"
+"Acquire New Customers\n"
+"---------------------\n"
+"\n"
+"SEO tools are ready to use, with no configuration required. Odoo suggests\n"
+"keywords according to Google most searched terms, Google Analytics tracks your\n"
+"shopping cart events, sitemap are created automatically for Google indexation,\n"
+"etc.\n"
+"\n"
+"We even do structured content automatically to promote your product and events\n"
+"efficiently in Google.\n"
+"\n"
+"Leverage Social Media\n"
+"---------------------\n"
+"\n"
+"Create new landing pages easily with the Odoo inline edition feature. Send\n"
+"visitors of your different marketing campaigns to specific landing pages to\n"
+"optimize conversions.\n"
+"\n"
+"Manage a Reseller Network\n"
+"-------------------------\n"
+"\n"
+"Manage a reseller network to target new market, have local presences or broaden\n"
+"your distribution. Give them access to your reseller portal for an efficient\n"
+"collaboration.\n"
+"\n"
+"Promote your resellers online, forward leads to resellers (with built-in\n"
+"geolocalisation feature), define specific pricelists, launch a loyalty program\n"
+"(offer specific discounts to your best customers or resellers), etc.\n"
+"\n"
+"Benefit from the power of Odoo, in your online store: a powerfull tax engine,\n"
+"flexible pricing structures, a real inventory management solution, a reseller\n"
+"interface, support for products with different behaviours; physical goods,\n"
+"events, services, variants and options, etc.\n"
+"\n"
+"You don't need to interface with your warehouse, sales or accounting software.\n"
+"Everything is integrated with Odoo. No pain, real time.\n"
+"\n"
+"A Clean Checkout Process\n"
+"------------------------\n"
+"\n"
+"Convert most visitor interests into real orders with a clean checkout process\n"
+"with a minimal number of steps and a great useability on every page.\n"
+"\n"
+"Customize your checkout process to fit your business needs: payment modes,\n"
+"delivery methods, cross-selling, special conditions, etc.\n"
+"\n"
+"And much more...\n"
+"----------------\n"
+"\n"
+"### Online Sales\n"
+"\n"
+"-   Mobile Interface\n"
+"-   Sell products, events or services\n"
+"-   Flexible pricelists\n"
+"-   Product multi-variants\n"
+"-   Multiple stores\n"
+"-   Great checkout process\n"
+"\n"
+"### Customer Service\n"
+"\n"
+"-   Customer Portal to track orders\n"
+"-   Assisted shopping with website live chats\n"
+"-   Returns management\n"
+"-   Advanced shipping rules\n"
+"-   Coupons or gift certificates\n"
+"\n"
+"### Order Management\n"
+"\n"
+"-   Advanced warehouse management features\n"
+"-   Invoicing and accounting integration\n"
+"-   Mass mailing and customer segmentations\n"
+"-   Lead automation and marketing campaigns\n"
+"-   Persistent shopping cart\n"
+"\n"
+"Fully Integrated With Other Apps\n"
+"--------------------------------\n"
+"\n"
+"### CMS\n"
+"\n"
+"Easily create awesome websites with no technical knowledge required.\n"
+"\n"
+"### Blogs\n"
+"\n"
+"Write news, attract new visitors, build customer loyalty.\n"
+"\n"
+"### Online Events\n"
+"\n"
+"Schedule, organize, promote or sell events online; conferences, webinars, trainings, etc.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,help:base.action_partner_customer_form
 #: model:ir.actions.act_window,help:base.action_partner_form
 msgid "Odoo helps you easily track all activities related to\n"
@@ -12566,19 +13569,19 @@ msgid "On delete property for many2one fields"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2781
+#: code:addons/models.py:2777
 #, python-format
 msgid "One of the documents you are trying to access has been deleted, please try again after refreshing."
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:3104
+#: code:addons/models.py:3101
 #, python-format
 msgid "One of the records you are trying to modify has already been deleted (Document type: %s)."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:395
+#: code:addons/base/res/res_partner.py:359
 #, python-format
 msgid "One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`"
 msgstr ""
@@ -12604,7 +13607,12 @@ msgid "Online Proposals"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:517
+#: model:ir.module.module,shortdesc:base.module_website_quote_subscription
+msgid "Online Subscription Quotes"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:514
 #, python-format
 msgid "Only administrators can change the settings"
 msgstr ""
@@ -12635,7 +13643,7 @@ msgid "Only one currency rate per day allowed!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1167
+#: code:addons/base/ir/ir_model.py:1174
 #, python-format
 msgid "Only users with the following access level are currently allowed to do that"
 msgstr ""
@@ -12651,6 +13659,80 @@ msgid "Open Settings Menu"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_hr_recruitment
+msgid "Open Source Job Board\n"
+"---------------------\n"
+"\n"
+"### Organize your job postings and applications\n"
+"\n"
+"Organize your job board, promote your job announces and keep track of application submissions easily. Follow every applicant and build up a database of skills and profiles.\n"
+"\n"
+"Create Awsome Job Description Pages\n"
+"-----------------------------------\n"
+"\n"
+"### Get rid of old WYSIWYG editors\n"
+"\n"
+"Get a clean and professional look for your job annouces. Odoo's unique *'edit inline'* approach makes website and job descriptions creation surprisingly easy.\n"
+"\n"
+"Drag & Drop well designed *'Building Blocks'* to create beautifull job descriptions and announces that emphasizes the quality of your company.\n"
+"\n"
+"Post Your Jobs on Best Job Boards\n"
+"---------------------------------\n"
+"\n"
+"### LinkedIn, Monster, Craigslist, Careerbuilder,...\n"
+"\n"
+"Connect automatically to most famous job board websites; linkedIn, Monster, Craigslist, ... Every job position has a new email address automatically assigned to route applications automatically to the right job position.\n"
+"\n"
+"Whether applicants contact you by email or using an online form, you get all the data indexed automatically (resumes, motivation letter) and you can answer in just a click, reusing templates of answers.\n"
+"\n"
+"Customize Your Recruitment Process\n"
+"----------------------------------\n"
+"\n"
+"### Define your own stages and interviewers\n"
+"\n"
+"Use the kanban view and customize the steps of your recruitments process; pre-qualification, first interview, second interview, negociaiton, ...\n"
+"\n"
+"Get accurate statistics on your recruitment pipeline. Get reports to compare the performance of your different investments on external job boards.\n"
+"\n"
+"Streamline Your Recruitment Process\n"
+"-----------------------------------\n"
+"\n"
+"### Index resumes, track applicants, search profiles\n"
+"\n"
+"Follow applicants in your recruitment process with the smart kanban view. Save time by automating some communications with email templates.\n"
+"\n"
+"Documents like resumes and motivation letters are indexed automatically, allowing you to easily find for specific skills and build up a database of profiles.\n"
+"\n"
+"Integrated Surveys\n"
+"------------------\n"
+"\n"
+"### Define your own online or offline surveys\n"
+"\n"
+"Create your own interview canvas based on our best practices. Use the survey designer to adapt questions to your own process. Ask the applicant to fill in the survey online, or the interviewer to use it during real interviews.\n"
+"\n"
+"Fully Integrated With Others Apps\n"
+"---------------------------------\n"
+"\n"
+"### Get hundreds of open source apps for free\n"
+"\n"
+"\n"
+"### CMS\n"
+"\n"
+"Easily create awesome websites with no technical knowledge required.\n"
+"\n"
+"### Blogs\n"
+"\n"
+"Write news, attract new visitors, build customer loyalty.\n"
+"\n"
+"\n"
+"### Online Events\n"
+"\n"
+"Schedule, organize, promote or sell events online; conferences, webinars, trainings, etc.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_window_action_tree
 msgid "Open Window"
 msgstr ""
@@ -12678,7 +13760,7 @@ msgstr ""
 #: model:ir.model.fields,help:base.field_ir_act_url_help
 #: model:ir.model.fields,help:base.field_ir_act_window_help
 #: model:ir.model.fields,help:base.field_ir_actions_help
-#: model:ir.model.fields,help:base.field_ir_actions_help_299
+#: model:ir.model.fields,help:base.field_ir_actions_help_273
 #: model:ir.model.fields,help:base.field_ir_cron_help
 msgid "Optional help text for the users with a description of the target view, such as its usage and purpose."
 msgstr ""
@@ -12704,13 +13786,180 @@ msgid "Optional username for SMTP authentication"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_event_track
+msgid "Organize Events, Trainings & Webinars\n"
+"-------------------------------------\n"
+"\n"
+"### Schedule, Promote, Sell, Organize\n"
+"\n"
+"Get extra features per event; multiple pages, sponsors, multiple talks, talk proposal form, agenda, event-related news, documents (slides of presentations), event-specific menus.\n"
+"\n"
+"Organize Your Tracks\n"
+"--------------------\n"
+"\n"
+"### From the talk proposal to the publication\n"
+"\n"
+"Add a talk proposal form on your events to allow visitors to submit talks and speakers. Organize the validation process of every talk, and schedule easily.\n"
+"\n"
+"Odoo's unique frontend and backend integration makes organization and publication so easy. Easily design beautiful speaker biographies and talks description.\n"
+"\n"
+"Agenda and List of Talks\n"
+"------------------------\n"
+"\n"
+"### A strong user interface\n"
+"\n"
+"Get a beautiful agenda for each event published automatically on your website. Allow your visitors to easily search and browse talks, filter by tags, locations or speakers.\n"
+"\n"
+"Manage Sponsors\n"
+"---------------\n"
+"\n"
+"### Sell sponsorship, promote your sponsors\n"
+"\n"
+"Add sponsors to your events and publish sponsors per level (e.g. bronze, silver, gold) on the bottom of every page of the event.\n"
+"\n"
+"Sell sponsorship packages online through the Odoo eCommerce for a full sales cycle integration.\n"
+"\n"
+"Communicate Efficiently\n"
+"-----------------------\n"
+"\n"
+"### Activate a blog for some events\n"
+"\n"
+"You can activate a blog for each event allowing you to communicate on specific events. Visitors can subscribe to news to get informed."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_website_event
+msgid "Organize Events, Trainings & Webinars\n"
+"-------------------------------------\n"
+"\n"
+"### Schedule, Promote, Sell, Organize\n"
+"\n"
+"Organize, promote and sell events online. Whether you organize meetings, conferences, trainings or webinars, Odoo gives you all the features you need to manage your events.\n"
+"\n"
+"Create Awesome Event Pages\n"
+"--------------------------\n"
+"\n"
+"### Get rid of old WYSIWYG editors\n"
+"\n"
+"Create beautiful event pages by drag & droping well designed *'Building Blocks'*. Publish event photos, speakers, schedule, etc.\n"
+"\n"
+"Odoo's unique *'edit inline'* approach makes website creation surprisingly easy. \"Want to introduce a speaker? to change the price of a ticket? to update a banner? promote sponsors?\" just click and change.\n"
+"\n"
+"Sell Tickets Online\n"
+"-------------------\n"
+"\n"
+"### Automate the registration and payment process\n"
+"\n"
+"Sell registrations to your event with the multi-ticketing feature. Events can be free or for a fee. Attendees can pay online with a credit card or on invoice, based on your configuration.\n"
+"\n"
+"Boost your sales with early-bird prices, special conditions for members, or extra services with multiple tickets.\n"
+"\n"
+"A Clean Google Analytics Integration\n"
+"------------------------------------\n"
+"\n"
+"### Control your sales funnel with Google Analytics\n"
+"\n"
+"Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers are configured by default to track all kind of events related to shopping carts, call-to-actions, etc.\n"
+"\n"
+"As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with Google Analytics, you get a full view of your business.\n"
+"\n"
+"Promote Events Efficiently\n"
+"--------------------------\n"
+"\n"
+"### Mass Mailing & Social Media\n"
+"\n"
+"Use the segmentation, the social network integration and mass mailing features to promote your events to the right audience. Setup automated emails to attendees to send them last minute details.\n"
+"\n"
+"Designer-Friendly Themes\n"
+"------------------------\n"
+"\n"
+"### Designers love working on Odoo\n"
+"\n"
+"Themes are awesome and easy to design. You don't need to develop to create new pages, themes or building blocks. We use a clean HTML structure, a [bootstrap](http://getbootstrap.com/) CSS and our modularity allows to distribute your themes easily.\n"
+"\n"
+"The building block approach allows the website to stay clean after the end-users start creating new contents.\n"
+"\n"
+"Make Your Event More Visible\n"
+"----------------------------\n"
+"\n"
+"### SEO tools at your finger tips\n"
+"\n"
+"SEO tools are ready to use, with no configuration required. Odoo suggests keywords according to Google most searched terms, Google Analytics tracks your shopping cart events and sitemap are created automatically.\n"
+"\n"
+"We even do structured content automatically to promote your events and products efficiently in Google.\n"
+"\n"
+"Leverage Social Media\n"
+"---------------------\n"
+"\n"
+"### Optimize: from Ads to Conversions\n"
+"\n"
+"Create new landing pages easily with the Odoo inline edition feature. Send visitors of your different marketing campaigns to event landing pages to optimize conversions.\n"
+"\n"
+"And Much More...\n"
+"----------------\n"
+"\n"
+"### Schedule\n"
+"\n"
+"-   Calendar of Events\n"
+"-   Publish related documents\n"
+"-   Ressources allocation\n"
+"-   Automate purchases (cathering...)\n"
+"-   Multiple locations and organizers\n"
+"-   Mobile Interface\n"
+"\n"
+"### Sell\n"
+"\n"
+"-   Online or offline sales\n"
+"-   Automated invoicing\n"
+"-   Cancellation policies\n"
+"-   Specific prices for members\n"
+"-   Dashboards and reporting\n"
+"\n"
+"### Organize\n"
+"\n"
+"-   Advanced Planification\n"
+"-   Print Badges\n"
+"-   Automate Follow-up Emails\n"
+"-   Min/Max capacities\n"
+"-   Manage classes and ressources\n"
+"-   Create group of attendees\n"
+"-   Automate statisfaction surveys\n"
+"\n"
+"Fully Integrated With Others Apps\n"
+"---------------------------------\n"
+"\n"
+"### Get hundreds of open source apps for free\n"
+"\n"
+"\n"
+"### eCommerce\n"
+"\n"
+"Promote products, sell online, optimize visitors' shopping experiences.\n"
+"\n"
+"\n"
+"### Blogs\n"
+"\n"
+"Write news, attract new visitors, build customer loyalty.\n"
+"\n"
+"\n"
+"### Our Team\n"
+"\n"
+"Create a great \"About us\" page by presenting your team efficiently.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_orientation
+msgid "Orientation"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_ref_id
 msgid "Original View"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:730
-#: code:addons/base/res/res_users.py:888
+#: code:addons/base/res/res_users.py:734
+#: code:addons/base/res/res_users.py:895
 #, python-format
 msgid "Other"
 msgstr ""
@@ -12773,6 +14022,11 @@ msgid "Outgoing Mail Servers"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_dpi
+msgid "Output DPI"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_base_language_import_overwrite
 #: model:ir.model.fields,field_description:base.field_base_language_install_overwrite
 msgid "Overwrite Existing Terms"
@@ -12790,7 +14044,7 @@ msgid "P EDUCATION"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
+#: selection:ir.actions.report,report_type:0
 msgid "PDF"
 msgstr ""
 
@@ -12815,6 +14069,16 @@ msgid "Pad on tasks"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_page_height
+msgid "Page height (mm)"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_page_width
+msgid "Page width (mm)"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.pk
 msgid "Pakistan"
 msgstr ""
@@ -12825,11 +14089,6 @@ msgid "Palau"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ps
-msgid "Palestinian Territory, Occupied"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
 msgstr ""
@@ -12840,11 +14099,33 @@ msgid "Panama - Accounting"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_paper_format
+#: model:ir.ui.menu,name:base.paper_format_menuitem
 msgid "Paper Format"
 msgstr ""
 
 #. module: base
+#: model:ir.actions.act_window,name:base.paper_format_action
+msgid "Paper Format General Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_paperformat_id
+#: model:ir.model.fields,field_description:base.field_res_company_paperformat_id
+msgid "Paper format"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.paperformat_view_form
+#: model:ir.ui.view,arch_db:base.paperformat_view_tree
+msgid "Paper format configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_format
+msgid "Paper size"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
 msgstr ""
@@ -12910,11 +14191,6 @@ msgid "Parent name"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_parser
-msgid "Parser Class"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_company_partner_id
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:res.request.link,name:base.req_link_partner
@@ -12945,6 +14221,7 @@ msgstr ""
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_category_partner_ids
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 msgid "Partners"
 msgstr ""
 
@@ -12954,7 +14231,7 @@ msgid "Partners Geolocation"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:768
+#: code:addons/base/res/res_partner.py:728
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -12972,11 +14249,20 @@ msgstr ""
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_logging_path
-#: model:ir.model.fields,field_description:base.field_res_font_path
 msgid "Path"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_account_payment
+msgid "Payment - Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_payment
+msgid "Payment - Sale"
+msgstr ""
+
+#. module: base
 #: model:ir.module.category,name:base.module_category_payment_acquirer
 #: model:ir.module.module,shortdesc:base.module_payment
 msgid "Payment Acquirer"
@@ -13111,7 +14397,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.pn
-msgid "Pitcairn Island"
+msgid "Pitcairn Islands"
 msgstr ""
 
 #. module: base
@@ -13131,13 +14417,13 @@ msgid "Plano de contas SNC para Portugal"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1170
+#: code:addons/base/ir/ir_model.py:1177
 #, python-format
 msgid "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:233
+#: code:addons/base/ir/ir_mail_server.py:218
 #, python-format
 msgid "Please define at least one SMTP server, or provide the SMTP parameters explicitly."
 msgstr ""
@@ -13148,7 +14434,7 @@ msgid "Please set the Model to Create before choosing values"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:249
+#: code:addons/base/res/res_users.py:250
 #, python-format
 msgid "Please use the change password wizard (in User Preferences or User menu) to change your own password."
 msgstr ""
@@ -13190,11 +14476,6 @@ msgid "Poland - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pf
-msgid "Polynesia (French)"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_groups_is_portal
 #: model:res.groups,name:base.group_portal
 msgid "Portal"
@@ -13212,6 +14493,11 @@ msgid "Portal members have specific access rights (such as record rules and rest
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,orientation:0
+msgid "Portrait"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
 msgstr ""
@@ -13267,11 +14553,6 @@ msgid "Present Your Team"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.report.xml,name:base.preview_rml_report
-msgid "Preview RML Report"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_form
 msgid "Price Accuracy"
 msgstr ""
@@ -13327,6 +14608,11 @@ msgid "Print and Send your Sales Order by Post"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_print_report_name
+msgid "Printed Report Name"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_cron_priority
 #: model:ir.model.fields,field_description:base.field_ir_mail_server_sequence
 #: model:ir.model.fields,field_description:base.field_res_request_link_priority
@@ -13334,17 +14620,12 @@ msgid "Priority"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:109
+#: code:addons/models.py:110
 #, python-format
 msgid "Private methods (such as %s) cannot be called remotely."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_procurement
-msgid "Procurements"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_website_sale_comparison
 msgid "Product Comparison And Product Attribute Category"
 msgstr ""
@@ -13408,11 +14689,95 @@ msgid "Project Forecast"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_project
+msgid "Project Management\n"
+"------------------\n"
+"\n"
+"### Infinitely flexible. Incredibly easy to use.\n"
+"\n"
+"\n"
+"Odoo's collaborative and realtime <a href=\"https://www.odoo.com/page/project-management\">open source project management</a>\n"
+"helps your team get work done. Keep track of everything, from the big picture\n"
+"to the minute details, from the customer contract to the billing.\n"
+"\n"
+"Designed to fit your own process\n"
+"--------------------------------\n"
+"\n"
+"Organize projects around your own processes. Work on tasks and issues using the\n"
+"kanban view, schedule tasks using the gantt chart and control deadlines in the\n"
+"calendar view. Every project may have it's own stages allowing teams to\n"
+"optimize their job.\n"
+"\n"
+"Easy to use\n"
+"-----------\n"
+"\n"
+"Get organized as fast as you can think. The easy-to-use interface takes no time\n"
+"to learn, and every action is instantaneous, so there’s nothing standing\n"
+"between you and your sweet productive flow.\n"
+"\n"
+"Work Together\n"
+"-------------\n"
+"\n"
+"### Real time chats, document sharing, email integration\n"
+"\n"
+"Use open chatter to communicate with your team or customers and share comments\n"
+"and documents on tasks and issues. Integrate discussion fast with the email\n"
+"integration.\n"
+"\n"
+"Talk to others users or customers with the website live chat feature.\n"
+"\n"
+"Collaborative Writing\n"
+"---------------------\n"
+"\n"
+"### The power of etherpad, inside your tasks\n"
+"\n"
+"Collaboratively edit the same specifications or meeting minutes right inside\n"
+"the application. The incorporated etherpad feature allows several people to\n"
+"work on the same tasks, at the same time.\n"
+"\n"
+"This is very efficient for scrum meetings, meeting minutes or complex\n"
+"specifications. Every user has their own color and you can replay the whole\n"
+"creation of the content.\n"
+"\n"
+"Get Work Done\n"
+"-------------\n"
+"\n"
+"Get alerts on followed events to stay up to date with what interests you. Use\n"
+"instant green/red visual indicators to scan through what has been done and what\n"
+"requires your attention.\n"
+"\n"
+"Timesheets, Contracts & Invoicing\n"
+"---------------------------------\n"
+"\n"
+"Projects are automatically integrated with customer contracts allowing you to\n"
+"invoice based on time & materials and record timesheets easily.\n"
+"\n"
+"Track Issues\n"
+"------------\n"
+"\n"
+"Single out the issues that arise in a project in order to have a better focus\n"
+"on resolving them. Integrate customer interaction on every issue and get\n"
+"accurate reports on your team's performance.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_rating_project
 msgid "Project Rating"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_helpdesk_sale_timesheet
+msgid "Project, Helpdesk, Timesheet and Sale Orders"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_helpdesk_timesheet
+msgid "Project, Tasks, Timesheet"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_project
 msgid "Projects, Tasks"
 msgstr ""
@@ -13424,7 +14789,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:643
+#: code:addons/base/ir/ir_model.py:650
 #, python-format
 msgid "Properties of base fields cannot be altered in this manner! Please modify them through Python code, preferably through a custom addon!"
 msgstr ""
@@ -13551,13 +14916,13 @@ msgid "QWeb"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.qa
-msgid "Qatar"
+#: model:ir.ui.view,arch_db:base.act_report_xml_view
+msgid "QWeb views"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_values_key2
-msgid "Qualifier"
+#: model:res.country,name:base.qa
+msgid "Qatar"
 msgstr ""
 
 #. module: base
@@ -13593,12 +14958,12 @@ msgid "Quotation, Sales Orders, Delivery & Invoicing Control"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_sale
+#: model:ir.module.module,summary:base.module_sale_management
 msgid "Quotations, Sales Orders, Invoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:342
+#: code:addons/base/ir/ir_ui_view.py:332
 #, python-format
 msgid "Qweb view cannot have 'Groups' define on the record. Use 'groups' attributes inside the view definition"
 msgstr ""
@@ -13609,42 +14974,6 @@ msgid "R ARTS, ENTERTAINMENT AND RECREATION"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.act_report_xml_view
-msgid "RML Configuration"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_rml_content
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_rml_content_data
-msgid "RML Content"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_header2
-msgid "RML Internal Header"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_header3
-msgid "RML Internal Header for Landscape Reports"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.act_report_xml_view
-msgid "RML Report"
-msgstr ""
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "RML pdf (deprecated)"
-msgstr ""
-
-#. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "RML sxw (deprecated)"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_res_currency_rate_rate
 msgid "Rate"
 msgstr ""
@@ -13686,7 +15015,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_ir_act_window_res_id
 #: model:ir.model.fields,field_description:base.field_ir_model_data_res_id
 #: model:ir.model.fields,field_description:base.field_ir_translation_res_id
-#: model:ir.model.fields,field_description:base.field_ir_values_res_id
 msgid "Record ID"
 msgstr ""
 
@@ -13709,8 +15037,8 @@ msgid "Record cannot be modified right now: This cron task is currently being ex
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:352
-#: code:addons/models.py:3873
+#: code:addons/base/ir/ir_actions.py:230
+#: code:addons/models.py:3871
 #, python-format
 msgid "Record does not exist or has been deleted."
 msgstr ""
@@ -13732,19 +15060,24 @@ msgid "Recruitment Process"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:327
+#: model:ir.module.module,summary:base.module_sale_subscription
+msgid "Recurring invoicing, renewals"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:324
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:513
+#: code:addons/base/ir/ir_actions.py:389
 #, python-format
 msgid "Recursion found in child server actions"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:3210
+#: code:addons/models.py:3207
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
@@ -13782,13 +15115,13 @@ msgid "Related Server Action"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:401
+#: code:addons/base/ir/ir_model.py:407
 #, python-format
 msgid "Related field '%s' does not have comodel '%s'"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:399
+#: code:addons/base/ir/ir_model.py:405
 #, python-format
 msgid "Related field '%s' does not have type '%s'"
 msgstr ""
@@ -13854,7 +15187,13 @@ msgid "Repeat every x."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_report
+#: selection:ir.actions.act_url,binding_type:0
+#: selection:ir.actions.act_window,binding_type:0
+#: selection:ir.actions.act_window_close,binding_type:0
+#: selection:ir.actions.actions,binding_type:0
+#: selection:ir.actions.client,binding_type:0
+#: selection:ir.actions.report,binding_type:0
+#: selection:ir.actions.server,binding_type:0
 #: model:ir.ui.view,arch_db:base.act_report_xml_search_view
 #: model:ir.ui.view,arch_db:base.act_report_xml_view
 msgid "Report"
@@ -13866,7 +15205,7 @@ msgid "Report File"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_footer
+#: model:ir.model.fields,field_description:base.field_res_company_report_footer
 msgid "Report Footer"
 msgstr ""
 
@@ -13897,9 +15236,16 @@ msgid "Report/Template"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_report_xml
+#: model:ir.ui.menu,name:base.reporting_menuitem
+#: model:ir.ui.menu,name:base.reports_menuitem
+msgid "Reporting"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report
+#: model:ir.actions.act_window,name:base.reports_action
 #: model:ir.model.fields,field_description:base.field_ir_module_module_reports_by_module
-#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
+#: model:ir.ui.menu,name:base.menu_ir_action_report
 msgid "Reports"
 msgstr ""
 
@@ -13922,7 +15268,7 @@ msgid "Resellers"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:775
+#: code:addons/models.py:791
 #, python-format
 msgid "Resolve other errors first"
 msgstr ""
@@ -13980,18 +15326,13 @@ msgid "Restrict to lists"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.re
-msgid "Reunion (French)"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_account_deferred_revenue
-msgid "Revenue Recognitions Management"
+#: model:ir.module.module,summary:base.module_hr_timesheet
+msgid "Review and approve employees time reports"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_hr_timesheet
-msgid "Review and approve employees time reports"
+#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_right
+msgid "Right Margin (mm)"
 msgstr ""
 
 #. module: base
@@ -14005,11 +15346,6 @@ msgid "Right-to-Left"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_header
-msgid "Rml Header"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.ro
 msgid "Romania"
 msgstr ""
@@ -14058,12 +15394,6 @@ msgid "Rules can not be applied on the Record Rules model."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:529
-#, python-format
-msgid "Run %s"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.ir_cron_view_form
 msgid "Run Manually"
 msgstr ""
@@ -14079,6 +15409,11 @@ msgid "Rwanda"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.re
+msgid "Réunion"
+msgstr ""
+
+#. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_S
 msgid "S OTHER SERVICE ACTIVITIES"
 msgstr ""
@@ -14094,6 +15429,11 @@ msgid "SEPA Credit Transfer in Expenses"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_account_sepa_direct_debit
+msgid "SEPA Direct Debit"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_sms_fortytwo
 msgid "SMS FortyTwo Provider"
 msgstr ""
@@ -14134,29 +15474,18 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_sxw_content
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_sxw_content_data
-msgid "SXW Content"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_sxw
-msgid "SXW Path"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.bl
 msgid "Saint Barthélémy"
 msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sh
-msgid "Saint Helena"
+msgid "Saint Helena, Ascension and Tristan da Cunha"
 msgstr ""
 
 #. module: base
 #: model:res.country,name:base.kn
-msgid "Saint Kitts & Nevis Anguilla"
+msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #. module: base
@@ -14175,13 +15504,8 @@ msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.st
-msgid "Saint Tome (Sao Tome) and Principe"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.vc
-msgid "Saint Vincent & Grenadines"
+msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
 #. module: base
@@ -14215,6 +15539,11 @@ msgid "Sale Service Rating"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_subscription_dashboard
+msgid "Sale Subscription Dashboard"
+msgstr ""
+
+#. module: base
 #: model:ir.module.category,name:base.module_category_sales
 #: model:ir.module.category,name:base.module_category_sales_management
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -14239,6 +15568,11 @@ msgid "Sales Expense"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_management
+msgid "Sales Management"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_timesheet
 msgid "Sales Timesheet"
 msgstr ""
@@ -14259,6 +15593,11 @@ msgid "Sales and Warehouse Management"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Sales internal machinery"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_user_id
 #: model:ir.model.fields,field_description:base.field_res_users_user_id
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
@@ -14291,6 +15630,8 @@ msgid "Saudi Arabia - Accounting"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:base.view_company_report_form
 #: model:ir.ui.view,arch_db:base.view_users_form_simple_modif
 msgid "Save"
 msgstr ""
@@ -14372,6 +15713,11 @@ msgid "Search modules"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
+msgid "Search..."
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.sequence_view
 msgid "Second: %(sec)s"
 msgstr ""
@@ -14405,12 +15751,17 @@ msgid "See all possible values"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_report_paperformat_format
+msgid "Select Proper Paper size"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_fields_selectable
 msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:33
+#: code:addons/base/res/res_partner.py:28
 #, python-format
 msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
 msgstr ""
@@ -14433,6 +15784,11 @@ msgid "Self"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_helpdesk_sale_timesheet
+msgid "Sell Helpdesk Timesheet"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_website_sale
 msgid "Sell Your Products Online"
 msgstr ""
@@ -14444,10 +15800,37 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account
+#: model:ir.module.module,summary:base.module_account_invoicing
 msgid "Send Invoices and Track Payments"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_website_quote
+msgid "Send Quotes Online\n"
+"------------------\n"
+"\n"
+"### Create polished, professional quotes in minutes\n"
+"\n"
+"\n"
+"Use templates to create polished, professional quotes in minutes. Send these quotes by email and let your customer sign online. Use cross-selling and discounts to push boost your sales.\n"
+"\n"
+"Electronic Signature\n"
+"--------------------\n"
+"\n"
+"### No more fax or scans in emails\n"
+"\n"
+"Let your customers sign proposals online. Use up-selling techniques to propose them some options.\n"
+"\n"
+"Spend the extra time focusing on selling, not recording data.\n"
+"\n"
+"Communicate Efficiently\n"
+"-----------------------\n"
+"\n"
+"Have clear pricing strategies.\n"
+""
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_website_sign
 msgid "Send documents to sign online, receive and archive filled copies (esign)"
 msgstr ""
@@ -14581,18 +15964,27 @@ msgid "Set as Todo"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_font
-msgid "Set the font into the report header, it will be used as default font in the RML reports of the user company"
+#: model:ir.model.fields,help:base.field_ir_act_client_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_act_report_xml_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_act_server_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_act_url_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_act_window_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_binding_model_id_274
+#: model:ir.model.fields,help:base.field_ir_cron_binding_model_id
+msgid "Setting a value makes this action available in the sidebar for the given model."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:521
+#: code:addons/base/res/res_users.py:520
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
 
 #. module: base
+#: model:ir.actions.act_window,name:base.res_config_setting_act_window
 #: model:ir.ui.menu,name:base.menu_administration
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
 #: model:res.groups,name:base.group_system
 msgid "Settings"
 msgstr ""
@@ -14634,6 +16026,11 @@ msgid "Shipping address"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall_show_all
+msgid "Show All"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_search
 msgid "Show active currencies"
 msgstr ""
@@ -14644,6 +16041,11 @@ msgid "Show inactive currencies"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
+msgid "Show technical modules"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
 msgstr ""
@@ -14758,25 +16160,25 @@ msgstr ""
 
 #. module: base
 #: code:addons/base/ir/ir_attachment.py:338
-#: code:addons/base/ir/ir_model.py:1161
+#: code:addons/base/ir/ir_model.py:1168
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1163
+#: code:addons/base/ir/ir_model.py:1170
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1164
+#: code:addons/base/ir/ir_model.py:1171
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:1162
+#: code:addons/base/ir/ir_model.py:1169
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
@@ -14787,7 +16189,7 @@ msgid "Sort"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:3617
+#: code:addons/models.py:3615
 #, python-format
 msgid "Sorting field %s not found on model %s"
 msgstr ""
@@ -14884,6 +16286,7 @@ msgstr ""
 
 #. module: base
 #: selection:ir.sequence,implementation:0
+#: selection:res.company,external_report_layout:0
 msgid "Standard"
 msgstr ""
 
@@ -14901,6 +16304,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_country_state_tree
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "State"
 msgstr ""
@@ -14916,6 +16320,11 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.ps
+msgid "State of Palestine"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_res_country_state_ids
 msgid "States"
 msgstr ""
@@ -14990,6 +16399,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "Street 2..."
 msgstr ""
@@ -14998,6 +16408,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "Street..."
 msgstr ""
@@ -15032,21 +16443,11 @@ msgid "Submenus"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_website_contract
+#: model:ir.module.module,shortdesc:base.module_sale_subscription
 msgid "Subscription Management"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_sale_contract
-msgid "Subscription Management (without frontend)"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,summary:base.module_website_contract
-msgid "Subscriptions Management Frontend for your customers"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_ids
 msgid "Subsequences"
 msgstr ""
@@ -15082,11 +16483,6 @@ msgid "Support for Bootswatch themes in master"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_project_issue
-msgid "Support, Bug Tracker, Helpdesk"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
 msgstr ""
@@ -15109,7 +16505,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.sj
-msgid "Svalbard and Jan Mayen Islands"
+msgid "Svalbard and Jan Mayen"
 msgstr ""
 
 #. module: base
@@ -15170,17 +16566,6 @@ msgid "Syria"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_base_module_configuration_form
-msgid "System Configuration Done"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/wizard/base_module_configuration.py:20
-#, python-format
-msgid "System Configuration done"
-msgstr ""
-
-#. module: base
 #: model:ir.actions.act_window,name:base.ir_config_list_action
 #: model:ir.ui.menu,name:base.ir_config_menu
 #: model:ir.ui.view,arch_db:base.view_ir_config_form
@@ -15199,6 +16584,11 @@ msgid "System Update"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.st
+msgid "São Tomé and Príncipe"
+msgstr ""
+
+#. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_T
 msgid "T ACTIVITIES OF HOUSEHOLDS AS EMPLOYERS;UNDIFFERENTIATED GOODS- AND SERVICES-PRODUCING ACTIVITIES OF HOUSEHOLDS FOR OWN USE"
 msgstr ""
@@ -15227,6 +16617,11 @@ msgid "TLS (STARTTLS)"
 msgstr ""
 
 #. module: base
+#: selection:report.paperformat,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Tag"
 msgstr ""
@@ -15237,7 +16632,7 @@ msgid "Tag Name"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_id_903
+#: model:ir.model.fields,field_description:base.field_res_partner_category_id_889
 #: model:ir.model.fields,field_description:base.field_res_users_category_id
 msgid "Tags"
 msgstr ""
@@ -15319,7 +16714,7 @@ msgid "Technical Translations"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.report.xml,name:base.ir_module_reference_print
+#: model:ir.actions.report,name:base.ir_module_reference_print
 msgid "Technical guide"
 msgstr ""
 
@@ -15339,6 +16734,16 @@ msgid "Test Connection"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_test_main_flows
+msgid "Test Main Flow"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_test_performance
+msgid "Test Performance"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_test_access_rights
 msgid "Testing of access restrictions"
 msgstr ""
@@ -15360,7 +16765,6 @@ msgid "Tests of field conversions"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_note
 #: selection:ir.property,type:0
 msgid "Text"
 msgstr ""
@@ -15387,7 +16791,7 @@ msgid "The ISO country code in two chars. \n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:360
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format."
 msgstr ""
@@ -15404,13 +16808,13 @@ msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:684
+#: code:addons/base/module/module.py:715
 #, python-format
 msgid "The `%s` module appears to be unavailable at the moment, please try again later."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:536
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
@@ -15421,7 +16825,7 @@ msgid "The active field allows you to hide the category without removing it."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:282
+#: code:addons/base/res/res_users.py:283
 #, python-format
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
@@ -15472,7 +16876,7 @@ msgid "The database object this attachment will be attached to."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:549
+#: code:addons/base/ir/ir_model.py:556
 #, python-format
 msgid "The field '%s' cannot be removed because the field '%s' depends on it."
 msgstr ""
@@ -15512,6 +16916,16 @@ msgid "The field <strong>Dependencies</strong> lists the fields that\n"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
+msgid "The following apps will be uninstalled"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
+msgid "The following documents will be permanently lost"
+msgstr ""
+
+#. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:69
 #, python-format
 msgid "The following modules are not installed or unknown: %s"
@@ -15539,13 +16953,13 @@ msgid "The menu action this filter applies to. When left empty the filter applie
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:129
+#: code:addons/base/ir/ir_model.py:135
 #, python-format
 msgid "The model name can only contain lowercase characters, digits, underscores and dots."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:127
+#: code:addons/base/ir/ir_model.py:133
 #, python-format
 msgid "The model name must start with 'x_'."
 msgstr ""
@@ -15561,7 +16975,7 @@ msgid "The name of the country must be unique !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:151
+#: code:addons/base/res/res_users.py:152
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
@@ -15614,11 +17028,6 @@ msgid "The path to the main report file (depending on Report Type) or empty if t
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_rml
-msgid "The path to the main report file/controller (depending on Report Type) or empty if the content is in another data field"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,help:base.field_ir_cron_priority
 msgid "The priority of the job, as an integer: 0 means higher priority, 10 means lower priority."
 msgstr ""
@@ -15639,15 +17048,15 @@ msgid "The record id this is attached to."
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2687
+#: code:addons/models.py:2678
 #, python-format
 msgid "The requested operation cannot be completed due to record rules: Document type: %s, Operation: %s, Records: %s, User: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2467
-#: code:addons/models.py:2683
-#: code:addons/models.py:2771
+#: code:addons/models.py:2473
+#: code:addons/models.py:2682
+#: code:addons/models.py:2767
 #, python-format
 msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
 "\n"
@@ -15661,7 +17070,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_base_language_install
-msgid "The selected language has been successfully installed. You must change the preferences of the user and open a new menu to view the changes."
+msgid "The selected language has been successfully installed. You must change the preferences of the user to view the changes."
 msgstr ""
 
 #. module: base
@@ -15675,7 +17084,7 @@ msgid "The state code."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:485
+#: code:addons/base/ir/ir_model.py:491
 #, python-format
 msgid "The table %r if used for other, possibly incompatible fields."
 msgstr ""
@@ -15686,18 +17095,23 @@ msgid "The technical name of the model this field belongs to"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_type
+msgid "The type of the report that will be rendered, each one having its own rendering method.HTML means the report will be opened directly in your browserPDF means the report will be rendered using Wkhtmltopdf and downloaded by the user."
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,help:base.field_ir_filters_user_id
 msgid "The user this filter is private to. When left empty the filter is public and available to all users."
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:5134
+#: code:addons/models.py:5162
 #, python-format
 msgid "The value for the field '%s' already exists (this is probably '%s' in the current model)."
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:5140
+#: code:addons/models.py:5168
 #, python-format
 msgid "The values for the fields '%s' already exist (they are probably '%s' in the current model)."
 msgstr ""
@@ -15724,7 +17138,7 @@ msgid "This Window"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:577
+#: code:addons/base/ir/ir_model.py:584
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
@@ -15758,6 +17172,11 @@ msgid "This is the filename of the attachment used to store the printing result.
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_ir_act_report_xml_print_report_name
+msgid "This is the filename of the report going to download. Keep empty to not change the report filename. You can use a python expression with the object and time variables."
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_l10n_no
 msgid "This is the module to manage the accounting chart for Norway in Odoo.\n"
 "\n"
@@ -15811,21 +17230,6 @@ msgid "Timesheet Validation and Grid View"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_website_project_timesheet
-msgid "Timesheet in Website Portal"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
-msgid "Timesheet on Issues"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_project_issue_sheet
-msgid "Timesheet on Website Project Issue"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet_holidays
 msgid "Timesheet when on Leaves"
 msgstr ""
@@ -15837,21 +17241,11 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
-msgid "Timesheets / Attendances"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_timesheet_grid
 msgid "Timesheets Validation"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_hr_timesheet_sheet
-msgid "Timesheets, Activities"
-msgstr ""
-
-#. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_attendance
 msgid "Timesheets/attendances reporting"
 msgstr ""
@@ -15869,6 +17263,11 @@ msgid "Timezone offset"
 msgstr ""
 
 #. module: base
+#: model:res.country,name:base.tl
+msgid "Timor-Leste"
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_title
 #: model:ir.model.fields,field_description:base.field_res_partner_title_name
 #: model:ir.model.fields,field_description:base.field_res_users_title
@@ -15876,11 +17275,6 @@ msgid "Title"
 msgstr ""
 
 #. module: base
-#: sql_constraint:res.partner.title:0
-msgid "Title name already exists !"
-msgstr ""
-
-#. module: base
 #: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_date_to
 msgid "To"
 msgstr ""
@@ -15918,12 +17312,17 @@ msgid "To be upgraded"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:659
+#: code:addons/base/module/module.py:688
 #, python-format
 msgid "To enable it, make sure this directory exists and is writable on the server:"
 msgstr ""
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.view_company_report_form
+msgid "To get a beautiful document, you should update your company informations."
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.ir_actions_todo_tree
 msgid "Todo"
 msgstr ""
@@ -15949,6 +17348,16 @@ msgid "Tools"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_top
+msgid "Top Margin (mm)"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,help:base.field_ir_model_count
+msgid "Total number of records in this model"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
 msgstr ""
@@ -16123,16 +17532,13 @@ msgid "Two sequence object implementations are offered: Standard and 'No gap'. T
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_type
 #: model:ir.model.fields,field_description:base.field_ir_attachment_type
 #: model:ir.model.fields,field_description:base.field_ir_logging_type
 #: model:ir.model.fields,field_description:base.field_ir_model_fields_state
 #: model:ir.model.fields,field_description:base.field_ir_model_state
 #: model:ir.model.fields,field_description:base.field_ir_property_type
 #: model:ir.model.fields,field_description:base.field_ir_translation_type
-#: model:ir.model.fields,field_description:base.field_ir_values_key
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
-#: model:ir.ui.view,arch_db:base.values_view_search_action
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 #: model:ir.ui.view,arch_db:base.view_view_search
 msgid "Type"
@@ -16181,6 +17587,11 @@ msgid "UK - Accounting Reports"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_website_delivery_ups
+msgid "UPS Bill My Account"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery_ups
 msgid "UPS Shipping"
 msgstr ""
@@ -16193,13 +17604,13 @@ msgid "URL"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_us_check_printing
-msgid "US Check Printing"
+#: model:ir.module.module,shortdesc:base.module_l10n_us_reports
+msgid "US - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: selection:res.company,rml_paper_format:0
-msgid "US Letter"
+#: model:ir.module.module,shortdesc:base.module_l10n_us_check_printing
+msgid "US Check Printing"
 msgstr ""
 
 #. module: base
@@ -16228,25 +17639,31 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2847
+#: code:addons/models.py:2843
 #, python-format
 msgid "Unable to delete this document because it is used as a default property"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:317
+#: code:addons/base/ir/ir_actions_report.py:622
+#, python-format
+msgid "Unable to find Wkhtmltopdf on this system. The PDF can not be created."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:314
 #, python-format
 msgid "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:321
+#: code:addons/base/module/module.py:318
 #, python-format
 msgid "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:319
+#: code:addons/base/module/module.py:316
 #, python-format
 msgid "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
@@ -16257,13 +17674,20 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:522
+#: code:addons/base/module/module.py:539
 #: model:ir.ui.view,arch_db:base.module_form
 #, python-format
 msgid "Uninstall"
 msgstr ""
 
 #. module: base
+#: code:addons/base/module/module.py:547
+#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
+#, python-format
+msgid "Uninstall module"
+msgstr ""
+
+#. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 #: selection:ir.module.module.exclusion,state:0
@@ -16302,25 +17726,25 @@ msgid "Unknown"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:913
+#: code:addons/models.py:929
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:774
+#: code:addons/models.py:790
 #, python-format
 msgid "Unknown error during import:"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:430
+#: code:addons/base/ir/ir_model.py:436
 #, python-format
 msgid "Unknown field %r in dependency %r"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:387
+#: code:addons/base/ir/ir_model.py:393
 #, python-format
 msgid "Unknown field name '%s' in related field '%s'"
 msgstr ""
@@ -16457,6 +17881,11 @@ msgid "Use the format '%s'"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,help:base.field_res_country_vat_label
+msgid "Use this field if you want to change vat label."
+msgstr ""
+
+#. module: base
 #: model:ir.model.fields,help:base.field_res_country_address_view_id
 msgid "Use this field if you want to replace the usual way to encode a complete address. Note that the address_format field is used to modify the way to display addresses (in reports for example), while this field is used to modify the input form for addresses."
 msgstr ""
@@ -16489,10 +17918,11 @@ msgstr ""
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_change_password_user_user_id
+#: model:ir.model.fields,field_description:base.field_ir_default_user_id
 #: model:ir.model.fields,field_description:base.field_ir_filters_user_id
 #: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_user_id
-#: model:ir.model.fields,field_description:base.field_ir_values_user_id
 #: model:ir.ui.view,arch_db:base.ir_cron_view_search
+#: model:ir.ui.view,arch_db:base.ir_default_search_view
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
 #: model:ir.ui.view,arch_db:base.view_users_search
 msgid "User"
@@ -16514,9 +17944,11 @@ msgid "User log entries"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.act_values_form_defaults
-#: model:ir.ui.menu,name:base.menu_values_form_defaults
-#: model:ir.ui.view,arch_db:base.values_view_form_defaults
+#: model:ir.actions.act_window,name:base.ir_default_menu_action
+#: model:ir.ui.menu,name:base.ir_default_menu
+#: model:ir.ui.view,arch_db:base.ir_default_form_view
+#: model:ir.ui.view,arch_db:base.ir_default_search_view
+#: model:ir.ui.view,arch_db:base.ir_default_tree_view
 msgid "User-defined Defaults"
 msgstr ""
 
@@ -16569,13 +18001,55 @@ msgid "Uzbekistan"
 msgstr ""
 
 #. module: base
+#: model:res.country,vat_label:base.at
+#: model:res.country,vat_label:base.be
+#: model:res.country,vat_label:base.bg
+#: model:res.country,vat_label:base.cy
+#: model:res.country,vat_label:base.cz
+#: model:res.country,vat_label:base.de
+#: model:res.country,vat_label:base.dk
+#: model:res.country,vat_label:base.ee
+#: model:res.country,vat_label:base.es
+#: model:res.country,vat_label:base.fi
+#: model:res.country,vat_label:base.fr
+#: model:res.country,vat_label:base.gr
+#: model:res.country,vat_label:base.hr
+#: model:res.country,vat_label:base.hu
+#: model:res.country,vat_label:base.ie
+#: model:res.country,vat_label:base.it
+#: model:res.country,vat_label:base.lt
+#: model:res.country,vat_label:base.lu
+#: model:res.country,vat_label:base.lv
+#: model:res.country,vat_label:base.mt
+#: model:res.country,vat_label:base.nl
+#: model:res.country,vat_label:base.pl
+#: model:res.country,vat_label:base.pt
+#: model:res.country,vat_label:base.ro
+#: model:res.country,vat_label:base.se
+#: model:res.country,vat_label:base.si
+#: model:res.country,vat_label:base.sk
+#: model:res.country,vat_label:base.uk
+msgid "VAT"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_vat_autocomplete
+msgid "VAT Number Autocomplete"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
 msgid "VAT Number Validation"
 msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_voip
-msgid "VOIP Core"
+msgid "VOIP"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_voip_onsip
+msgid "VOIP OnSIP"
 msgstr ""
 
 #. module: base
@@ -16596,7 +18070,6 @@ msgstr ""
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_config_parameter_value
 #: model:ir.model.fields,field_description:base.field_ir_server_object_lines_value
-#: model:ir.model.fields,field_description:base.field_ir_values_value
 #: selection:ir.server.object.lines,type:0
 #: model:ir.ui.view,arch_db:base.ir_property_view
 msgid "Value"
@@ -16655,11 +18128,21 @@ msgid "Various fields may use Python code or Python expressions. The following v
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_res_country_vat_label
+msgid "Vat Label"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_account_3way_match
+msgid "Vendor Bill: Release to Pay"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Vendors"
@@ -16755,9 +18238,9 @@ msgid "View type: Tree type to use for the tree view, set to 'tree' for a hierar
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:570
 #, python-format
-msgid "View:"
+msgid "View: %s"
 msgstr ""
 
 #. module: base
@@ -16814,7 +18297,7 @@ msgstr ""
 
 #. module: base
 #: model:res.country,name:base.wf
-msgid "Wallis and Futuna Islands"
+msgid "Wallis and Futuna"
 msgstr ""
 
 #. module: base
@@ -16828,27 +18311,27 @@ msgid "Warehouse Management Barcode Scanning"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_stock_picking_wave
-msgid "Warehouse Management: Waves"
+#: model:ir.module.module,shortdesc:base.module_stock_picking_batch
+msgid "Warehouse Management: Batch Picking"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:486
-#: code:addons/base/ir/ir_model.py:409
-#: code:addons/base/ir/ir_model.py:484
-#: code:addons/base/res/res_partner.py:344
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/ir/ir_model.py:415
+#: code:addons/base/ir/ir_model.py:490
+#: code:addons/base/res/res_partner.py:308
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:427
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:4838
+#: code:addons/models.py:4880
 #, python-format
 msgid "Warnings"
 msgstr ""
@@ -16900,13 +18383,14 @@ msgid "Web Icon Image"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_translation_search
-msgid "Web-only translations"
+#: model:ir.module.module,shortdesc:base.module_http_routing
+#: model:ir.module.module,summary:base.module_http_routing
+msgid "Web Routing"
 msgstr ""
 
 #. module: base
-#: selection:ir.actions.report.xml,report_type:0
-msgid "Webkit (deprecated)"
+#: model:ir.ui.view,arch_db:base.view_translation_search
+msgid "Web-only translations"
 msgstr ""
 
 #. module: base
@@ -16929,6 +18413,11 @@ msgid "Website Enterprise"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_website_form_project
+msgid "Website Form - Project"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_website_form_editor
 msgid "Website Form Builder"
 msgstr ""
@@ -16989,33 +18478,18 @@ msgid "Website Partner"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_website_portal
-msgid "Website Portal"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_portal_purchase
-msgid "Website Portal for Purchases"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_portal_sale
-msgid "Website Portal for Sales"
+#: model:ir.module.module,shortdesc:base.module_website_rating
+msgid "Website Rating"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_website_project
-msgid "Website Project"
+#: model:ir.module.module,shortdesc:base.module_website_rating_project
+msgid "Website Rating Project"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_website_project_issue
-msgid "Website Project Issue"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_rating_project_issue
-msgid "Website Rating Project Issue"
+#: model:ir.module.module,shortdesc:base.module_website_sale_management
+msgid "Website Sale - Sale Management"
 msgstr ""
 
 #. module: base
@@ -17034,6 +18508,11 @@ msgid "Website Sale Stock - Website Delivery Information"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_website_sale_stock_options
+msgid "Website Sale Stock&Options"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk_slides
 msgid "Website Slides Helpdesk"
 msgstr ""
@@ -17139,6 +18618,18 @@ msgid "Wizards to be Launched"
 msgstr ""
 
 #. module: base
+#: code:addons/base/ir/ir_actions_report.py:393
+#, python-format
+msgid "Wkhtmltopdf failed (error code: %s). Memory limit too low or maximum file number of subprocess reached. Message : %s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions_report.py:396
+#, python-format
+msgid "Wkhtmltopdf failed (error code: %s). Message: %s"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_mrp_workorder
 msgid "Work Orders, Planing, Stock Reports."
 msgstr ""
@@ -17166,21 +18657,6 @@ msgid "Write Python code that the action will execute. Some variables are availa
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_xml
-msgid "XML Path"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.act_report_xml_view
-msgid "XML Report"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_xsl
-msgid "XSL Path"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.ye
 msgid "Yemen"
 msgstr ""
@@ -17201,7 +18677,7 @@ msgid "You are creating a new user. After saving, the user will receive an invit
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:401
+#: code:addons/base/module/module.py:398
 #, python-format
 msgid "You are trying to install incompatible modules in category \"%s\":"
 msgstr ""
@@ -17212,7 +18688,7 @@ msgid "You can either upload a file from your computer or copy/paste an internet
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:509
+#: code:addons/base/res/res_partner.py:473
 #, python-format
 msgid "You can not change the company as the partner/user has multiple user linked with different companies."
 msgstr ""
@@ -17223,79 +18699,68 @@ msgid "You can not have two users with the same login !"
 msgstr ""
 
 #. module: base
-#: sql_constraint:res.font:0
-msgid "You can not register two fonts with the same name"
-msgstr ""
-
-#. module: base
-#: code:addons/base/res/res_users.py:378
+#: code:addons/base/res/res_users.py:377
 #, python-format
 msgid "You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:327
+#: code:addons/base/res/res_partner.py:291
 #, python-format
 msgid "You cannot create recursive Partner hierarchies."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:349
+#: code:addons/base/ir/ir_ui_view.py:339
 #, python-format
 msgid "You cannot create recursive inherited views."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/res/res_users.py:336
 #, python-format
 msgid "You cannot deactivate the admin user."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:339
+#: code:addons/base/res/res_users.py:338
 #, python-format
 msgid "You cannot deactivate the user you're currently logged in as."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:243
+#: code:addons/base/res/res_lang.py:238
 #, python-format
 msgid "You cannot delete the language which is Active!\n"
 "Please de-activate the language first."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:241
+#: code:addons/base/res/res_lang.py:236
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_values.py:432
-#, python-format
-msgid "You do not have the permission to perform this operation!!!"
-msgstr ""
-
-#. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
 msgid "You should try other search criteria."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:337
+#: code:addons/base/module/module.py:334
 #, python-format
 msgid "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:289
+#: code:addons/base/module/module.py:286
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:560
+#: code:addons/base/module/module.py:589
 #, python-format
 msgid "You try to upgrade the module %s that depends on the module: %s.\n"
 "But this module is not available in your system."
@@ -17307,36 +18772,47 @@ msgid "You will be able to define additional access rights by editing the newly
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
-#, python-format
-msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
+#: model:ir.module.module,description:base.module_website_crm
+msgid "Your Contact Form\n"
+"-----------------\n"
+"\n"
+"### Integrate contact forms with your leads\n"
+"\n"
+"This simple application integrates a contact form in your \"Contact us\" page.\n"
+"Forms submissions create leads automatically in <a href=\"https://www.odoo.com/page/crm\">Odoo CRM</a>.\n"
+"\n"
+"Easy Contact Page\n"
+"-----------------\n"
+"\n"
+"Get your leads filled up automatically with your contact form integration. This\n"
+"application allows a better qualification of the lead which is perfect to link\n"
+"them to marketing campaigns.\n"
+"\n"
+""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:487
+#: code:addons/base/ir/ir_mail_server.py:224
 #, python-format
-msgid "Your server does not seem to support SSL, you may want to try STARTTLS instead"
+msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.yu
-msgid "Yugoslavia"
+#: code:addons/base/ir/ir_mail_server.py:477
+#, python-format
+msgid "Your server does not seem to support SSL, you may want to try STARTTLS instead"
 msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "ZIP"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.zr
-msgid "Zaire"
-msgstr ""
-
-#. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
 msgstr ""
@@ -17381,6 +18857,12 @@ msgid "account_plaid"
 msgstr ""
 
 #. module: base
+#: code:addons/base/res/res_currency.py:113
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.res_partner_kanban_view
 msgid "at"
 msgstr ""
@@ -17396,11 +18878,6 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_base_module_configuration
-msgid "base.module.configuration"
-msgstr ""
-
-#. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
 msgstr ""
@@ -17416,6 +18893,11 @@ msgid "boolean"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery_bpost
+msgid "bpost Shipping"
+msgstr ""
+
+#. module: base
 #: selection:ir.model.fields,ttype:0
 msgid "char"
 msgstr ""
@@ -17459,6 +18941,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 msgid "e.g. BE0477472701"
 msgstr ""
 
@@ -17479,6 +18962,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_partner_form
+#: model:ir.ui.view,arch_db:base.view_partner_short_form
 #: model:ir.ui.view,arch_db:base.view_partner_simple_form
 msgid "e.g. Sales Director"
 msgstr ""
@@ -17560,7 +19044,7 @@ msgid "for record in self:\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:253
+#: code:addons/base/res/res_lang.py:248
 #, python-format
 msgid "format() must be given exactly one %char format specifier"
 msgstr ""
@@ -17576,11 +19060,6 @@ msgid "get"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet_timesheet_grid
-msgid "hr_timesheet_sheet_timesheet_grid"
-msgstr ""
-
-#. module: base
 #: selection:ir.model.fields,ttype:0
 msgid "html"
 msgstr ""
@@ -17635,9 +19114,9 @@ msgid "ir.actions.client"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
+#: model:ir.model,name:base.model_ir_actions_report
 #: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
+msgid "ir.actions.report"
 msgstr ""
 
 #. module: base
@@ -17667,6 +19146,11 @@ msgid "ir.cron"
 msgstr ""
 
 #. module: base
+#: model:ir.model,name:base.model_ir_default
+msgid "ir.default"
+msgstr ""
+
+#. module: base
 #: model:ir.model,name:base.model_ir_exports
 msgid "ir.exports"
 msgstr ""
@@ -17727,6 +19211,11 @@ msgid "ir.qweb.field"
 msgstr ""
 
 #. module: base
+#: model:ir.model,name:base.model_ir_qweb_field_barcode
+msgid "ir.qweb.field.barcode"
+msgstr ""
+
+#. module: base
 #: model:ir.model,name:base.model_ir_qweb_field_contact
 msgid "ir.qweb.field.contact"
 msgstr ""
@@ -17832,11 +19321,6 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr ""
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "log(message, level='info'): a logging function to create ir_logging records"
 msgstr ""
@@ -17862,7 +19346,7 @@ msgid "monetary"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_view.py:475
+#: code:addons/base/ir/ir_ui_view.py:469
 #, python-format
 msgid "n/a"
 msgstr ""
@@ -18056,3 +19540,18 @@ msgstr ""
 msgid "Åland Islands"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "中国会计科目表"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn_small_business
+msgid "中国小企业会计科目表"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn_standard
+msgid "会计科目表 - 中国企业会计准则"
+msgstr ""
+