diff --git a/base_import_match/i18n/am.po b/base_import_match/i18n/am.po
index 750d96222..13126e413 100644
--- a/base_import_match/i18n/am.po
+++ b/base_import_match/i18n/am.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/ar.po b/base_import_match/i18n/ar.po
index bb7cb887b..9e77283be 100644
--- a/base_import_match/i18n/ar.po
+++ b/base_import_match/i18n/ar.po
@@ -21,19 +21,24 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "الحقل"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "تجميع حسب"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "المعرف"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "النموذج"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "النموذج"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "الاسم"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "المسلسل"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/bg.po b/base_import_match/i18n/bg.po
index 68a65eb1a..fdb20fbb2 100644
--- a/base_import_match/i18n/bg.po
+++ b/base_import_match/i18n/bg.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Име за Показване"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Групирай По"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Име"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Последователност"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/bs.po b/base_import_match/i18n/bs.po
index 72b1336cb..a5cb168d8 100644
--- a/base_import_match/i18n/bs.po
+++ b/base_import_match/i18n/bs.po
@@ -20,19 +20,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupiši po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Ime"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/ca.po b/base_import_match/i18n/ca.po
index adf8d0f24..483ca5897 100644
--- a/base_import_match/i18n/ca.po
+++ b/base_import_match/i18n/ca.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Condicional "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creat el"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr "Deduplicar ajustaments abans de fer importacions CSV."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr "Activeu si voleu utilitzar aquest camp només en certes condicions. "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Camp"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr "Nom del Camp"
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr "Camps que defineixen una associació d'importació "
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Camps que seran part de una clau única."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Camps "
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "Camps que definiran una clau única."
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupa Per"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -110,65 +115,66 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr "Importar Associació "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Valor Importat "
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr "En aquest model haureu d'aplicar l'associació."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació el"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Darrera Actualització per"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Associar "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nom"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Seqüència"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/cs.po b/base_import_match/i18n/cs.po
index 2a1c8e560..019e1944b 100644
--- a/base_import_match/i18n/cs.po
+++ b/base_import_match/i18n/cs.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Vytvořil(a)"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Seskupit podle"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Naposled upraveno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Naposled upraveno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Název"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Číselná řada"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/da.po b/base_import_match/i18n/da.po
index eb1af6b5b..b5fc4e237 100644
--- a/base_import_match/i18n/da.po
+++ b/base_import_match/i18n/da.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Gruppér efter"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "Id"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Navn"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Rækkefølge"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/de.po b/base_import_match/i18n/de.po
index 013443b11..3769b0ea8 100644
--- a/base_import_match/i18n/de.po
+++ b/base_import_match/i18n/de.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Bedingt"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Erstellt von"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Erstellt am:"
 
