diff --git a/.tx/config b/.tx/config
index 861bda4db..923dca9b6 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,49 +2,14 @@
 host = https://www.transifex.com
 type = PO
 
-[odoo-13-doc.accounting]
-file_filter = locale/<lang>/LC_MESSAGES/accounting.po
-source_file = locale/sources/accounting.pot
-source_lang = en
-
 [odoo-13-doc.applications]
 file_filter = locale/<lang>/LC_MESSAGES/applications.po
 source_file = locale/sources/applications.pot
 source_lang = en
 
-[odoo-13-doc.crm]
-file_filter = locale/<lang>/LC_MESSAGES/crm.po
-source_file = locale/sources/crm.pot
-source_lang = en
-
-[odoo-13-doc.db_management]
-file_filter = locale/<lang>/LC_MESSAGES/db_management.po
-source_file = locale/sources/db_management.pot
-source_lang = en
-
-[odoo-13-doc.discuss]
-file_filter = locale/<lang>/LC_MESSAGES/discuss.po
-source_file = locale/sources/discuss.pot
-source_lang = en
-
-[odoo-13-doc.ecommerce]
-file_filter = locale/<lang>/LC_MESSAGES/ecommerce.po
-source_file = locale/sources/ecommerce.pot
-source_lang = en
-
-[odoo-13-doc.email_marketing]
-file_filter = locale/<lang>/LC_MESSAGES/email_marketing.po
-source_file = locale/sources/email_marketing.pot
-source_lang = en
-
-[odoo-13-doc.expense]
-file_filter = locale/<lang>/LC_MESSAGES/expense.po
-source_file = locale/sources/expense.pot
-source_lang = en
-
-[odoo-13-doc.fsm]
-file_filter = locale/<lang>/LC_MESSAGES/fsm.po
-source_file = locale/sources/fsm.pot
+[odoo-13-doc.finance]
+file_filter = locale/<lang>/LC_MESSAGES/finance.po
+source_file = locale/sources/finance.pot
 source_lang = en
 
 [odoo-13-doc.general]
@@ -52,84 +17,19 @@ file_filter = locale/<lang>/LC_MESSAGES/general.po
 source_file = locale/sources/general.pot
 source_lang = en
 
-[odoo-13-doc.getting_started]
-file_filter = locale/<lang>/LC_MESSAGES/getting_started.po
-source_file = locale/sources/getting_started.pot
-source_lang = en
-
-[odoo-13-doc.helpdesk]
-file_filter = locale/<lang>/LC_MESSAGES/helpdesk.po
-source_file = locale/sources/helpdesk.pot
-source_lang = en
-
 [odoo-13-doc.index]
 file_filter = locale/<lang>/LC_MESSAGES/index.po
 source_file = locale/sources/index.pot
 source_lang = en
 
-[odoo-13-doc.inventory]
-file_filter = locale/<lang>/LC_MESSAGES/inventory.po
-source_file = locale/sources/inventory.pot
+[odoo-13-doc.inventory_and_mrp]
+file_filter = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
+source_file = locale/sources/inventory_and_mrp.pot
 source_lang = en
 
