diff --git a/mass_mailing_list_dynamic/README.rst b/mass_mailing_list_dynamic/README.rst
index bd3ac0b76..65405f6d7 100644
--- a/mass_mailing_list_dynamic/README.rst
+++ b/mass_mailing_list_dynamic/README.rst
@@ -26,8 +26,7 @@ Dynamic Mass Mailing Lists
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
 Without this addon you have to choose between providing a dynamic domain and
-letting your mass mailings reach all partners that match it, or being able to
-unsubscribe to certain mailing lists while still being subscribed to others.
+letting your mass mailings reach all partners that match it.
 
 This addon allows you to create dynamic mailing lists, so you can now benefit
 from both things.
@@ -69,7 +68,7 @@ Usage
 
 To use this module, you need to:
 
-#. Go to *Mass Mailing > Mailings > Mass Mailings*, and create one.
+#. Go to *Email Marketing > Mailings*, and create one.
 #. Select as recipients a mailing list.
 #. On "Select mailing lists:", choose one mailing list with dynamic flag
    checked.
diff --git a/mass_mailing_list_dynamic/i18n/am.po b/mass_mailing_list_dynamic/i18n/am.po
index f4a15dd2e..fe4469ba2 100644
--- a/mass_mailing_list_dynamic/i18n/am.po
+++ b/mass_mailing_list_dynamic/i18n/am.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "ተባባሪ"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "ተባባሪ"
diff --git a/mass_mailing_list_dynamic/i18n/ar.po b/mass_mailing_list_dynamic/i18n/ar.po
index 1c94c35d2..c2ff4a53c 100644
--- a/mass_mailing_list_dynamic/i18n/ar.po
+++ b/mass_mailing_list_dynamic/i18n/ar.po
@@ -20,14 +20,14 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "المعرف"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "الشريك"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "الشريك"
diff --git a/mass_mailing_list_dynamic/i18n/bg.po b/mass_mailing_list_dynamic/i18n/bg.po
index 0e2bb00e4..449b112a7 100644
--- a/mass_mailing_list_dynamic/i18n/bg.po
+++ b/mass_mailing_list_dynamic/i18n/bg.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Име за Показване"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Партньор"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Партньор"
diff --git a/mass_mailing_list_dynamic/i18n/bs.po b/mass_mailing_list_dynamic/i18n/bs.po
index d988bb3f9..cf4d97ee6 100644
--- a/mass_mailing_list_dynamic/i18n/bs.po
+++ b/mass_mailing_list_dynamic/i18n/bs.po
@@ -20,14 +20,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/ca.po b/mass_mailing_list_dynamic/i18n/ca.po
index 80afe4954..392986083 100644
--- a/mass_mailing_list_dynamic/i18n/ca.po
+++ b/mass_mailing_list_dynamic/i18n/ca.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creat el"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació el"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Darrera Actualització per"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Contactes del correu massiu"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/cs.po b/mass_mailing_list_dynamic/i18n/cs.po
index e77594d32..dcaaa31a0 100644
--- a/mass_mailing_list_dynamic/i18n/cs.po
+++ b/mass_mailing_list_dynamic/i18n/cs.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Vytvořil(a)"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Naposled upraveno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Naposled upraveno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Společník"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Společník"
diff --git a/mass_mailing_list_dynamic/i18n/da.po b/mass_mailing_list_dynamic/i18n/da.po
index 6397c1aae..27909ad5f 100644
--- a/mass_mailing_list_dynamic/i18n/da.po
+++ b/mass_mailing_list_dynamic/i18n/da.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "Id"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/de.po b/mass_mailing_list_dynamic/i18n/de.po
index fc8e9fcb5..3df68752c 100644
--- a/mass_mailing_list_dynamic/i18n/de.po
+++ b/mass_mailing_list_dynamic/i18n/de.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Angelegt von"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Angelegt am"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Angezeigter Name"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert durch"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Massenmail-Kontakt"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/el_GR.po b/mass_mailing_list_dynamic/i18n/el_GR.po
index 60f6670a7..7e0cd1e04 100644
--- a/mass_mailing_list_dynamic/i18n/el_GR.po
+++ b/mass_mailing_list_dynamic/i18n/el_GR.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από "
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "Κωδικός"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία ενημέρωση από"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Συνεργάτης"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Συνεργάτης"
diff --git a/mass_mailing_list_dynamic/i18n/en_GB.po b/mass_mailing_list_dynamic/i18n/en_GB.po
index 83dd63119..3432bc07f 100644
--- a/mass_mailing_list_dynamic/i18n/en_GB.po
+++ b/mass_mailing_list_dynamic/i18n/en_GB.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Created by"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/es.po b/mass_mailing_list_dynamic/i18n/es.po
index 7e8f09ea5..4dc1cb9be 100644
--- a/mass_mailing_list_dynamic/i18n/es.po
+++ b/mass_mailing_list_dynamic/i18n/es.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -52,83 +52,97 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado el"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr "Dinámica"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr "Lista dinámica"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
-msgstr ""
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+#, fuzzy
+#| msgid "Sync method"
+msgid "Is Synced"
+msgstr "Método de sincronización"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación e"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr "Cargar filtro"
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "mail.mass_mailing.load.filter"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "mail.mass_mailing.load.filter"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +164,28 @@ msgid "Only add new records"
 msgstr "Añadir solo registros nuevos"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+#, fuzzy
