diff --git a/product_multi_barcode/i18n/am.po b/product_multi_barcode/i18n/am.po
index b8e0065b5f6..2d953f055f0 100644
--- a/product_multi_barcode/i18n/am.po
+++ b/product_multi_barcode/i18n/am.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/ar.po b/product_multi_barcode/i18n/ar.po
index 295775899d1..c9758af7e4c 100644
--- a/product_multi_barcode/i18n/ar.po
+++ b/product_multi_barcode/i18n/ar.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "أنشئ في"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "المعرف"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "المسلسل"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/bg.po b/product_multi_barcode/i18n/bg.po
index 855ef5337c2..8867834e963 100644
--- a/product_multi_barcode/i18n/bg.po
+++ b/product_multi_barcode/i18n/bg.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Създадено на"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Име за Показване"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Последователност"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/bs.po b/product_multi_barcode/i18n/bs.po
index ecf165e0b7c..4f4f1b55224 100644
--- a/product_multi_barcode/i18n/bs.po
+++ b/product_multi_barcode/i18n/bs.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Kreirano"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/ca.po b/product_multi_barcode/i18n/ca.po
index 89a327a1c5e..2189190a38e 100644
--- a/product_multi_barcode/i18n/ca.po
+++ b/product_multi_barcode/i18n/ca.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creat el"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació el"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Producte"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Producte"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Producte"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Seqüència"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Producte"
diff --git a/product_multi_barcode/i18n/ca_ES.po b/product_multi_barcode/i18n/ca_ES.po
index b53b508cc40..f09c65f6667 100644
--- a/product_multi_barcode/i18n/ca_ES.po
+++ b/product_multi_barcode/i18n/ca_ES.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creat a"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nom visible"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr ""
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació en"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/cs.po b/product_multi_barcode/i18n/cs.po
index 95241e75588..fd91aeaa1f3 100644
--- a/product_multi_barcode/i18n/cs.po
+++ b/product_multi_barcode/i18n/cs.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Vytvořeno"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Naposled upraveno"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Číselná řada"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/da.po b/product_multi_barcode/i18n/da.po
index ffecc5d40ad..beca56141e3 100644
--- a/product_multi_barcode/i18n/da.po
+++ b/product_multi_barcode/i18n/da.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Oprettet den"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "Id"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Rækkefølge"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/da_DK.po b/product_multi_barcode/i18n/da_DK.po
index f189f933fef..0d60522d594 100644
--- a/product_multi_barcode/i18n/da_DK.po
+++ b/product_multi_barcode/i18n/da_DK.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr ""
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Rækkefølge"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/de.po b/product_multi_barcode/i18n/de.po
index 41c1e9e3234..62e7475ae38 100644
--- a/product_multi_barcode/i18n/de.po
+++ b/product_multi_barcode/i18n/de.po
@@ -28,10 +28,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -47,15 +44,11 @@ msgstr "Erstellt am"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -72,8 +65,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
@@ -93,33 +84,44 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produkt"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produkt"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produkt"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Reihenfolge"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produkt"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "Der EAN13 Strichcode \"%s\" existiert bereits für das Produkt \"%s\""
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr ""
+#~ "Der EAN13 Strichcode \"%s\" existiert bereits für das Produkt \"%s\""
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/el_GR.po b/product_multi_barcode/i18n/el_GR.po
index a50901b18b2..29b21d278f8 100644
--- a/product_multi_barcode/i18n/el_GR.po
+++ b/product_multi_barcode/i18n/el_GR.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Δημιουργήθηκε στις"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "Κωδικός"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Προϊόν"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Προϊόν"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Προϊόν"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Προϊόν"
diff --git a/product_multi_barcode/i18n/en_GB.po b/product_multi_barcode/i18n/en_GB.po
index 572b7a8aeba..ca650ace3ef 100644
--- a/product_multi_barcode/i18n/en_GB.po
+++ b/product_multi_barcode/i18n/en_GB.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Created on"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Sequence"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es.po b/product_multi_barcode/i18n/es.po
index 4b3126c6e2a..d69ed596d08 100644
--- a/product_multi_barcode/i18n/es.po
+++ b/product_multi_barcode/i18n/es.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -91,33 +82,43 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Producto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Producto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Producto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Producto"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "El código EAN13 \"%s\" ya existe para el producto \"%s\""
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "El código EAN13 \"%s\" ya existe para el producto \"%s\""
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/es_AR.po b/product_multi_barcode/i18n/es_AR.po
index d7cc58025dc..eefdfef744c 100644
--- a/product_multi_barcode/i18n/es_AR.po
+++ b/product_multi_barcode/i18n/es_AR.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_CO.po b/product_multi_barcode/i18n/es_CO.po
index de4fcd942fb..1b6a2cb154c 100644
--- a/product_multi_barcode/i18n/es_CO.po
+++ b/product_multi_barcode/i18n/es_CO.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_CR.po b/product_multi_barcode/i18n/es_CR.po
index 2906826e076..745a2edc59c 100644
--- a/product_multi_barcode/i18n/es_CR.po
+++ b/product_multi_barcode/i18n/es_CR.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_EC.po b/product_multi_barcode/i18n/es_EC.po
index 4d6ed49a639..f7766c3364a 100644
--- a/product_multi_barcode/i18n/es_EC.po
+++ b/product_multi_barcode/i18n/es_EC.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID (identificación)"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_ES.po b/product_multi_barcode/i18n/es_ES.po
index 99417e949a8..763dd352604 100644
--- a/product_multi_barcode/i18n/es_ES.po
+++ b/product_multi_barcode/i18n/es_ES.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Producto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Producto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Producto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Producto"
diff --git a/product_multi_barcode/i18n/es_MX.po b/product_multi_barcode/i18n/es_MX.po
index 6d857c3cb14..dea62ac3ece 100644
--- a/product_multi_barcode/i18n/es_MX.po
+++ b/product_multi_barcode/i18n/es_MX.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificacion realizada"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_PE.po b/product_multi_barcode/i18n/es_PE.po
index 04710681370..374ff080c42 100644
--- a/product_multi_barcode/i18n/es_PE.po
+++ b/product_multi_barcode/i18n/es_PE.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_PY.po b/product_multi_barcode/i18n/es_PY.po
index 9843a58af4e..888b5a759f0 100644
--- a/product_multi_barcode/i18n/es_PY.po
+++ b/product_multi_barcode/i18n/es_PY.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/es_VE.po b/product_multi_barcode/i18n/es_VE.po
index d9e634d804d..f30ca7d7f2d 100644
--- a/product_multi_barcode/i18n/es_VE.po
+++ b/product_multi_barcode/i18n/es_VE.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/eu.po b/product_multi_barcode/i18n/eu.po
index 10d4d99d5da..36e2df62692 100644
--- a/product_multi_barcode/i18n/eu.po
+++ b/product_multi_barcode/i18n/eu.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Created on"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,33 +81,39 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produktua"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produktua"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produktua"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sekuentzia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produktua"
+
 #~ msgid "True"
 #~ msgstr "True"