@@ -42,25 +47,25 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr "Dubletten in Einstellungen vor CSV-Importen bereinigen."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 "Aktivieren, wenn Sie dieses Feld nur unter bestimmten Bedingungen verwenden "
 "möchten."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Feld"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -70,33 +75,33 @@ msgid "Field import match definition"
 msgstr "Festlegung für Import-Übereinstimmung"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Feld, welche als Teil eines eindeutigen Schlüssels dienen wird."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Felder"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "Felder, die einen eindeutigen Schlüssel bilden sollen."
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Gruppieren nach"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -111,65 +116,69 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr "Import-Übereinstimmung"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Importierter Wert"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr "In diesem Modell wenden Sie die Übereinstimmung an."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert von"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Übereinstimmung"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modell"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modell"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Name"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr "base"
+#~ msgid "base"
+#~ msgstr "base"
diff --git a/base_import_match/i18n/el_GR.po b/base_import_match/i18n/el_GR.po
index cf5305f91..265a20337 100644
--- a/base_import_match/i18n/el_GR.po
+++ b/base_import_match/i18n/el_GR.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Ομαδοποίηση Ανά"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "Κωδικός"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία ενημέρωση από"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Ονομασία"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Ιεράρχηση"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/en_GB.po b/base_import_match/i18n/en_GB.po
index 72d0f5c99..f76d705a9 100644
--- a/base_import_match/i18n/en_GB.po
+++ b/base_import_match/i18n/en_GB.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Created by"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Created on"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Group By"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Name"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sequence"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es.po b/base_import_match/i18n/es.po
index 747087482..062ed34e6 100644
--- a/base_import_match/i18n/es.po
+++ b/base_import_match/i18n/es.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Condicional"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado el"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr "Configuración para deduplicar antes de importar CSV."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr "Habilítelo si quiere usar este campo sólo bajo ciertas condiciones."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Campo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr "Nombre del campo"
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr "Definición de concordancia de importación del campo"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Campo que formará parte de una clave única."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Campos"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "Campos que definirán una clave única."
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -110,65 +115,69 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr "Coincidencia de importación"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Valor importado"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr "En este modelo se aplicará la coincidencia."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Casar referencias"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modelo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modelo"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr "base de datos"
+#~ msgid "base"
+#~ msgstr "base de datos"
diff --git a/base_import_match/i18n/es_AR.po b/base_import_match/i18n/es_AR.po
index 8c45cd9fd..8812004ce 100644
--- a/base_import_match/i18n/es_AR.po
+++ b/base_import_match/i18n/es_AR.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_CL.po b/base_import_match/i18n/es_CL.po
index d1a5fa140..d12f52939 100644
--- a/base_import_match/i18n/es_CL.po
+++ b/base_import_match/i18n/es_CL.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_CO.po b/base_import_match/i18n/es_CO.po
index d86bde60c..6b11b620c 100644
--- a/base_import_match/i18n/es_CO.po
+++ b/base_import_match/i18n/es_CO.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_CR.po b/base_import_match/i18n/es_CR.po
index e52c93a34..d5da5b308 100644
--- a/base_import_match/i18n/es_CR.po
+++ b/base_import_match/i18n/es_CR.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_DO.po b/base_import_match/i18n/es_DO.po
index 3fe42316a..e6486cc98 100644
--- a/base_import_match/i18n/es_DO.po
+++ b/base_import_match/i18n/es_DO.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_EC.po b/base_import_match/i18n/es_EC.po
index 620c5fe4b..a72e378c0 100644
--- a/base_import_match/i18n/es_EC.po
+++ b/base_import_match/i18n/es_EC.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_ES.po b/base_import_match/i18n/es_ES.po
index 67f8ce538..075bd53ad 100644
--- a/base_import_match/i18n/es_ES.po
+++ b/base_import_match/i18n/es_ES.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/es_MX.po b/base_import_match/i18n/es_MX.po
index 7e17fd3c5..226d551dc 100644
--- a/base_import_match/i18n/es_MX.po
+++ b/base_import_match/i18n/es_MX.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificacion realizada"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizacion por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modelo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modelo"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_PE.po b/base_import_match/i18n/es_PE.po
index cc7de1320..9e5a30374 100644
--- a/base_import_match/i18n/es_PE.po
+++ b/base_import_match/i18n/es_PE.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado última vez por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_PY.po b/base_import_match/i18n/es_PY.po
index 3d61aa2cb..bf3a2df00 100644
--- a/base_import_match/i18n/es_PY.po
+++ b/base_import_match/i18n/es_PY.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/es_VE.po b/base_import_match/i18n/es_VE.po
index 89e15760a..ced1fd4d4 100644
--- a/base_import_match/i18n/es_VE.po
+++ b/base_import_match/i18n/es_VE.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/et.po b/base_import_match/i18n/et.po
index c561f7194..f553629dd 100644
--- a/base_import_match/i18n/et.po
+++ b/base_import_match/i18n/et.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Loonud"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Loodud"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Rühmitamine"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Viimati uuendatud"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nimi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Jada"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/eu.po b/base_import_match/i18n/eu.po
index 506a1ba6b..a6a5af537 100644
--- a/base_import_match/i18n/eu.po
+++ b/base_import_match/i18n/eu.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Nork sortua"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Created on"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Group By"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Izena"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sekuentzia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/fa.po b/base_import_match/i18n/fa.po
index 65f62db8a..041e7e37a 100644
--- a/base_import_match/i18n/fa.po
+++ b/base_import_match/i18n/fa.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "گروه‌بندی برمبنای"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "شناسه"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "تاریخ آخرین به‌روزرسانی"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "آخرین به روز رسانی توسط"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "نام"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "دنباله"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/fi.po b/base_import_match/i18n/fi.po
index 3082d7080..c842d0c22 100644
--- a/base_import_match/i18n/fi.po
+++ b/base_import_match/i18n/fi.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Luotu"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Kenttä"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Kentät"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Ryhmittele"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivittänyt"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Mall"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Mall"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nimi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Järjestysluku"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/fr.po b/base_import_match/i18n/fr.po
index b998f4fd6..7547c421f 100644
--- a/base_import_match/i18n/fr.po
+++ b/base_import_match/i18n/fr.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Champ"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Champs"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grouper par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Mis à jour par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Mis à jour le"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modèle"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modèle"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nom"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Séquence"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/fr_CA.po b/base_import_match/i18n/fr_CA.po
index ce5f42d1b..e64ca2bb2 100644
--- a/base_import_match/i18n/fr_CA.po
+++ b/base_import_match/i18n/fr_CA.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Champs"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "Identifiant"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modèle"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modèle"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nom"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr ""
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/fr_CH.po b/base_import_match/i18n/fr_CH.po
index 41c23afcb..aec18fd3f 100644
--- a/base_import_match/i18n/fr_CH.po
+++ b/base_import_match/i18n/fr_CH.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Modifié par"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/gl.po b/base_import_match/i18n/gl.po
index 466230b9e..e9ce1d1ae 100644
--- a/base_import_match/i18n/gl.po
+++ b/base_import_match/i18n/gl.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Condicional"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creado en"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última modificación"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "ültima actualización por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secuencia"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/gl_ES.po b/base_import_match/i18n/gl_ES.po
index 76267eceb..ff4854e82 100644
--- a/base_import_match/i18n/gl_ES.po
+++ b/base_import_match/i18n/gl_ES.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr ""
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/he.po b/base_import_match/i18n/he.po
index dbc0cb6a2..45c636bf0 100644
--- a/base_import_match/i18n/he.po
+++ b/base_import_match/i18n/he.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "נוצר על ידי"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "קבץ לפי"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "מזהה"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "תאריך שינוי אחרון"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על ידי"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "שם"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "רצף"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/hr.po b/base_import_match/i18n/hr.po
index 630244dea..ce30aa9b7 100644
--- a/base_import_match/i18n/hr.po
+++ b/base_import_match/i18n/hr.po
@@ -22,19 +22,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Uvjetno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
@@ -44,23 +49,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Naziv "
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Polje"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr "Naziv polja"
 