+#| msgid "Sync method"
+msgid "Sync Method"
 msgstr "Método de sincronización"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr "Sincronizar ahora"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr "Criterio de sincronización"
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr "mail.mass_mailing.load.filter"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/es_AR.po b/mass_mailing_list_dynamic/i18n/es_AR.po
index 6c6391917..7758a20d2 100644
--- a/mass_mailing_list_dynamic/i18n/es_AR.po
+++ b/mass_mailing_list_dynamic/i18n/es_AR.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_CL.po b/mass_mailing_list_dynamic/i18n/es_CL.po
index af15003d4..67e487861 100644
--- a/mass_mailing_list_dynamic/i18n/es_CL.po
+++ b/mass_mailing_list_dynamic/i18n/es_CL.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_CO.po b/mass_mailing_list_dynamic/i18n/es_CO.po
index 4250fc573..c9bf95bef 100644
--- a/mass_mailing_list_dynamic/i18n/es_CO.po
+++ b/mass_mailing_list_dynamic/i18n/es_CO.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_CR.po b/mass_mailing_list_dynamic/i18n/es_CR.po
index dccee1560..9a67114f2 100644
--- a/mass_mailing_list_dynamic/i18n/es_CR.po
+++ b/mass_mailing_list_dynamic/i18n/es_CR.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/es_DO.po b/mass_mailing_list_dynamic/i18n/es_DO.po
index a57143691..1e57ca87e 100644
--- a/mass_mailing_list_dynamic/i18n/es_DO.po
+++ b/mass_mailing_list_dynamic/i18n/es_DO.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_EC.po b/mass_mailing_list_dynamic/i18n/es_EC.po
index 4d29cf844..f9bf93e04 100644
--- a/mass_mailing_list_dynamic/i18n/es_EC.po
+++ b/mass_mailing_list_dynamic/i18n/es_EC.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/es_ES.po b/mass_mailing_list_dynamic/i18n/es_ES.po
index d937ee6eb..6be31e418 100644
--- a/mass_mailing_list_dynamic/i18n/es_ES.po
+++ b/mass_mailing_list_dynamic/i18n/es_ES.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_MX.po b/mass_mailing_list_dynamic/i18n/es_MX.po
index 6bef68850..95c79b054 100644
--- a/mass_mailing_list_dynamic/i18n/es_MX.po
+++ b/mass_mailing_list_dynamic/i18n/es_MX.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificacion realizada"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizacion por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Compañero"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Compañero"
diff --git a/mass_mailing_list_dynamic/i18n/es_PE.po b/mass_mailing_list_dynamic/i18n/es_PE.po
index d06d825d2..bd228413d 100644
--- a/mass_mailing_list_dynamic/i18n/es_PE.po
+++ b/mass_mailing_list_dynamic/i18n/es_PE.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado última vez por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_PY.po b/mass_mailing_list_dynamic/i18n/es_PY.po
index b0819f9f1..cdecfa364 100644
--- a/mass_mailing_list_dynamic/i18n/es_PY.po
+++ b/mass_mailing_list_dynamic/i18n/es_PY.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/es_VE.po b/mass_mailing_list_dynamic/i18n/es_VE.po
index 86bd15f2e..b74453203 100644
--- a/mass_mailing_list_dynamic/i18n/es_VE.po
+++ b/mass_mailing_list_dynamic/i18n/es_VE.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/et.po b/mass_mailing_list_dynamic/i18n/et.po
index d1f96a6d1..5b4d49854 100644
--- a/mass_mailing_list_dynamic/i18n/et.po
+++ b/mass_mailing_list_dynamic/i18n/et.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Loonud"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Loodud"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Viimati uuendatud"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/eu.po b/mass_mailing_list_dynamic/i18n/eu.po
index 7aab6f860..128c8b138 100644
--- a/mass_mailing_list_dynamic/i18n/eu.po
+++ b/mass_mailing_list_dynamic/i18n/eu.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Nork sortua"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Kidea"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Kidea"
diff --git a/mass_mailing_list_dynamic/i18n/fa.po b/mass_mailing_list_dynamic/i18n/fa.po
index e96c04db5..181960fe6 100644
--- a/mass_mailing_list_dynamic/i18n/fa.po
+++ b/mass_mailing_list_dynamic/i18n/fa.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "شناسه"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "تاریخ آخرین به‌روزرسانی"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "آخرین به روز رسانی توسط"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/fi.po b/mass_mailing_list_dynamic/i18n/fi.po
index e89a8c65d..3cac740ba 100644
--- a/mass_mailing_list_dynamic/i18n/fi.po
+++ b/mass_mailing_list_dynamic/i18n/fi.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Luotu"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivittänyt"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Kumppani"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Kumppani"
diff --git a/mass_mailing_list_dynamic/i18n/fr.po b/mass_mailing_list_dynamic/i18n/fr.po
index b85952d50..5b331cc5a 100644
--- a/mass_mailing_list_dynamic/i18n/fr.po
+++ b/mass_mailing_list_dynamic/i18n/fr.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Contact de la liste de diffusion"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mass_mailing_list_dynamic/i18n/fr_CA.po b/mass_mailing_list_dynamic/i18n/fr_CA.po
index 06f01e3bf..b9c840c0e 100644
--- a/mass_mailing_list_dynamic/i18n/fr_CA.po
+++ b/mass_mailing_list_dynamic/i18n/fr_CA.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "Identifiant"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mass_mailing_list_dynamic/i18n/fr_CH.po b/mass_mailing_list_dynamic/i18n/fr_CH.po
index c1003e804..93a2f306a 100644
--- a/mass_mailing_list_dynamic/i18n/fr_CH.po
+++ b/mass_mailing_list_dynamic/i18n/fr_CH.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mass_mailing_list_dynamic/i18n/gl.po b/mass_mailing_list_dynamic/i18n/gl.po
index 70fb8d347..470d27178 100644
--- a/mass_mailing_list_dynamic/i18n/gl.po
+++ b/mass_mailing_list_dynamic/i18n/gl.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última modificación"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "ültima actualización por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mass_mailing_list_dynamic/i18n/gl_ES.po b/mass_mailing_list_dynamic/i18n/gl_ES.po
index b1c24b2f9..8c974da94 100644
--- a/mass_mailing_list_dynamic/i18n/gl_ES.po
+++ b/mass_mailing_list_dynamic/i18n/gl_ES.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/he.po b/mass_mailing_list_dynamic/i18n/he.po
index 9fe14e63e..3b8dcc4df 100644
--- a/mass_mailing_list_dynamic/i18n/he.po
+++ b/mass_mailing_list_dynamic/i18n/he.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "נוצר על ידי"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "מזהה"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "תאריך שינוי אחרון"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על ידי"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/hr.po b/mass_mailing_list_dynamic/i18n/hr.po
index 95371e5e3..50120df95 100644
--- a/mass_mailing_list_dynamic/i18n/hr.po
+++ b/mass_mailing_list_dynamic/i18n/hr.po
@@ -20,14 +20,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Stvorio/la"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Stvoreno dana"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zadnju izmjenu izvršio/la"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Kontakti za masovno slanje"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +162,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/hr_HR.po b/mass_mailing_list_dynamic/i18n/hr_HR.po
index 64644f3c7..9ca9ab1a9 100644
--- a/mass_mailing_list_dynamic/i18n/hr_HR.po
+++ b/mass_mailing_list_dynamic/i18n/hr_HR.po
@@ -21,14 +21,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/hu.po b/mass_mailing_list_dynamic/i18n/hu.po
index 360c36376..030cfd6ad 100644
--- a/mass_mailing_list_dynamic/i18n/hu.po
+++ b/mass_mailing_list_dynamic/i18n/hu.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Utolsó frissítés dátuma"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítve, által"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/id.po b/mass_mailing_list_dynamic/i18n/id.po
index e88bb942f..67f22d1a6 100644
--- a/mass_mailing_list_dynamic/i18n/id.po
+++ b/mass_mailing_list_dynamic/i18n/id.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Terakhir Dimodifikasi pada"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Diperbaharui oleh"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/it.po b/mass_mailing_list_dynamic/i18n/it.po
index 28a10d0f7..b6a949dc5 100644
--- a/mass_mailing_list_dynamic/i18n/it.po
+++ b/mass_mailing_list_dynamic/i18n/it.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creato il"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ultimo aggiornamento di"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultimo aggiornamento il"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Contatto Mass Mailing"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/ja.po b/mass_mailing_list_dynamic/i18n/ja.po
index 2ecdfa772..f8e5e5f63 100644
--- a/mass_mailing_list_dynamic/i18n/ja.po
+++ b/mass_mailing_list_dynamic/i18n/ja.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "作成者"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "作成日"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "表示名"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "パートナ"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "パートナ"
diff --git a/mass_mailing_list_dynamic/i18n/ko.po b/mass_mailing_list_dynamic/i18n/ko.po
index 7c5e4c281..8c57b14dc 100644
--- a/mass_mailing_list_dynamic/i18n/ko.po
+++ b/mass_mailing_list_dynamic/i18n/ko.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "작성자"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "작성일"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/lt.po b/mass_mailing_list_dynamic/i18n/lt.po
index c1fdcefc0..1d16d76e8 100644
--- a/mass_mailing_list_dynamic/i18n/lt.po
+++ b/mass_mailing_list_dynamic/i18n/lt.po
@@ -20,14 +20,14 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partneris"
diff --git a/mass_mailing_list_dynamic/i18n/lt_LT.po b/mass_mailing_list_dynamic/i18n/lt_LT.po
index 0f4425c40..e2f131bfe 100644
--- a/mass_mailing_list_dynamic/i18n/lt_LT.po
+++ b/mass_mailing_list_dynamic/i18n/lt_LT.po
@@ -21,14 +21,14 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/lv.po b/mass_mailing_list_dynamic/i18n/lv.po
index 6c206e22a..37d6d0506 100644
--- a/mass_mailing_list_dynamic/i18n/lv.po
+++ b/mass_mailing_list_dynamic/i18n/lv.po
@@ -20,14 +20,14 @@ msgstr ""
 "2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partneris"
