[MERGE] forward port branch saas-12.4 up to 98a55917a60

1 files changed, 25 insertions, 35 deletions

diff --git a/.tx/config b/.tx/config
index 1bcf2cb0e06..8d62ff0e4ab 100644
--- a/.tx/config
+++ b/.tx/config
@@ -17,11 +17,6 @@ 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_analytic_default_hr_expense]
-file_filter = addons/account_analytic_default_hr_expense/i18n/<lang>.po
-source_file = addons/account_analytic_default_hr_expense/i18n/account_analytic_default_hr_expense.pot
-source_lang = en
-
 [odoo-master.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
@@ -42,11 +37,6 @@ file_filter = addons/account_facturx/i18n/<lang>.po
 source_file = addons/account_facturx/i18n/account_facturx.pot
 source_lang = en
 
-[odoo-master.account_lock]
-file_filter = addons/account_lock/i18n/<lang>.po
-source_file = addons/account_lock/i18n/account_lock.pot
-source_lang = en
-
 [odoo-master.account_payment]
 file_filter = addons/account_payment/i18n/<lang>.po
 source_file = addons/account_payment/i18n/account_payment.pot
@@ -57,11 +47,6 @@ 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_voucher]
-file_filter = addons/account_voucher/i18n/<lang>.po
-source_file = addons/account_voucher/i18n/account_voucher.pot
-source_lang = en
-
 [odoo-master.analytic]
 file_filter = addons/analytic/i18n/<lang>.po
 source_file = addons/analytic/i18n/analytic.pot
@@ -202,11 +187,6 @@ 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]
-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.delivery]
 file_filter = addons/delivery/i18n/<lang>.po
 source_file = addons/delivery/i18n/delivery.pot
@@ -342,6 +322,16 @@ file_filter = addons/hr_skills/i18n/<lang>.po
 source_file = addons/hr_skills/i18n/hr_skills.pot
 source_lang = en
 
+[odoo-master.hr_skills_slides]
+file_filter = addons/hr_skills_slides/i18n/<lang>.po
+source_file = addons/hr_skills_slides/i18n/hr_skills_slides.pot
+source_lang = en
+
+[odoo-master.hr_skills_survey]
+file_filter = addons/hr_skills_survey/i18n/<lang>.po
+source_file = addons/hr_skills_survey/i18n/hr_skills_survey.pot
+source_lang = en
+
 [odoo-master.hr_timesheet]
 file_filter = addons/hr_timesheet/i18n/<lang>.po
 source_file = addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -447,11 +437,6 @@ file_filter = addons/mrp_account/i18n/<lang>.po
 source_file = addons/mrp_account/i18n/mrp_account.pot
 source_lang = en
 
-[odoo-master.mrp_bom_cost]
-file_filter = addons/mrp_bom_cost/i18n/<lang>.po
-source_file = addons/mrp_bom_cost/i18n/mrp_bom_cost.pot
-source_lang = en
-
 [odoo-master.mrp_subcontracting]
 file_filter = addons/mrp_subcontracting/i18n/<lang>.po
 source_file = addons/mrp_subcontracting/i18n/mrp_subcontracting.pot
@@ -497,6 +482,11 @@ file_filter = addons/payment_adyen/i18n/<lang>.po
 source_file = addons/payment_adyen/i18n/payment_adyen.pot
 source_lang = en
 
+[odoo-master.payment_alipay]
+file_filter = addons/payment_alipay/i18n/<lang>.po
+source_file = addons/payment_alipay/i18n/payment_alipay.pot
+source_lang = en
+
 [odoo-master.payment_authorize]
 file_filter = addons/payment_authorize/i18n/<lang>.po
 source_file = addons/payment_authorize/i18n/payment_authorize.pot
@@ -737,6 +727,11 @@ file_filter = addons/sale_timesheet/i18n/<lang>.po
 source_file = addons/sale_timesheet/i18n/sale_timesheet.pot
 source_lang = en
 
+[odoo-master.sale_timesheet_purchase]
+file_filter = addons/sale_timesheet_purchase/i18n/<lang>.po
+source_file = addons/sale_timesheet_purchase/i18n/sale_timesheet_purchase.pot
+source_lang = en
+
 [odoo-master.sales_team]
 file_filter = addons/sales_team/i18n/<lang>.po
 source_file = addons/sales_team/i18n/sales_team.pot
@@ -897,6 +892,11 @@ file_filter = addons/website_form/i18n/<lang>.po
 source_file = addons/website_form/i18n/website_form.pot
 source_lang = en
 
+[odoo-master.website_form_project]
+file_filter = addons/website_form_project/i18n/<lang>.po
+source_file = addons/website_form_project/i18n/website_form_project.pot
+source_lang = en
+
 [odoo-master.website_forum]
 file_filter = addons/website_forum/i18n/<lang>.po
 source_file = addons/website_forum/i18n/website_forum.pot
@@ -982,11 +982,6 @@ file_filter = addons/website_sale_coupon/i18n/<lang>.po
 source_file = addons/website_sale_coupon/i18n/website_sale_coupon.pot
 source_lang = en
 
-[odoo-master.website_sale_coupon_delivery]
-file_filter = addons/website_sale_coupon_delivery/i18n/<lang>.po
-source_file = addons/website_sale_coupon_delivery/i18n/website_sale_coupon_delivery.pot
-source_lang = en
-
 [odoo-master.website_sale_delivery]
 file_filter = addons/website_sale_delivery/i18n/<lang>.po
 source_file = addons/website_sale_delivery/i18n/website_sale_delivery.pot
@@ -997,11 +992,6 @@ 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_link_tracker]
-file_filter = addons/website_sale_link_tracker/i18n/<lang>.po
-source_file = addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot
-source_lang = en
-
 [odoo-master.website_sale_management]
 file_filter = addons/website_sale_management/i18n/<lang>.po
 source_file = addons/website_sale_management/i18n/website_sale_management.pot