diff --git a/edi_exchange_template_oca/i18n/edi_exchange_template_oca.pot b/edi_exchange_template_oca/i18n/edi_exchange_template_oca.pot
index 14b10cb8ba..45838fa76c 100644
--- a/edi_exchange_template_oca/i18n/edi_exchange_template_oca.pot
+++ b/edi_exchange_template_oca/i18n/edi_exchange_template_oca.pot
@@ -13,6 +13,17 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin__allowed_type_ids
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__allowed_type_ids
+msgid "Allowed Exchange Types"
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_type__output_template_allowed_ids
+msgid "Allowed Templates"
+msgstr ""
+
 #. module: edi_exchange_template_oca
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin__backend_id
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__backend_id
@@ -67,6 +78,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_backend__display_name
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin__display_name
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__display_name
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_type__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -104,12 +116,22 @@ msgstr ""
 msgid "EDI Exchange Templates"
 msgstr ""
 
+#. module: edi_exchange_template_oca
+#: model:ir.model,name:edi_exchange_template_oca.model_edi_exchange_type
+msgid "EDI Exchange Type"
+msgstr ""
+
 #. module: edi_exchange_template_oca
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin__type_id
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__type_id
 msgid "EDI Exchange type"
 msgstr ""
 
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_type__output_template_id
+msgid "Exchange Template"
+msgstr ""
+
 #. module: edi_exchange_template_oca
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__generator
 msgid "Generator"
@@ -124,6 +146,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_backend__id
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin__id
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output__id
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_type__id
 msgid "ID"
 msgstr ""
 
@@ -136,6 +159,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_backend____last_update
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_mixin____last_update
 #: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_template_output____last_update
+#: model:ir.model.fields,field_description:edi_exchange_template_oca.field_edi_exchange_type____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -197,6 +221,37 @@ msgstr ""
 msgid "Template key"
 msgstr ""
 
+#. module: edi_exchange_template_oca
+#: code:addons/edi_exchange_template_oca/models/edi_exchange_type.py:0
+#, python-format
+msgid "Template not allowed for this type."
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: code:addons/edi_exchange_template_oca/models/edi_exchange_type.py:0
+#, python-format
+msgid "Template type must match exchange type."
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,help:edi_exchange_template_oca.field_edi_exchange_type__output_template_id
+msgid "Template used to generate or process this type."
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,help:edi_exchange_template_oca.field_edi_exchange_type__output_template_allowed_ids
+msgid "Templates allowed to be used with this type."
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: code:addons/edi_exchange_template_oca/models/edi_exchange_template_mixin.py:0
+#, python-format
+msgid ""
+"The selected type must appear among the allowed types. NOTE: the type field "
+"is deprecated and will be removed soon. Use 'Allowed types' instead and set "
+"the template to use explicitly on the type that will use this template."
+msgstr ""
+
 #. module: edi_exchange_template_oca
 #: model:ir.model.fields,help:edi_exchange_template_oca.field_edi_exchange_template_output__template_arch
 msgid "This field stores the view arch."
@@ -206,3 +261,19 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:edi_exchange_template_oca.edi_exchange_template_output_view_search
 msgid "Type"
 msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model_terms:ir.ui.view,arch_db:edi_exchange_template_oca.edi_exchange_template_output_view_form
+msgid "Type (deprecated)"
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model:ir.model.fields,help:edi_exchange_template_oca.field_edi_exchange_template_mixin__allowed_type_ids
+#: model:ir.model.fields,help:edi_exchange_template_oca.field_edi_exchange_template_output__allowed_type_ids
+msgid "Types allowed to use this template."
+msgstr ""
+
+#. module: edi_exchange_template_oca
+#: model_terms:ir.ui.view,arch_db:edi_exchange_template_oca.edi_exchange_template_output_view_form
+msgid "Use allowed types and set the template explicitly on the type"
+msgstr ""