Skip to content
Permalink
Browse files

[MERGE] forward port branch saas-12.2 up to 230ad8c

  • Loading branch information...
KangOl committed Mar 25, 2019
2 parents 39e7135 + 230ad8c commit 9bab32f316298c1d579f5225b86e57f31b1157bf
Showing 384 changed files with 27,334 additions and 11,098 deletions.
@@ -182,6 +182,16 @@ file_filter = addons/crm/i18n/<lang>.po
source_file = addons/crm/i18n/crm.pot
source_lang = en

[odoo-master.crm_iap_lead]
file_filter = addons/crm_iap_lead/i18n/<lang>.po
source_file = addons/crm_iap_lead/i18n/crm_iap_lead.pot
source_lang = en

[odoo-master.crm_iap_lead_website]
file_filter = addons/crm_iap_lead_website/i18n/<lang>.po
source_file = addons/crm_iap_lead_website/i18n/crm_iap_lead_website.pot
source_lang = en

[odoo-master.crm_livechat]
file_filter = addons/crm_livechat/i18n/<lang>.po
source_file = addons/crm_livechat/i18n/crm_livechat.pot
@@ -192,11 +202,6 @@ 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]
file_filter = addons/crm_project/i18n/<lang>.po
source_file = addons/crm_project/i18n/crm_project.pot
source_lang = en

[odoo-master.decimal_precision]
file_filter = addons/decimal_precision/i18n/<lang>.po
source_file = addons/decimal_precision/i18n/decimal_precision.pot
@@ -337,6 +342,11 @@ 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_skills]
file_filter = addons/hr_skills/i18n/<lang>.po
source_file = addons/hr_skills/i18n/hr_skills.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
@@ -502,6 +512,11 @@ file_filter = addons/payment_paypal/i18n/<lang>.po
source_file = addons/payment_paypal/i18n/payment_paypal.pot
source_lang = en

[odoo-master.payment_payulatam]
file_filter = addons/payment_payulatam/i18n/<lang>.po
source_file = addons/payment_payulatam/i18n/payment_payulatam.pot
source_lang = en

[odoo-master.payment_payumoney]
file_filter = addons/payment_payumoney/i18n/<lang>.po
source_file = addons/payment_payumoney/i18n/payment_payumoney.pot
@@ -622,6 +637,11 @@ file_filter = addons/purchase_requisition/i18n/<lang>.po
source_file = addons/purchase_requisition/i18n/purchase_requisition.pot
source_lang = en

[odoo-master.purchase_requisition_stock]
file_filter = addons/purchase_requisition_stock/i18n/<lang>.po
source_file = addons/purchase_requisition_stock/i18n/purchase_requisition_stock.pot
source_lang = en

[odoo-master.purchase_stock]
file_filter = addons/purchase_stock/i18n/<lang>.po
source_file = addons/purchase_stock/i18n/purchase_stock.pot
@@ -742,11 +762,6 @@ 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.stock_zebra]
file_filter = addons/stock_zebra/i18n/<lang>.po
source_file = addons/stock_zebra/i18n/stock_zebra.pot
source_lang = en

[odoo-master.survey]
file_filter = addons/survey/i18n/<lang>.po
source_file = addons/survey/i18n/survey.pot
@@ -917,6 +932,11 @@ file_filter = addons/website_payment/i18n/<lang>.po
source_file = addons/website_payment/i18n/website_payment.pot
source_lang = en

[odoo-master.website_profile]
file_filter = addons/website_profile/i18n/<lang>.po
source_file = addons/website_profile/i18n/website_profile.pot
source_lang = en

[odoo-master.website_rating]
file_filter = addons/website_rating/i18n/<lang>.po
source_file = addons/website_rating/i18n/website_rating.pot
@@ -952,6 +972,11 @@ file_filter = addons/website_sale_management/i18n/<lang>.po
source_file = addons/website_sale_management/i18n/website_sale_management.pot
source_lang = en

[odoo-master.website_sale_slides]
file_filter = addons/website_sale_slides/i18n/<lang>.po
source_file = addons/website_sale_slides/i18n/website_sale_slides.pot
source_lang = en

[odoo-master.website_sale_stock]
file_filter = addons/website_sale_stock/i18n/<lang>.po
source_file = addons/website_sale_stock/i18n/website_sale_stock.pot
@@ -967,6 +992,16 @@ file_filter = addons/website_slides/i18n/<lang>.po
source_file = addons/website_slides/i18n/website_slides.pot
source_lang = en

[odoo-master.website_slides_forum]
file_filter = addons/website_slides_forum/i18n/<lang>.po
source_file = addons/website_slides_forum/i18n/website_slides_forum.pot
source_lang = en

[odoo-master.website_slides_survey]
file_filter = addons/website_slides_survey/i18n/<lang>.po
source_file = addons/website_slides_survey/i18n/website_slides_survey.pot
source_lang = en

[odoo-master.website_theme_install]
file_filter = addons/website_theme_install/i18n/<lang>.po
source_file = addons/website_theme_install/i18n/website_theme_install.pot
@@ -22,6 +22,7 @@ recursive-include odoo *.otf
recursive-include odoo *.pdf
recursive-include odoo *.png
recursive-include odoo *.po
recursive-include odoo *.pot
recursive-include odoo *.rml
recursive-include odoo *.rng
recursive-include odoo *.rst
Oops, something went wrong.

0 comments on commit 9bab32f

Please sign in to comment.
You can’t perform that action at this time.