diff --git a/product_multi_barcode/i18n/fa.po b/product_multi_barcode/i18n/fa.po
index f74ee8efa14..7f96970118c 100644
--- a/product_multi_barcode/i18n/fa.po
+++ b/product_multi_barcode/i18n/fa.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "ایجاد شده در"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "شناسه"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "تاریخ آخرین به‌روزرسانی"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "دنباله"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/fi.po b/product_multi_barcode/i18n/fi.po
index 11bf020160b..2cb31fc42d9 100644
--- a/product_multi_barcode/i18n/fi.po
+++ b/product_multi_barcode/i18n/fi.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Luotu"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Tuote"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Tuote"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Tuote"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sekvenssi"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Tuote"
diff --git a/product_multi_barcode/i18n/fr.po b/product_multi_barcode/i18n/fr.po
index 1843956c7f1..f919a253fe2 100644
--- a/product_multi_barcode/i18n/fr.po
+++ b/product_multi_barcode/i18n/fr.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Date"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nom à afficher"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
@@ -90,33 +81,39 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Article"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Article"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Article"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sequence"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Article"
+
 #~ msgid "True"
 #~ msgstr "True"
diff --git a/product_multi_barcode/i18n/fr_CA.po b/product_multi_barcode/i18n/fr_CA.po
index 4e3ca5593e6..117dbe1e985 100644
--- a/product_multi_barcode/i18n/fr_CA.po
+++ b/product_multi_barcode/i18n/fr_CA.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Créé le"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "Identifiant"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/fr_CH.po b/product_multi_barcode/i18n/fr_CH.po
index 8e9077df79b..74d317cc595 100644
--- a/product_multi_barcode/i18n/fr_CH.po
+++ b/product_multi_barcode/i18n/fr_CH.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Créé le"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produit"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produit"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produit"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produit"
diff --git a/product_multi_barcode/i18n/fr_FR.po b/product_multi_barcode/i18n/fr_FR.po
index 481aeb3e770..46d91cccab3 100644
--- a/product_multi_barcode/i18n/fr_FR.po
+++ b/product_multi_barcode/i18n/fr_FR.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr ""
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produit"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produit"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produit"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produit"
diff --git a/product_multi_barcode/i18n/gl.po b/product_multi_barcode/i18n/gl.po
index 649db372d9b..3262f5e7016 100644
--- a/product_multi_barcode/i18n/gl.po
+++ b/product_multi_barcode/i18n/gl.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Creado en"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produto"
diff --git a/product_multi_barcode/i18n/gl_ES.po b/product_multi_barcode/i18n/gl_ES.po
index 47c7744720e..744278aef8f 100644
--- a/product_multi_barcode/i18n/gl_ES.po
+++ b/product_multi_barcode/i18n/gl_ES.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/he.po b/product_multi_barcode/i18n/he.po
index 1491a731583..374ea443b1e 100644
--- a/product_multi_barcode/i18n/he.po
+++ b/product_multi_barcode/i18n/he.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "נוצר ב-"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "מזהה"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "תאריך שינוי אחרון"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "רצף"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/hr.po b/product_multi_barcode/i18n/hr.po
index e55515fc272..eff5f65b04f 100644
--- a/product_multi_barcode/i18n/hr.po
+++ b/product_multi_barcode/i18n/hr.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Kreirano"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Naziv "
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
@@ -91,30 +82,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Proizvod"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Proizvod"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Proizvod"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Proizvod"
diff --git a/product_multi_barcode/i18n/hr_HR.po b/product_multi_barcode/i18n/hr_HR.po
index 7d723e0d744..77d064a553c 100644
--- a/product_multi_barcode/i18n/hr_HR.po
+++ b/product_multi_barcode/i18n/hr_HR.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Kreirano"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
@@ -91,30 +82,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Proizvod"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Proizvod"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Proizvod"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Proizvod"
diff --git a/product_multi_barcode/i18n/it.po b/product_multi_barcode/i18n/it.po
index 51ffbbcad7e..b096817acd7 100644
--- a/product_multi_barcode/i18n/it.po
+++ b/product_multi_barcode/i18n/it.po
@@ -27,10 +27,7 @@ msgstr "Codice a barre"
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr "Codici a barre"
 