diff --git a/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot b/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot
index 28bb7fda6..9ba45a177 100644
--- a/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot
+++ b/mass_mailing_list_dynamic/i18n/mass_mailing_list_dynamic.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,12 +14,12 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts in fully synchronized lists."
 msgstr ""
 
@@ -29,7 +29,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -40,82 +40,92 @@ msgid "Cannot edit manually contacts in a fully synchronized list. Change its sy
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -137,32 +147,22 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Set this list as dynamic, to make it autosynchronized with partners from a given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
-
diff --git a/mass_mailing_list_dynamic/i18n/mk.po b/mass_mailing_list_dynamic/i18n/mk.po
index 40ea87661..41d1147c6 100644
--- a/mass_mailing_list_dynamic/i18n/mk.po
+++ b/mass_mailing_list_dynamic/i18n/mk.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Партнер"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Партнер"
diff --git a/mass_mailing_list_dynamic/i18n/mn.po b/mass_mailing_list_dynamic/i18n/mn.po
index 0b6d0f037..71122d331 100644
--- a/mass_mailing_list_dynamic/i18n/mn.po
+++ b/mass_mailing_list_dynamic/i18n/mn.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Үүсгэгч"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлийн засвар хийсэн"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Харилцагч"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Харилцагч"
diff --git a/mass_mailing_list_dynamic/i18n/nb.po b/mass_mailing_list_dynamic/i18n/nb.po
index e6bff7360..04abc86c3 100644
--- a/mass_mailing_list_dynamic/i18n/nb.po
+++ b/mass_mailing_list_dynamic/i18n/nb.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Opprettet den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Sist oppdatert "
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/nb_NO.po b/mass_mailing_list_dynamic/i18n/nb_NO.po
index 95279d455..5d742ce39 100644
--- a/mass_mailing_list_dynamic/i18n/nb_NO.po
+++ b/mass_mailing_list_dynamic/i18n/nb_NO.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Laget av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Laget den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/nl.po b/mass_mailing_list_dynamic/i18n/nl.po
index 7213a4075..761544d79 100644
--- a/mass_mailing_list_dynamic/i18n/nl.po
+++ b/mass_mailing_list_dynamic/i18n/nl.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Relatie"
diff --git a/mass_mailing_list_dynamic/i18n/nl_BE.po b/mass_mailing_list_dynamic/i18n/nl_BE.po
index 294d67811..2e21aa95a 100644
--- a/mass_mailing_list_dynamic/i18n/nl_BE.po
+++ b/mass_mailing_list_dynamic/i18n/nl_BE.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Gemaakt door"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Gemaakt op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Laatst Aangepast op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Relatie"
diff --git a/mass_mailing_list_dynamic/i18n/nl_NL.po b/mass_mailing_list_dynamic/i18n/nl_NL.po
index 771561f0c..6de5db558 100644
--- a/mass_mailing_list_dynamic/i18n/nl_NL.po
+++ b/mass_mailing_list_dynamic/i18n/nl_NL.po
@@ -21,14 +21,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Weergavenaam"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/pl.po b/mass_mailing_list_dynamic/i18n/pl.po
index 9ce192fe0..b181502a9 100644
--- a/mass_mailing_list_dynamic/i18n/pl.po
+++ b/mass_mailing_list_dynamic/i18n/pl.po
@@ -21,14 +21,14 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Utworzone przez"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Utworzono"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Ostatnio modyfikowano"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio modyfikowane przez"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/pt.po b/mass_mailing_list_dynamic/i18n/pt.po
index ef1814c3d..fa2a33747 100644
--- a/mass_mailing_list_dynamic/i18n/pt.po
+++ b/mass_mailing_list_dynamic/i18n/pt.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nome"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Modificado a última vez por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Contacto do email em massa"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +162,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mass_mailing_list_dynamic/i18n/pt_BR.po b/mass_mailing_list_dynamic/i18n/pt_BR.po
index ecf0fb0fd..7cace2ab2 100644
--- a/mass_mailing_list_dynamic/i18n/pt_BR.po
+++ b/mass_mailing_list_dynamic/i18n/pt_BR.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "Identificação"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última atualização em"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mass_mailing_list_dynamic/i18n/pt_PT.po b/mass_mailing_list_dynamic/i18n/pt_PT.po
index e20c1f4b5..8e4bceb24 100644
--- a/mass_mailing_list_dynamic/i18n/pt_PT.po
+++ b/mass_mailing_list_dynamic/i18n/pt_PT.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mass_mailing_list_dynamic/i18n/ro.po b/mass_mailing_list_dynamic/i18n/ro.po
index 63f5edd33..47b049bfa 100644
--- a/mass_mailing_list_dynamic/i18n/ro.po
+++ b/mass_mailing_list_dynamic/i18n/ro.po
@@ -20,14 +20,14 @@ msgstr ""
 "2:1));\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Creat de"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Creat la"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizare făcută de"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partener"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partener"