-[odoo-13-doc.iot]
-file_filter = locale/<lang>/LC_MESSAGES/iot.po
-source_file = locale/sources/iot.pot
-source_lang = en
-
-[odoo-13-doc.livechat]
-file_filter = locale/<lang>/LC_MESSAGES/livechat.po
-source_file = locale/sources/livechat.pot
-source_lang = en
-
-[odoo-13-doc.mobile]
-file_filter = locale/<lang>/LC_MESSAGES/mobile.po
-source_file = locale/sources/mobile.pot
-source_lang = en
-
-[odoo-13-doc.marketing_automation]
-file_filter = locale/<lang>/LC_MESSAGES/marketing_automation.po
-source_file = locale/sources/marketing_automation.pot
-source_lang = en
-
-[odoo-13-doc.manufacturing]
-file_filter = locale/<lang>/LC_MESSAGES/manufacturing.po
-source_file = locale/sources/manufacturing.pot
-source_lang = en
-
-[odoo-13-doc.planning]
-file_filter = locale/<lang>/LC_MESSAGES/planning.po
-source_file = locale/sources/planning.pot
-source_lang = en
-
-[odoo-13-doc.point_of_sale]
-file_filter = locale/<lang>/LC_MESSAGES/point_of_sale.po
-source_file = locale/sources/point_of_sale.pot
-source_lang = en
-
-[odoo-13-doc.portal]
-file_filter = locale/<lang>/LC_MESSAGES/portal.po
-source_file = locale/sources/portal.pot
-source_lang = en
-
-[odoo-13-doc.practical]
-file_filter = locale/<lang>/LC_MESSAGES/practical.po
-source_file = locale/sources/practical.pot
-source_lang = en
-
-[odoo-13-doc.project]
-file_filter = locale/<lang>/LC_MESSAGES/project.po
-source_file = locale/sources/project.pot
-source_lang = en
-
-[odoo-13-doc.purchase]
-file_filter = locale/<lang>/LC_MESSAGES/purchase.po
-source_file = locale/sources/purchase.pot
-source_lang = en
-
-[odoo-13-doc.quality]
-file_filter = locale/<lang>/LC_MESSAGES/quality.po
-source_file = locale/sources/quality.pot
+[odoo-13-doc.productivity]
+file_filter = locale/<lang>/LC_MESSAGES/productivity.po
+source_file = locale/sources/productivity.pot
 source_lang = en
 
 [odoo-13-doc.sales]
@@ -137,22 +37,17 @@ file_filter = locale/<lang>/LC_MESSAGES/sales.po
 source_file = locale/sources/sales.pot
 source_lang = en
 
-[odoo-13-doc.sms_marketing]
-file_filter = locale/<lang>/LC_MESSAGES/sms_marketing.po
-source_file = locale/sources/sms_marketing.pot
+[odoo-13-doc.services]
+file_filter = locale/<lang>/LC_MESSAGES/services.po
+source_file = locale/sources/services.pot
 source_lang = en
 
-[odoo-13-doc.social_marketing]
-file_filter = locale/<lang>/LC_MESSAGES/social_marketing.po
-source_file = locale/sources/social_marketing.pot
+[odoo-13-doc.user_settings]
+file_filter = locale/<lang>/LC_MESSAGES/settings.po
+source_file = locale/sources/settings.pot
 source_lang = en
 
-[odoo-13-doc.support]
-file_filter = locale/<lang>/LC_MESSAGES/support.po
-source_file = locale/sources/support.pot
-source_lang = en
-
-[odoo-13-doc.website]
-file_filter = locale/<lang>/LC_MESSAGES/website.po
-source_file = locale/sources/website.pot
+[odoo-13-doc.websites]
+file_filter = locale/<lang>/LC_MESSAGES/websites.po
+source_file = locale/sources/websites.pot
 source_lang = en
diff --git a/Makefile b/Makefile
index ac05483e1..a15e98d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -55,13 +55,10 @@ latexpdf:
 	cp $(BUILD_DIR)/latex/*.pdf $(BUILD_DIR)/html/
 	@echo "Build finished."
 
-l10n:
+gettext:
 	@echo "Generating translatable files..."
-	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) $(BUILD_DIR)/gettext
+	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) locale/sources
 	@echo "Generation finished."
-	@echo "Localizing translation strings..."
-	sphinx-intl update -p $(BUILD_DIR)/gettext -l $(L10N_LANGUAGES)
-	@echo "Localization finished."
 
 extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
 	@echo "Compiling stylesheets..."
diff --git a/conf.py b/conf.py
index 7b5949558..0199f634d 100644
--- a/conf.py
+++ b/conf.py
@@ -5,6 +5,7 @@ from pathlib import Path
 
 from pygments.lexers import JsonLexer, XmlLexer
 from sphinx.util import logging
+import sphinx
 
 _logger = logging.getLogger(__name__)
 
@@ -128,7 +129,13 @@ intersphinx_mapping = {
 github_user = 'odoo'
 github_project = 'documentation'
 
-locale_dirs = ['locale/']
+locale_dirs = ['../locale/']
+
+# custom docname_to_domain to devide the translations of applications in subdirectories
+sphinx.transforms.i18n.docname_to_domain = (
+    sphinx.util.i18n.docname_to_domain
+) = lambda docname, compact: docname.split('/')[1 if docname.startswith('applications/') else 0]
+
 supported_languages = {
     'de': 'Deutsch',
     'en': 'English',