@@ -46,15 +43,11 @@ msgstr "Creato il"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr "Numero Internazionale utilizzato per l'identificazione dell'articolo."
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
@@ -91,31 +82,41 @@ msgid "Main barcode"
 msgstr "Codice a barre principale"
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Prodotto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
-msgstr "Modello Prodotto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 msgid "Product Tmpl"
 msgstr "Modello Prodotto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sequenza"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "Il codice a barre \"%s\" esiste già per il prodotto \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#~ msgid "Product Template"
+#~ msgstr "Modello Prodotto"
+
+#, python-format
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "Il codice a barre \"%s\" esiste già per il prodotto \"%s\""
 
 #, fuzzy
 #~ msgid "EAN13"
diff --git a/product_multi_barcode/i18n/ja.po b/product_multi_barcode/i18n/ja.po
index e1d92b73b68..483377d5dbd 100644
--- a/product_multi_barcode/i18n/ja.po
+++ b/product_multi_barcode/i18n/ja.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "作成日"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "表示名"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "付番"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/ko.po b/product_multi_barcode/i18n/ko.po
index 6cdd3e50a88..1260a7050b8 100644
--- a/product_multi_barcode/i18n/ko.po
+++ b/product_multi_barcode/i18n/ko.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "작성일"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "순서"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/lt.po b/product_multi_barcode/i18n/lt.po
index 7e7e69da93e..9fb5bd30c17 100644
--- a/product_multi_barcode/i18n/lt.po
+++ b/product_multi_barcode/i18n/lt.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Sukurta"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Seka"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/lt_LT.po b/product_multi_barcode/i18n/lt_LT.po
index d431bd886f5..380f993bedf 100644
--- a/product_multi_barcode/i18n/lt_LT.po
+++ b/product_multi_barcode/i18n/lt_LT.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Sukurta"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/lv.po b/product_multi_barcode/i18n/lv.po
index c34fe6c0f72..165da96986b 100644
--- a/product_multi_barcode/i18n/lv.po
+++ b/product_multi_barcode/i18n/lv.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Izveidots"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Sērija"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/mk.po b/product_multi_barcode/i18n/mk.po
index 144e532d6ad..83e5d54cc1c 100644
--- a/product_multi_barcode/i18n/mk.po
+++ b/product_multi_barcode/i18n/mk.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Креирано на"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Секвенца"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/mn.po b/product_multi_barcode/i18n/mn.po
index e42d756543d..23fee8fec55 100644
--- a/product_multi_barcode/i18n/mn.po
+++ b/product_multi_barcode/i18n/mn.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Үүсгэсэн"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Дараалал"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/nb.po b/product_multi_barcode/i18n/nb.po
index 21a6db01176..fcf7c7b4018 100644
--- a/product_multi_barcode/i18n/nb.po
+++ b/product_multi_barcode/i18n/nb.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Opprettet den"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Sist oppdatert "
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Sekvens"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/nb_NO.po b/product_multi_barcode/i18n/nb_NO.po
index f166ffc918e..70c9cd8f489 100644
--- a/product_multi_barcode/i18n/nb_NO.po
+++ b/product_multi_barcode/i18n/nb_NO.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Laget den"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/nl.po b/product_multi_barcode/i18n/nl.po
index 3ac634fce65..43d550315d6 100644
--- a/product_multi_barcode/i18n/nl.po
+++ b/product_multi_barcode/i18n/nl.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Aangemaakt op"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
@@ -90,33 +81,39 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Product"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Product"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Product"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Reeks"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Product"
+
 #~ msgid "True"
 #~ msgstr "Waar"