diff --git a/mass_mailing_list_dynamic/i18n/ru.po b/mass_mailing_list_dynamic/i18n/ru.po
index 79aeeb415..70b34ec11 100644
--- a/mass_mailing_list_dynamic/i18n/ru.po
+++ b/mass_mailing_list_dynamic/i18n/ru.po
@@ -21,14 +21,14 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Создан"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновлено"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Контрагент"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Контрагент"
diff --git a/mass_mailing_list_dynamic/i18n/sk.po b/mass_mailing_list_dynamic/i18n/sk.po
index 7eae9a9c4..bb1d8b58f 100644
--- a/mass_mailing_list_dynamic/i18n/sk.po
+++ b/mass_mailing_list_dynamic/i18n/sk.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravoval"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravované"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/sl.po b/mass_mailing_list_dynamic/i18n/sl.po
index ad323e5a5..0acf74297 100644
--- a/mass_mailing_list_dynamic/i18n/sl.po
+++ b/mass_mailing_list_dynamic/i18n/sl.po
@@ -20,14 +20,14 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,95 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Ustvaril"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Ustvarjeno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji posodobil"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+#, fuzzy
+#| msgid "Mass Mailing Contact"
+msgid "Mail Mass Mailing Load Filter"
+msgstr "Stik masovne pošte"
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +162,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/sr.po b/mass_mailing_list_dynamic/i18n/sr.po
index 9e8f4f875..be06e0e1f 100644
--- a/mass_mailing_list_dynamic/i18n/sr.po
+++ b/mass_mailing_list_dynamic/i18n/sr.po
@@ -20,14 +20,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/sr@latin.po b/mass_mailing_list_dynamic/i18n/sr@latin.po
index d1eb61ed3..4a30cd37a 100644
--- a/mass_mailing_list_dynamic/i18n/sr@latin.po
+++ b/mass_mailing_list_dynamic/i18n/sr@latin.po
@@ -21,14 +21,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -40,7 +40,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -53,83 +53,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -151,33 +161,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mass_mailing_list_dynamic/i18n/sv.po b/mass_mailing_list_dynamic/i18n/sv.po
index 9e486f6a4..350a5cdbb 100644
--- a/mass_mailing_list_dynamic/i18n/sv.po
+++ b/mass_mailing_list_dynamic/i18n/sv.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Senast redigerad"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Företag"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Företag"
diff --git a/mass_mailing_list_dynamic/i18n/th.po b/mass_mailing_list_dynamic/i18n/th.po
index f4f2a97fd..2c72380d6 100644
--- a/mass_mailing_list_dynamic/i18n/th.po
+++ b/mass_mailing_list_dynamic/i18n/th.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "รหัส"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "พาร์ทเนอร์"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "พาร์ทเนอร์"
diff --git a/mass_mailing_list_dynamic/i18n/tr.po b/mass_mailing_list_dynamic/i18n/tr.po
index d67d2fd87..9b10b497e 100644
--- a/mass_mailing_list_dynamic/i18n/tr.po
+++ b/mass_mailing_list_dynamic/i18n/tr.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Oluşturuldu"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Son değişiklik"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Son güncelleyen"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Son güncelleme"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "İş Ortağı"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "İş Ortağı"
diff --git a/mass_mailing_list_dynamic/i18n/tr_TR.po b/mass_mailing_list_dynamic/i18n/tr_TR.po
index 52760e720..fef8d83ab 100644
--- a/mass_mailing_list_dynamic/i18n/tr_TR.po
+++ b/mass_mailing_list_dynamic/i18n/tr_TR.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Oluşturulma tarihi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "Kimlik"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "En son güncelleme tarihi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "En son güncelleyen "
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Ortak"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Ortak"
diff --git a/mass_mailing_list_dynamic/i18n/uk.po b/mass_mailing_list_dynamic/i18n/uk.po
index 3ac0ba6f8..524d30845 100644
--- a/mass_mailing_list_dynamic/i18n/uk.po
+++ b/mass_mailing_list_dynamic/i18n/uk.po
@@ -20,14 +20,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Створив"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Дата створення"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Остання модифікація"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє оновив"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/vi.po b/mass_mailing_list_dynamic/i18n/vi.po
index 4004c1d67..75b08e46a 100644
--- a/mass_mailing_list_dynamic/i18n/vi.po
+++ b/mass_mailing_list_dynamic/i18n/vi.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -38,7 +38,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -51,83 +51,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Được tạo bởi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Được tạo vào"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối vào"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -149,33 +159,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "Đối tác"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "Đối tác"
diff --git a/mass_mailing_list_dynamic/i18n/vi_VN.po b/mass_mailing_list_dynamic/i18n/vi_VN.po
index 3fac826cb..46e288ba7 100644
--- a/mass_mailing_list_dynamic/i18n/vi_VN.po
+++ b/mass_mailing_list_dynamic/i18n/vi_VN.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "Tạo bởi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "Tạo vào"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật lần cuối bởi"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,23 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
diff --git a/mass_mailing_list_dynamic/i18n/zh_CN.po b/mass_mailing_list_dynamic/i18n/zh_CN.po
index 12f62e2e0..7fd07f9e1 100644
--- a/mass_mailing_list_dynamic/i18n/zh_CN.po
+++ b/mass_mailing_list_dynamic/i18n/zh_CN.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "创建者"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "创建时间"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "ID"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "业务伙伴"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "业务伙伴"
diff --git a/mass_mailing_list_dynamic/i18n/zh_TW.po b/mass_mailing_list_dynamic/i18n/zh_TW.po
index a1f8585f5..2e1b0297e 100644
--- a/mass_mailing_list_dynamic/i18n/zh_TW.po
+++ b/mass_mailing_list_dynamic/i18n/zh_TW.po
@@ -20,14 +20,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> If you want to remove contacts from a "
 "dynamic list, just <b>set them as <i>Opt Out</i></b>."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid ""
 "<i class=\"fa fa-info-circle\"/> You cannot make manual editions of contacts "
 "in fully synchronized lists."