@@ -70,33 +75,33 @@ msgid "Field import match definition"
 msgstr "Definicja usporedbe za uvoz polja"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Polje koje će biti dio jedinstvenog ključa"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Polja"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "Polje koje će definirati jedinstveni ključ."
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupiraj po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -107,65 +112,69 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Uvežena vrijednost"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažuriranje"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr "base"
+#~ msgid "base"
+#~ msgstr "base"
diff --git a/base_import_match/i18n/hr_HR.po b/base_import_match/i18n/hr_HR.po
index 49da39087..3cb660787 100644
--- a/base_import_match/i18n/hr_HR.po
+++ b/base_import_match/i18n/hr_HR.po
@@ -22,19 +22,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
@@ -44,23 +49,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -70,33 +75,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Prupiraj po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -107,65 +112,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr ""
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/hu.po b/base_import_match/i18n/hu.po
index 932167328..627426d09 100644
--- a/base_import_match/i18n/hu.po
+++ b/base_import_match/i18n/hu.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Csoportosítás..."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Utolsó frissítés dátuma"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítve, által"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Illesztés"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modell, minta"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modell, minta"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Név"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sorszám"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/id.po b/base_import_match/i18n/id.po
index 2e6d3834f..6f49821da 100644
--- a/base_import_match/i18n/id.po
+++ b/base_import_match/i18n/id.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Dikelompokan berdasarkan .."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Terakhir Dimodifikasi pada"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Diperbaharui oleh"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nama"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Berurutan"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/it.po b/base_import_match/i18n/it.po
index eebefae32..94021ea20 100644
--- a/base_import_match/i18n/it.po
+++ b/base_import_match/i18n/it.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Condizionale"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creato il"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Campo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Campi"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Raggruppa per"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,66 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Valore importato"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modello"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modello"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sequenza"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/ja.po b/base_import_match/i18n/ja.po
index be6d7b73d..ad97673d0 100644
--- a/base_import_match/i18n/ja.po
+++ b/base_import_match/i18n/ja.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "作成者"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "作成日"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "表示名"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "グループ化"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "名称"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "付番"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/ko.po b/base_import_match/i18n/ko.po
index d9c7ba083..e83c82b53 100644
--- a/base_import_match/i18n/ko.po
+++ b/base_import_match/i18n/ko.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "작성자"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "작성일"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "그룹화"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "이름"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "순서"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/lt.po b/base_import_match/i18n/lt.po
index 813cc03d0..b7fdbb043 100644
--- a/base_import_match/i18n/lt.po
+++ b/base_import_match/i18n/lt.po
@@ -20,19 +20,24 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupuoti pagal"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Seka"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/lt_LT.po b/base_import_match/i18n/lt_LT.po
index 23f3bd698..2efebfccf 100644
--- a/base_import_match/i18n/lt_LT.po
+++ b/base_import_match/i18n/lt_LT.po
@@ -21,19 +21,24 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/lv.po b/base_import_match/i18n/lv.po
index 1fc4312e1..cb846cbe2 100644
--- a/base_import_match/i18n/lv.po
+++ b/base_import_match/i18n/lv.po
@@ -20,19 +20,24 @@ msgstr ""
 "2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupēt pēc"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nosaukums"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sērija"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/mk.po b/base_import_match/i18n/mk.po