diff --git a/product_multi_barcode/i18n/nl_BE.po b/product_multi_barcode/i18n/nl_BE.po
index a32724eb926..52fd65c7bfc 100644
--- a/product_multi_barcode/i18n/nl_BE.po
+++ b/product_multi_barcode/i18n/nl_BE.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Gemaakt op"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Laatst Aangepast op"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Volgorde"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/nl_NL.po b/product_multi_barcode/i18n/nl_NL.po
index 68d88f2add5..06e24b17719 100644
--- a/product_multi_barcode/i18n/nl_NL.po
+++ b/product_multi_barcode/i18n/nl_NL.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Aangemaakt op"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Weergavenaam"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Product"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Product"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Product"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Product"
diff --git a/product_multi_barcode/i18n/pl.po b/product_multi_barcode/i18n/pl.po
index c25f407a58a..744ea9c985a 100644
--- a/product_multi_barcode/i18n/pl.po
+++ b/product_multi_barcode/i18n/pl.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Utworzono"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Ostatnio modyfikowano"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/pt.po b/product_multi_barcode/i18n/pt.po
index d153d8310f6..5794bdbd7ec 100644
--- a/product_multi_barcode/i18n/pt.po
+++ b/product_multi_barcode/i18n/pt.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Criado em"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nome"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -71,8 +64,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Modificado a última vez por"
 
@@ -92,33 +83,43 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sequência"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produto"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "O código de barras \"%s\" já existe para o produto \"%s\""
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "O código de barras \"%s\" já existe para o produto \"%s\""
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/pt_BR.po b/product_multi_barcode/i18n/pt_BR.po
index 6fe4a0c857c..68151be1c57 100644
--- a/product_multi_barcode/i18n/pt_BR.po
+++ b/product_multi_barcode/i18n/pt_BR.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Criado em"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "Identificação"
 
@@ -70,8 +63,6 @@ msgstr "Número internacional do artigo usado para identificação do produto."
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última atualização em"
 