@@ -39,7 +39,7 @@ msgid "Add and remove records as needed"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Cancel"
 msgstr ""
 
@@ -52,83 +52,93 @@ msgid ""
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
 msgid ""
 "Choose the syncronization method for this list if you want to make it dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_uid
+#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_uid
 msgid "Created by"
 msgstr "建立者"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_create_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__create_date
 msgid "Created on"
 msgstr "建立於"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_display_name
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid "Dynamic"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Dynamic list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Filter partners to sync in this list"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__filter_id
 msgid "Filter to load"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
 msgid "Helper field to make the user aware of unsynced changes"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_id
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__id
 msgid "ID"
 msgstr "編號"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_is_synced
-msgid "Is synced"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__is_synced
+msgid "Is Synced"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter___last_update
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter____last_update
 msgid "Last Modified on"
 msgstr "最後修改:"
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_uid
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_uid
 msgid "Last Updated by"
 msgstr "最後更新："
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter_write_date
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_load_filter__write_date
 msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: mass_mailing_list_dynamic
 #: model:ir.actions.act_window,name:mass_mailing_list_dynamic.action_mail_mass_mailing_load_filter
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_load_filter_form
 msgid "Load filter"
 msgstr ""
 
+#. module: mass_mailing_list_dynamic
+#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
+msgid "Mail Mass Mailing Load Filter"
+msgstr ""
+
 #. module: mass_mailing_list_dynamic
 #: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_list
 msgid "Mailing List"