index 97dd7e4a2..ab4305241 100644
--- a/base_import_match/i18n/mk.po
+++ b/base_import_match/i18n/mk.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Групирај по"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Име"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Секвенца"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/mn.po b/base_import_match/i18n/mn.po
index dc6c08d48..c1db0f426 100644
--- a/base_import_match/i18n/mn.po
+++ b/base_import_match/i18n/mn.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Үүсгэгч"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Бүлэглэх"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлийн засвар хийсэн"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Нэр"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Дараалал"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/nb.po b/base_import_match/i18n/nb.po
index 1194d27d5..74b90cd07 100644
--- a/base_import_match/i18n/nb.po
+++ b/base_import_match/i18n/nb.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Opprettet den"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupper etter"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Sist oppdatert "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Navn"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sekvens"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/nb_NO.po b/base_import_match/i18n/nb_NO.po
index 1a76d0122..4b283cbb6 100644
--- a/base_import_match/i18n/nb_NO.po
+++ b/base_import_match/i18n/nb_NO.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Laget av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Laget den"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Gruppe laget av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
-msgid "Name"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
-msgid "Sequence"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
+msgid "Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
+msgid "Sequence"
 msgstr ""
diff --git a/base_import_match/i18n/nl.po b/base_import_match/i18n/nl.po
index 74ffac92a..1a30a7ff1 100644
--- a/base_import_match/i18n/nl.po
+++ b/base_import_match/i18n/nl.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Veld"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Groepeer op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Match"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naam"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Reeks"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/nl_BE.po b/base_import_match/i18n/nl_BE.po
index 69cb81fdf..4d7dadac4 100644
--- a/base_import_match/i18n/nl_BE.po
+++ b/base_import_match/i18n/nl_BE.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Gemaakt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Gemaakt op"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Groeperen op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Laatst Aangepast op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naam:"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Volgorde"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/nl_NL.po b/base_import_match/i18n/nl_NL.po
index 27428c62d..0248708fd 100644
--- a/base_import_match/i18n/nl_NL.po
+++ b/base_import_match/i18n/nl_NL.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "weergavenaam"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Veld"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Velden"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Groeperen op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naam"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "volgorde"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/pl.po b/base_import_match/i18n/pl.po
index be325aaec..1042896f4 100644
--- a/base_import_match/i18n/pl.po
+++ b/base_import_match/i18n/pl.po
@@ -20,19 +20,24 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Utworzone przez"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Utworzono"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Pogrupuj wg"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Ostatnio modyfikowano"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio modyfikowane przez"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nazwa"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Numeracja"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/pt.po b/base_import_match/i18n/pt.po
index c85ef85c4..2619b7633 100644
--- a/base_import_match/i18n/pt.po
+++ b/base_import_match/i18n/pt.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Criado em"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Campos"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última Modificação Por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última Atualização Em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modelo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modelo"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sequência"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/pt_BR.po b/base_import_match/i18n/pt_BR.po
index a03215f38..bbad8767f 100644
--- a/base_import_match/i18n/pt_BR.po
+++ b/base_import_match/i18n/pt_BR.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Criado em"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Campo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Campos"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Agrupado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "Identificação"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última atualização em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modelo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modelo"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sequência"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/pt_PT.po b/base_import_match/i18n/pt_PT.po
index 68a95df17..3abc6421f 100644
--- a/base_import_match/i18n/pt_PT.po
+++ b/base_import_match/i18n/pt_PT.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Criado em"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Campos"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Última Atualização Por"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Última Atualização Em"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Modelo"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Modelo"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr ""
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/ro.po b/base_import_match/i18n/ro.po
index d2a88f68c..b31880a1a 100644
--- a/base_import_match/i18n/ro.po
+++ b/base_import_match/i18n/ro.po
@@ -21,19 +21,24 @@ msgstr ""
 "2:1));\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Creat de"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Creat la"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Columna"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupează după"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizare făcută de"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Nume"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Secvență"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/ru.po b/base_import_match/i18n/ru.po