@@ -91,33 +82,43 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produto"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produto"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produto"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sequência"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produto"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "O código de barras EAN13 \"%s\" já existe para o produto \"%s\""
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "O código de barras EAN13 \"%s\" já existe para o produto \"%s\""
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/pt_PT.po b/product_multi_barcode/i18n/pt_PT.po
index e30c310f919..7eb9b5001c1 100644
--- a/product_multi_barcode/i18n/pt_PT.po
+++ b/product_multi_barcode/i18n/pt_PT.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Criado em"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/ro.po b/product_multi_barcode/i18n/ro.po
index 389d5c6631c..9655bffbef4 100644
--- a/product_multi_barcode/i18n/ro.po
+++ b/product_multi_barcode/i18n/ro.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Creat la"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
@@ -91,30 +82,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produs"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produs"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produs"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Secventa"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produs"
diff --git a/product_multi_barcode/i18n/ru.po b/product_multi_barcode/i18n/ru.po
index 999f858a5eb..f0760d2a492 100644
--- a/product_multi_barcode/i18n/ru.po
+++ b/product_multi_barcode/i18n/ru.po
@@ -28,10 +28,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -47,15 +44,11 @@ msgstr "Создан"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -71,8 +64,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -92,30 +83,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Товар/Услуга"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Товар/Услуга"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Товар/Услуга"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Последовательность"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Товар/Услуга"
diff --git a/product_multi_barcode/i18n/sk.po b/product_multi_barcode/i18n/sk.po
index bf5acaf7566..cf0cd25a854 100644
--- a/product_multi_barcode/i18n/sk.po
+++ b/product_multi_barcode/i18n/sk.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Vytvorené"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Produkt"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Produkt"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Produkt"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Postupnosť"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Produkt"
diff --git a/product_multi_barcode/i18n/sl.po b/product_multi_barcode/i18n/sl.po
index 6a66cae10af..197f03b2d2b 100644
--- a/product_multi_barcode/i18n/sl.po
+++ b/product_multi_barcode/i18n/sl.po
@@ -29,10 +29,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -48,15 +45,11 @@ msgstr "Ustvarjeno"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -72,8 +65,6 @@ msgstr "Mednarodna številka artikla uporabljena za identifikacijo proizvoda."
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
@@ -93,33 +84,43 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Proizvod"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Proizvod"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Proizvod"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Zaporedje"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Proizvod"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "EAN13 črtna koda \"%s\" za proizvod \"%s\" že obstaja"
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "EAN13 črtna koda \"%s\" za proizvod \"%s\" že obstaja"
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/sr@latin.po b/product_multi_barcode/i18n/sr@latin.po
index 1db54f8fff0..0a69892790b 100644
--- a/product_multi_barcode/i18n/sr@latin.po
+++ b/product_multi_barcode/i18n/sr@latin.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Kreiran"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/sv.po b/product_multi_barcode/i18n/sv.po
index f933a9ae26e..fede88a3959 100644
--- a/product_multi_barcode/i18n/sv.po
+++ b/product_multi_barcode/i18n/sv.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Skapad den"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Senast redigerad"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Nummerserie"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/th.po b/product_multi_barcode/i18n/th.po
index d86fdf97fe8..f5561a21141 100644
--- a/product_multi_barcode/i18n/th.po
+++ b/product_multi_barcode/i18n/th.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "สร้างเมื่อ"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "รหัส"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "กำหนดเลขที่เอกสาร"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/tr.po b/product_multi_barcode/i18n/tr.po
index 7a5b1496639..07919bd2581 100644
--- a/product_multi_barcode/i18n/tr.po
+++ b/product_multi_barcode/i18n/tr.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Oluşturuldu"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Son değişiklik"
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Ürün"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Ürün"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Ürün"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sıra"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Ürün"
diff --git a/product_multi_barcode/i18n/tr_TR.po b/product_multi_barcode/i18n/tr_TR.po
index 1aa31323cfe..440b0cc8c22 100644
--- a/product_multi_barcode/i18n/tr_TR.po
+++ b/product_multi_barcode/i18n/tr_TR.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Oluşturulma tarihi"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "Kimlik"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "En son güncelleme tarihi"
 
@@ -90,33 +81,39 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Ürün"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Ürün"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Ürün"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "Sıra"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Ürün"
+
 #~ msgid "True"
 #~ msgstr "Doğru"
diff --git a/product_multi_barcode/i18n/uk.po b/product_multi_barcode/i18n/uk.po
index 998014feb66..9dd9f054d56 100644
--- a/product_multi_barcode/i18n/uk.po
+++ b/product_multi_barcode/i18n/uk.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "Дата створення"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Остання модифікація"
 