@@ -150,33 +160,26 @@ msgid "Only add new records"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_res_partner
-msgid "Partner"
-msgstr "夥伴"
-
-#. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list_dynamic
+#: model:ir.model.fields,help:mass_mailing_list_dynamic.field_mail_mass_mailing_list__dynamic
 msgid ""
 "Set this list as dynamic, to make it autosynchronized with partners from a "
 "given criteria."
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_method
-msgid "Sync method"
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_method
+msgid "Sync Method"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
+#: model_terms:ir.ui.view,arch_db:mass_mailing_list_dynamic.view_mail_mass_mailing_list_form
 msgid "Sync now"
 msgstr ""
 
 #. module: mass_mailing_list_dynamic
-#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list_sync_domain
+#: model:ir.model.fields,field_description:mass_mailing_list_dynamic.field_mail_mass_mailing_list__sync_domain
 msgid "Synchronization critera"
 msgstr ""
 
-#. module: mass_mailing_list_dynamic
-#: model:ir.model,name:mass_mailing_list_dynamic.model_mail_mass_mailing_load_filter
-msgid "mail.mass_mailing.load.filter"
-msgstr ""
+#~ msgid "Partner"
+#~ msgstr "夥伴"
diff --git a/mass_mailing_list_dynamic/models/mail_mass_mailing.py b/mass_mailing_list_dynamic/models/mail_mass_mailing.py
index 7538360fa..e1ef350a8 100644
--- a/mass_mailing_list_dynamic/models/mail_mass_mailing.py
+++ b/mass_mailing_list_dynamic/models/mail_mass_mailing.py
@@ -10,4 +10,4 @@ class MassMailing(models.Model):
     def send_mail(self):
         """Sync dynamic lists before sending mailings to them."""
         self.contact_list_ids.action_sync()