index 4a6b858ba..6a65f5f06 100644
--- a/base_import_match/i18n/ru.po
+++ b/base_import_match/i18n/ru.po
@@ -21,19 +21,24 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Создан"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Поле"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновлено"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Модель"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Модель"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Название"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Последовательность"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/sk.po b/base_import_match/i18n/sk.po
index 69966d159..8587b43e5 100644
--- a/base_import_match/i18n/sk.po
+++ b/base_import_match/i18n/sk.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Zoskupiť podľa"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravoval"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravované"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Meno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Postupnosť"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/sl.po b/base_import_match/i18n/sl.po
index 83bf1109c..be6d62dfc 100644
--- a/base_import_match/i18n/sl.po
+++ b/base_import_match/i18n/sl.po
@@ -20,19 +20,24 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Pogojno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Ustvaril"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Ustvarjeno"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr "Odstrani duplikat nastavitev pred CSV uvozi."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr "Omogočite, če želite uporabljati to polje za nekatere pogoje."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Polje"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr "Določitev ujemanja uvoženega polja"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Polje, ki bo del unikatnega ključa"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Polja"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "Polja, ki bodo določala unikatni ključ"
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Združi po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -109,65 +114,66 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr "Ujemanje uvoza"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Uvožena vrednost"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr "V tem modelu boste uveljavili ujemanje."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji posodobil"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Ujemanje"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Zaporedje"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/sr.po b/base_import_match/i18n/sr.po
index bb333f8e3..c54671fc2 100644
--- a/base_import_match/i18n/sr.po
+++ b/base_import_match/i18n/sr.po
@@ -20,19 +20,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupiši po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Ime"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Niz"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/sr@latin.po b/base_import_match/i18n/sr@latin.po
index 5a0606811..ba2af9ea7 100644
--- a/base_import_match/i18n/sr@latin.po
+++ b/base_import_match/i18n/sr@latin.po
@@ -21,19 +21,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupisano po"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Zadnja izmjena"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Ime:"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/sv.po b/base_import_match/i18n/sv.po
index 727ef2ef3..d90734c4d 100644
--- a/base_import_match/i18n/sv.po
+++ b/base_import_match/i18n/sv.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Gruppera efter"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Senast redigerad"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Namn"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Nummerserie"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/th.po b/base_import_match/i18n/th.po
index d4a8a5c8b..d71077daf 100644
--- a/base_import_match/i18n/th.po
+++ b/base_import_match/i18n/th.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "จัดกลุ่มโดย"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "รหัส"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "ชื่อ"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "กำหนดเลขที่เอกสาร"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/tr.po b/base_import_match/i18n/tr.po
index a9e23a580..4d2db8bee 100644
--- a/base_import_match/i18n/tr.po
+++ b/base_import_match/i18n/tr.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr "Koşullı"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Oluşturuldu"
 