@@ -91,19 +82,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -112,7 +103,10 @@ msgid "Sequence"
 msgstr "Послідовність"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/vi.po b/product_multi_barcode/i18n/vi.po
index 69451363113..33ad515f5a5 100644
--- a/product_multi_barcode/i18n/vi.po
+++ b/product_multi_barcode/i18n/vi.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Được tạo vào"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối vào"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "Trình tự"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
diff --git a/product_multi_barcode/i18n/vi_VN.po b/product_multi_barcode/i18n/vi_VN.po
index 301e822285d..b7f8c308733 100644
--- a/product_multi_barcode/i18n/vi_VN.po
+++ b/product_multi_barcode/i18n/vi_VN.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "Tạo vào"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -90,30 +81,36 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "Sản phẩm"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "Sản phẩm"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "Sản phẩm"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "Sản phẩm"
diff --git a/product_multi_barcode/i18n/zh_CN.po b/product_multi_barcode/i18n/zh_CN.po
index aee73a6e523..4db95ba57cc 100644
--- a/product_multi_barcode/i18n/zh_CN.po
+++ b/product_multi_barcode/i18n/zh_CN.po
@@ -27,10 +27,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -46,15 +43,11 @@ msgstr "创建时间"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -70,8 +63,6 @@ msgstr "用于商品识别的国际商品编号。"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
@@ -91,33 +82,43 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr "产品"
 
-#. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-#, fuzzy
-msgid "Product Template"
-msgstr "产品"
-
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
 #, fuzzy
 msgid "Product Tmpl"
 msgstr "产品"
 
+#. module: product_multi_barcode
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__sequence
 msgid "Sequence"
 msgstr "序号"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
+#, python-format
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Product Template"
+#~ msgstr "产品"
+
 #, fuzzy, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
-msgstr "EAN13 条码\"%s\" 产品 \"%s\"已存在"
+#~ msgid "The Barcode \"%s\" already exists for product \"%s\""
+#~ msgstr "EAN13 条码\"%s\" 产品 \"%s\"已存在"
 
 #~ msgid "EAN13"
 #~ msgstr "EAN13"
diff --git a/product_multi_barcode/i18n/zh_TW.po b/product_multi_barcode/i18n/zh_TW.po
index b613cd0db2f..2af7b0db78c 100644
--- a/product_multi_barcode/i18n/zh_TW.po
+++ b/product_multi_barcode/i18n/zh_TW.po
@@ -26,10 +26,7 @@ msgstr ""
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__barcode_ids
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__barcode_ids
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_normal_form_view_multi_barcodes
 #: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_search_form_view_multi_barcodes
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_template_form_view_multi_barcode
-#: model_terms:ir.ui.view,arch_db:product_multi_barcode.product_variant_easy_edit_view_multi_barcodes
 msgid "Barcodes"
 msgstr ""
 
@@ -45,15 +42,11 @@ msgstr "建立於"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__display_name
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product__id
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template__id
 msgid "ID"
 msgstr "編號"
 
@@ -69,8 +62,6 @@ msgstr ""
 
 #. module: product_multi_barcode
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_product____last_update
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "最後修改:"
 
@@ -90,19 +81,19 @@ msgid "Main barcode"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_product
+#: model:ir.model,name:product_multi_barcode.model_product_template
 #: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_id
 msgid "Product"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model,name:product_multi_barcode.model_product_template
-msgid "Product Template"
+#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
+msgid "Product Tmpl"
 msgstr ""
 
 #. module: product_multi_barcode
-#: model:ir.model.fields,field_description:product_multi_barcode.field_product_barcode__product_tmpl_id
-msgid "Product Tmpl"
+#: model:ir.model,name:product_multi_barcode.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: product_multi_barcode
@@ -111,7 +102,10 @@ msgid "Sequence"
 msgstr "序列"
 
 #. module: product_multi_barcode
+#. odoo-python
 #: code:addons/product_multi_barcode/models/product_barcode.py:0
 #, python-format
-msgid "The Barcode \"%s\" already exists for product \"%s\""
+msgid ""
+"The Barcode \"%(barcode_name)s\" already exists for product "
+"\"%(product_name)s\" in the company %(company_name)s"
 msgstr ""