-        return super(MassMailing, self).send_mail()
+        return super().send_mail()
diff --git a/mass_mailing_list_dynamic/models/mail_mass_mailing_contact.py b/mass_mailing_list_dynamic/models/mail_mass_mailing_contact.py
index 1d0b922b3..7ad51c01c 100644
--- a/mass_mailing_list_dynamic/models/mail_mass_mailing_contact.py
+++ b/mass_mailing_list_dynamic/models/mail_mass_mailing_contact.py
@@ -13,11 +13,9 @@ class MassMailingContact(models.Model):
     def _check_no_manual_edits_on_fully_synced_lists(self):
         if self.env.context.get("syncing"):
             return
-        for one in self:
-            if any((
-                list_id.dynamic and list_id.sync_method == "full"
-            ) for list_id in one.mapped('list_ids')):
-                raise ValidationError(
-                    _("""Cannot edit manually contacts in a fully synchronized list.
-                        Change its sync method or execute
-                        a manual sync instead."""))
+        if any(self.mapped('list_ids').filtered(
+                lambda x: x.dynamic and x.sync_method == "full")):
+            raise ValidationError(
+                _("Cannot edit manually contacts in a fully "
+                    "synchronized list. Change its sync method or execute "
+                    "a manual sync instead."))
diff --git a/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py b/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py
index 4af9b4a92..cb0eff1a9 100644
--- a/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py
+++ b/mass_mailing_list_dynamic/models/mail_mass_mailing_list.py
@@ -40,25 +40,30 @@ class MassMailingList(models.Model):
         )
         Partner = self.env["res.partner"]
         # Skip non-dynamic lists
-        dynamic = self.filtered("dynamic")
+        dynamic = self.filtered("dynamic").with_context(syncing=True)
         for one in dynamic:
-            sync_domain = safe_eval(one.sync_domain) + [("email", "!=", False)]
+            sync_domain = [("email", "!=", False)] + safe_eval(one.sync_domain)
             desired_partners = Partner.search(sync_domain)
-            # Remove undesired contacts when synchronization is full
+            # Detach or remove undesired contacts when synchronization is full
             if one.sync_method == "full":