@@ -42,24 +47,24 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr "CSV içe aktarmadan önce ayarları tekilleştir"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 "Eğer bu alanı sadece bazı koşullarda kullanmak isterseniz etkinleştirin."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr "Alan"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr "Alan içe aktarımında eşleştirme tanımı"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr "Bir tekil anahtarın parçası olacak alan."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr "Alanlar"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr "tekil anahtarı tanımlayacak alan."
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupla"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -111,65 +116,66 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr "İçe Aktarma Eşleşmesi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+#, fuzzy
+msgid "Imported Value"
 msgstr "Alınan Değer"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr "Bu modelde eşleştirmeyi uygulayacaksınız."
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Son değişiklik"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Son güncelleyen"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Son güncellenme"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr "Eşleştirme"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Model"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Model"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Adı"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sıra"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/tr_TR.po b/base_import_match/i18n/tr_TR.po
index 4ac9dcf4f..7c0fbbcfc 100644
--- a/base_import_match/i18n/tr_TR.po
+++ b/base_import_match/i18n/tr_TR.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Oluşturulma tarihi"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Grupla"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "Kimlik"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "En son güncelleme tarihi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "En son güncelleyen "
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "Tip"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "Tip"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Ad"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Sıra"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/uk.po b/base_import_match/i18n/uk.po
index 37cb2112b..75cbfa964 100644
--- a/base_import_match/i18n/uk.po
+++ b/base_import_match/i18n/uk.po
@@ -20,19 +20,24 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Створив"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Дата створення"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Групувати за"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Остання модифікація"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє оновив"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Name"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Послідовність"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/vi.po b/base_import_match/i18n/vi.po
index 39ee506ca..ae1611398 100644
--- a/base_import_match/i18n/vi.po
+++ b/base_import_match/i18n/vi.po
@@ -19,19 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Được tạo bởi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Được tạo vào"
 