-                Contact.search([
-                    ("list_ids", "in", one.id),
-                    ("partner_id", "not in", desired_partners.ids),
-                ]).unlink()
-            current_contacts = Contact.search([("list_ids", "in", one.id)])
-            current_partners = current_contacts.mapped("partner_id")
+                contact_to_detach = one.contact_ids.filtered(
+                    lambda r: r.partner_id not in desired_partners)
+                one.contact_ids -= contact_to_detach
+                contact_to_detach.filtered(lambda r: not r.list_ids).unlink()
             # Add new contacts
+            current_partners = one.contact_ids.mapped('partner_id')
+            contact_to_list = self.env["mail.mass_mailing.contact"]
             vals_list = []
             for partner in desired_partners - current_partners:
-                vals_list.append({
-                    "list_ids": [(4, one.id)],
-                    "partner_id": partner.id,
-                })
+                contacts_in_partner = partner.mass_mailing_contact_ids
+                if contacts_in_partner:
+                    contact_to_list |= contacts_in_partner[0]
+                else:
+                    vals_list.append({
+                        "list_ids": [(4, one.id)],
+                        "partner_id": partner.id,
+                    })
+            one.contact_ids |= contact_to_list
             Contact.create(vals_list)
             one.is_synced = True
         # Invalidate cached contact count
diff --git a/mass_mailing_list_dynamic/readme/DESCRIPTION.rst b/mass_mailing_list_dynamic/readme/DESCRIPTION.rst
index 12e1d697b..302b147a8 100644
--- a/mass_mailing_list_dynamic/readme/DESCRIPTION.rst
+++ b/mass_mailing_list_dynamic/readme/DESCRIPTION.rst
@@ -1,6 +1,5 @@
 Without this addon you have to choose between providing a dynamic domain and
-letting your mass mailings reach all partners that match it, or being able to
-unsubscribe to certain mailing lists while still being subscribed to others.
+letting your mass mailings reach all partners that match it.
 
 This addon allows you to create dynamic mailing lists, so you can now benefit
 from both things.
diff --git a/mass_mailing_list_dynamic/readme/USAGE.rst b/mass_mailing_list_dynamic/readme/USAGE.rst
index fd6130c0e..43178d2ce 100644
--- a/mass_mailing_list_dynamic/readme/USAGE.rst
+++ b/mass_mailing_list_dynamic/readme/USAGE.rst
@@ -1,6 +1,6 @@
 To use this module, you need to:
 
-#. Go to *Mass Mailing > Mailings > Mass Mailings*, and create one.
+#. Go to *Email Marketing > Mailings*, and create one.
 #. Select as recipients a mailing list.
 #. On "Select mailing lists:", choose one mailing list with dynamic flag
    checked.
diff --git a/mass_mailing_list_dynamic/static/description/index.html b/mass_mailing_list_dynamic/static/description/index.html
index f4e71af29..dca0c6ccd 100644
--- a/mass_mailing_list_dynamic/static/description/index.html
+++ b/mass_mailing_list_dynamic/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>Dynamic Mass Mailing Lists</title>
 <style type="text/css">
 
@@ -369,8 +369,7 @@ ul.auto-toc {
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mass_mailing_list_dynamic"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_list_dynamic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Without this addon you have to choose between providing a dynamic domain and
-letting your mass mailings reach all partners that match it, or being able to
-unsubscribe to certain mailing lists while still being subscribed to others.</p>
+letting your mass mailings reach all partners that match it.</p>
 <p>This addon allows you to create dynamic mailing lists, so you can now benefit
 from both things.</p>
 <p><strong>Table of contents</strong></p>
@@ -419,7 +418,7 @@ be selected.</li>
 <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
-<li>Go to <em>Mass Mailing &gt; Mailings &gt; Mass Mailings</em>, and create one.</li>
+<li>Go to <em>Email Marketing &gt; Mailings</em>, and create one.</li>
 <li>Select as recipients a mailing list.</li>
 <li>On “Select mailing lists:”, choose one mailing list with dynamic flag
 checked.</li>
diff --git a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
index be6cc1112..93344bd1c 100644
--- a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
+++ b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
@@ -56,7 +56,7 @@ class DynamicListCase(common.SavepointCase):
         # Set list as full-synced
         self.list.sync_method = "full"
         Contact.search([
-            ("list_ids", "in", self.list.id),
+            ("list_ids", "in", self.list.ids),
             ("partner_id", "=", self.partners[2].id),
         ]).unlink()
         self.list.action_sync()
@@ -69,7 +69,7 @@ class DynamicListCase(common.SavepointCase):
                 "partner_id": self.partners[0].id,
             })
         contact1 = Contact.search([
-            ("list_ids", "in", self.list.id),
+            ("list_ids", "in", self.list.ids),
         ], limit=1)
         with self.assertRaises(ValidationError):
             contact1.name = "other"