@@ -41,23 +46,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -67,33 +72,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "Group By"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -104,65 +109,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối vào"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Tên"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "Trình tự"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/vi_VN.po b/base_import_match/i18n/vi_VN.po
index 6bc4190a9..0aba310d6 100644
--- a/base_import_match/i18n/vi_VN.po
+++ b/base_import_match/i18n/vi_VN.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "Tạo bởi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "Tạo vào"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật lần cuối bởi"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "Tên"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr ""
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/zh_CN.po b/base_import_match/i18n/zh_CN.po
index 34f6f589c..dd9472027 100644
--- a/base_import_match/i18n/zh_CN.po
+++ b/base_import_match/i18n/zh_CN.po
@@ -21,19 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "创建者"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "创建时间"
 
@@ -43,23 +48,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -69,33 +74,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "分组"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -106,65 +111,65 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr "模型"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+#, fuzzy
+msgid "Model name"
+msgstr "模型"
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "名称"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "序号"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/i18n/zh_TW.po b/base_import_match/i18n/zh_TW.po
index 0d6211b04..960b88d01 100644
--- a/base_import_match/i18n/zh_TW.po
+++ b/base_import_match/i18n/zh_TW.po
@@ -20,19 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model,name:base_import_match.model_base
+msgid "Base"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__conditional
 msgid "Conditional"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_uid
 msgid "Created by"
 msgstr "建立者"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_create_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__create_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__create_date
 msgid "Created on"
 msgstr "建立於"
 
@@ -42,23 +47,23 @@ msgid "Deduplicate settings prior to CSV imports."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_display_name
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__display_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_conditional
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__conditional
 msgid "Enable if you want to use this field only in some conditions."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__field_id
 msgid "Field"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__name
 msgid "Field Name"
 msgstr ""
 
@@ -68,33 +73,33 @@ msgid "Field import match definition"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_field_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__field_id
 msgid "Field that will be part of an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__field_ids
 msgid "Fields"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_ids
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__field_ids
 msgid "Fields that will define an unique key."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Group By"
 msgstr "分組方式"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__id
 msgid "ID"
 msgstr "編號"
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_imported_value
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__imported_value
 msgid ""
 "If the imported value is not this, the whole matching rule will be "
 "discarded. Be careful, this data is always treated as a string, and "
@@ -105,65 +110,64 @@ msgstr ""
 #. module: base_import_match
 #: model:ir.actions.act_window,name:base_import_match.match_action
 #: model:ir.ui.menu,name:base_import_match.match_menu
-#: model:ir.ui.view,arch_db:base_import_match.match_form_view
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
-#: model:ir.ui.view,arch_db:base_import_match.match_tree_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
 msgid "Import Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_imported_value
-msgid "Imported value"
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__imported_value
+msgid "Imported Value"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,help:base_import_match.field_base_import_match_model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,help:base_import_match.field_base_import_match_field__model_id
 msgid "In this model you will apply the match."
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match___last_update
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field___last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match____last_update
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field____last_update
 msgid "Last Modified on"
 msgstr "最後修改:"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_uid
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_uid
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_uid
 msgid "Last Updated by"
 msgstr "最後更新："
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_write_date
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__write_date
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__write_date
 msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_match_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__match_id
 msgid "Match"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_id
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_model_name
-#: model:ir.ui.view,arch_db:base_import_match.match_search_view
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_id
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_field__model_id
+#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
 msgid "Model"
 msgstr ""
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_name
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__model_name
+msgid "Model name"
+msgstr ""
+
+#. module: base_import_match
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__name
 msgid "Name"
 msgstr "名稱"
 
 #. module: base_import_match
-#: model:ir.model.fields,field_description:base_import_match.field_base_import_match_sequence
+#: model:ir.model.fields,field_description:base_import_match.field_base_import_match__sequence
 msgid "Sequence"
 msgstr "序列"
-
-#. module: base_import_match
-#: model:ir.model,name:base_import_match.model_base
-msgid "base"
-msgstr ""
diff --git a/base_import_match/static/description/index.html b/base_import_match/static/description/index.html
index 8fff819c1..7c6e63fce 100644
--- a/base_import_match/static/description/index.html
+++ b/base_import_match/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Base Import Match</title>
 <style type="text/css">