diff --git a/intrastat_product/i18n/es.po b/intrastat_product/i18n/es.po
index 0786c74..d49978b 100644
--- a/intrastat_product/i18n/es.po
+++ b/intrastat_product/i18n/es.po
@@ -132,11 +132,6 @@ msgstr ""
 "Código de 2 letras del país de origen/destino.\n"
 "Especifique \"XI\" para Irlanda del Norte."
 
-#. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid "<span>Intrastat Product Declaration </span>"
-msgstr "<span>Declaración de producto IntrastaT </span>"
-
 #. module: intrastat_product
 #: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_product_declaration_date_uniq
 msgid ""
@@ -152,6 +147,7 @@ msgstr ""
 #. odoo-python
 #: code:addons/intrastat_product/report/intrastat_product_report_xls.py:0
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__amount_accessory_cost_company_currency
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 #, python-format
 msgid "Accessory Costs"
 msgstr "Costes accesorios"
@@ -242,6 +238,11 @@ msgstr ""
 "Ya existe una exportación XML para %s. Para volver a generarla, primero debe "
 "eliminarla."
 
+#. module: intrastat_product
+#: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_unit_name_uniq
+msgid "An intrastat supplementary unit with the same name already exists!"
+msgstr ""
+
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -368,6 +369,12 @@ msgstr "Ajustes de configuración"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#. module: intrastat_product
+#: model:ir.model.fields.selection,name:intrastat_product.selection__intrastat_product_declaration__state__confirmed
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
+msgid "Confirmed"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_res_partner
 msgid "Contact"
@@ -378,15 +385,15 @@ msgstr "Contacto"
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
 #, python-format
 msgid ""
-"Conversion from unit of measure <em>%(source_uom)s</em> to <em>"
-"%(target_uom)s</em>, which is configured on the intrastat supplementary unit "
-"<i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
+"Conversion from unit of measure <em>%(source_uom)s</em> to "
+"<em>%(target_uom)s</em>, which is configured on the intrastat supplementary "
+"unit <i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
 "implemented yet"
 msgstr ""
-"Conversión de la unidad de medida <em>%(source_uom)s</em> a <em>"
-"%(target_uom)s</em>, que se configura en la unidad suplementaria Intrastat "
-"<i>%(intrastat_unit)s</i > de H.S. código <i>%(hs_code)s</i>, aún no está "
-"implementado"
+"Conversión de la unidad de medida <em>%(source_uom)s</em> a "
+"<em>%(target_uom)s</em>, que se configura en la unidad suplementaria "
+"Intrastat <i>%(intrastat_unit)s</i > de H.S. código <i>%(hs_code)s</i>, aún "
+"no está implementado"
 
 #. module: intrastat_product
 #. odoo-python
@@ -398,8 +405,8 @@ msgid ""
 "whose unit of measure is <i>%(product_uom)s</i>"
 msgstr ""
 "La conversión de la unidad de medida <em>%(source_uom)s</em> a <em>Kg</em> "
-"no se puede realizar automáticamente. Es necesario para el producto <i>"
-"%(product)s</i> cuya unidad de medida es <i>%(product_uom)s</i>"
+"no se puede realizar automáticamente. Es necesario para el producto "
+"<i>%(product)s</i> cuya unidad de medida es <i>%(product_uom)s</i>"
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__src_dest_country_id
@@ -643,11 +650,18 @@ msgstr "Generar Archivo XML de Declaración"
 
 #. module: intrastat_product
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid ""
-"Generate declaration lines, generate XML export and set declaration to 'Done'"
+msgid "Generate XML File"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate XML file and set declaration to 'Done'"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate declaration lines"
 msgstr ""
-"Generar líneas de declaración, generar la exportación XML y establecer la "
-"declaración en \"Hecho\""
 
 #. module: intrastat_product
 #. odoo-python
@@ -731,6 +745,7 @@ msgstr "Si está marcado, hay mensajes que tienen error de entrega."
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_res_company__intrastat_accessory_costs
 #: model:ir.model.fields,field_description:intrastat_product.field_res_config_settings__intrastat_accessory_costs
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 msgid "Include Accessory Costs in Fiscal Value of Product"
 msgstr "Incluir Costes Accesorio en Valor Fiscal del Producto"
 
@@ -801,6 +816,13 @@ msgstr "Líneas de cálculo de Intrastat"
 msgid "Intrastat Product Declaration"
 msgstr "Declaración de producto Intrastat"
 
+#. module: intrastat_product
+#. odoo-python
+#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
+#, python-format
+msgid "Intrastat Product Declaration %(declaration_type)s %(year_month)s"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_intrastat_product_declaration_line
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__declaration_line_ids
@@ -957,24 +979,10 @@ msgid "Journal Item"
 msgstr "Apunte contable"
 
 #. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_form
 msgid "Kg"
 msgstr "Kg"
 
-#. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit____last_update
-msgid "Last Modified on"
-msgstr "Última modificación el"
-
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line__write_uid
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__write_uid
@@ -1002,9 +1010,14 @@ msgid "Last Updated on"
 msgstr "Última Actualización en"
 
 #. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Adjunto principal"
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_tree
+msgid "Line"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__line_number
+msgid "Line Number"
+msgstr ""
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__message_has_error
@@ -1435,18 +1448,10 @@ msgstr "Estándar"
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__state
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
 msgid "State"
 msgstr "Estado"
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__state
-msgid ""
-"State of the declaration. When the state is set to 'Done', the parameters "
-"become read-only."
-msgstr ""
-"Estado de la declaración. Cuando el estado está como 'Realizado', los "
-"parámetros se convierten a solo lectura."
-
 #. module: intrastat_product
 #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__activity_state
 msgid ""
@@ -1496,8 +1501,8 @@ msgid ""
 "Supply for sale on approval or after trial (including call-off and "
 "consignment stock)"
 msgstr ""
-"Suministro para la venta tras la aprobación o después de la prueba ("
-"incluidas las existencias a la demanda y en consignación)"
+"Suministro para la venta tras la aprobación o después de la prueba "
+"(incluidas las existencias a la demanda y en consignación)"
 
 #. module: intrastat_product
 #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_computation_line__company_country_code
@@ -1768,8 +1773,8 @@ msgid ""
 "VAT number is <em>%(vat)s</em>. If this partner is from Northern Ireland, "
 "his VAT number should be updated to his new VAT number starting with <em>XI</"
 "em> following Brexit. If this partner is from Great Britain, maybe the "
-"fiscal position was wrong on the invoice (the fiscal position was <i>"
-"%(fiscal_position)s</i>)."
+"fiscal position was wrong on the invoice (the fiscal position was "
+"<i>%(fiscal_position)s</i>)."
 msgstr ""
 "El número de IVA es <em>%(vat)s</em>. Si este socio es de Irlanda del Norte, "
 "su número de IVA debe actualizarse a su nuevo número de IVA que comienza con "
@@ -1827,11 +1832,6 @@ msgstr "Año"
 msgid "Year and month of the declaration."
 msgstr "Año y mes de la declaración."
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__note
-msgid "You can add some comments here if you want."
-msgstr "Puede añadir algunos comentarios aquí si lo prefiere."
-
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -1867,11 +1867,42 @@ msgstr "para periodo %s"
 msgid "intrastat-%(year_month)s-%(declaration_type)s%(draft)s"
 msgstr "Intraestado-%(year_month)s-%(declaration_type)s%(draft)s"
 
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
+msgid "kg"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.actions.report,print_report_name:intrastat_product.intrastat_product_xlsx_report
 msgid "object._get_xlsx_report_filename()"
 msgstr "object._get_xlsx_report_filename()"
 
+#~ msgid "<span>Intrastat Product Declaration </span>"
+#~ msgstr "<span>Declaración de producto IntrastaT </span>"
+
+#~ msgid ""
+#~ "Generate declaration lines, generate XML export and set declaration to "
+#~ "'Done'"
+#~ msgstr ""
+#~ "Generar líneas de declaración, generar la exportación XML y establecer la "
+#~ "declaración en \"Hecho\""
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificación el"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Adjunto principal"
+
+#~ msgid ""
+#~ "State of the declaration. When the state is set to 'Done', the parameters "
+#~ "become read-only."
+#~ msgstr ""
+#~ "Estado de la declaración. Cuando el estado está como 'Realizado', los "
+#~ "parámetros se convierten a solo lectura."
+
+#~ msgid "You can add some comments here if you want."
+#~ msgstr "Puede añadir algunos comentarios aquí si lo prefiere."
+
 #~ msgid ""
 #~ "'intrastat-%s-%s%s' % (object.year_month, object.declaration_type, object."
 #~ "state == 'draft' and '-draft' or '')"
diff --git a/intrastat_product/i18n/fr.po b/intrastat_product/i18n/fr.po
index ded62ec..f3ea8e8 100644
--- a/intrastat_product/i18n/fr.po
+++ b/intrastat_product/i18n/fr.po
@@ -120,11 +120,6 @@ msgid ""
 "Specify 'XI' for Northern Ireland."
 msgstr ""
 
-#. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid "<span>Intrastat Product Declaration </span>"
-msgstr "<span>EMEBI</span>"
-
 #. module: intrastat_product
 #: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_product_declaration_date_uniq
 msgid ""
@@ -140,6 +135,7 @@ msgstr ""
 #. odoo-python
 #: code:addons/intrastat_product/report/intrastat_product_report_xls.py:0
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__amount_accessory_cost_company_currency
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 #, python-format
 msgid "Accessory Costs"
 msgstr "Frais accessoires"
@@ -226,6 +222,11 @@ msgstr ""
 "Un export XML existe déjà pour %s. Pour le re-générer, vous devez d'abord le "
 "supprimer."
 
+#. module: intrastat_product
+#: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_unit_name_uniq
+msgid "An intrastat supplementary unit with the same name already exists!"
+msgstr ""
+
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -353,6 +354,12 @@ msgstr "Configuration"
 msgid "Confirm"
 msgstr "Confirmer"
 
+#. module: intrastat_product
+#: model:ir.model.fields.selection,name:intrastat_product.selection__intrastat_product_declaration__state__confirmed
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
+msgid "Confirmed"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_res_partner
 msgid "Contact"
@@ -363,15 +370,15 @@ msgstr "Contact"
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
 #, python-format
 msgid ""
-"Conversion from unit of measure <em>%(source_uom)s</em> to <em>"
-"%(target_uom)s</em>, which is configured on the intrastat supplementary unit "
-"<i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
+"Conversion from unit of measure <em>%(source_uom)s</em> to "
+"<em>%(target_uom)s</em>, which is configured on the intrastat supplementary "
+"unit <i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
 "implemented yet"
 msgstr ""
-"La conversion de l'unité de mesure <em>%(source_uom)s</em> vers <em>"
-"%(target_uom)s</em>, qui est configurée sur l'unité supplémentaire intrastat "
-"<i>%(intrastat_unit)s</i> du code S.H. <i>%(hs_code)s</i> n'est pas encore "
-"implémentée"
+"La conversion de l'unité de mesure <em>%(source_uom)s</em> vers "
+"<em>%(target_uom)s</em>, qui est configurée sur l'unité supplémentaire "
+"intrastat <i>%(intrastat_unit)s</i> du code S.H. <i>%(hs_code)s</i> n'est "
+"pas encore implémentée"
 
 #. module: intrastat_product
 #. odoo-python
@@ -629,11 +636,18 @@ msgstr "Générer le fichier XML de la déclaration"
 
 #. module: intrastat_product
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid ""
-"Generate declaration lines, generate XML export and set declaration to 'Done'"
+msgid "Generate XML File"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate XML file and set declaration to 'Done'"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate declaration lines"
 msgstr ""
-"Générer les lignes de déclaration, générer l'export XML et passer la "
-"déclaration à l'état \"Terminé\""
 
 #. module: intrastat_product
 #. odoo-python
@@ -717,6 +731,7 @@ msgstr "Si activé, des messages ont une erreur d'envoi."
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_res_company__intrastat_accessory_costs
 #: model:ir.model.fields,field_description:intrastat_product.field_res_config_settings__intrastat_accessory_costs
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 msgid "Include Accessory Costs in Fiscal Value of Product"
 msgstr "Inclure les frais accessoires dans la valeur fiscale des produits"
 
@@ -787,6 +802,13 @@ msgstr "Lignes de calcul de la déclaration"
 msgid "Intrastat Product Declaration"
 msgstr "EMEBI"
 
+#. module: intrastat_product
+#. odoo-python
+#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
+#, python-format
+msgid "Intrastat Product Declaration %(declaration_type)s %(year_month)s"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_intrastat_product_declaration_line
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__declaration_line_ids
@@ -943,24 +965,10 @@ msgid "Journal Item"
 msgstr "Écriture comptable"
 
 #. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_form
 msgid "Kg"
 msgstr "Kg"
 
-#. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit____last_update
-msgid "Last Modified on"
-msgstr "Dernière modification le"
-
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line__write_uid
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__write_uid
@@ -988,9 +996,14 @@ msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Pièce jointe principale"
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_tree
+msgid "Line"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__line_number
+msgid "Line Number"
+msgstr ""
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__message_has_error
@@ -1415,18 +1428,10 @@ msgstr "Simplifié"
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__state
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
 msgid "State"
 msgstr "État"
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__state
-msgid ""
-"State of the declaration. When the state is set to 'Done', the parameters "
-"become read-only."
-msgstr ""
-"État de la déclaration. Quand l'état est à 'Terminé', les champs passent en "
-"lecture seule."
-
 #. module: intrastat_product
 #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__activity_state
 msgid ""
@@ -1728,8 +1733,8 @@ msgid ""
 "VAT number is <em>%(vat)s</em>. If this partner is from Northern Ireland, "
 "his VAT number should be updated to his new VAT number starting with <em>XI</"
 "em> following Brexit. If this partner is from Great Britain, maybe the "
-"fiscal position was wrong on the invoice (the fiscal position was <i>"
-"%(fiscal_position)s</i>)."
+"fiscal position was wrong on the invoice (the fiscal position was "
+"<i>%(fiscal_position)s</i>)."
 msgstr ""
 "Le numéro de TVA est <em>%(vat)s</em>. Si ce partenaire est originaire "
 "d'Irlande du Nord, son numéro de TVA doit être mis à jour avec son nouveau "
@@ -1787,11 +1792,6 @@ msgstr "Année"
 msgid "Year and month of the declaration."
 msgstr "Année et mois de la déclaration."
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__note
-msgid "You can add some comments here if you want."
-msgstr "Vous pouvez ajouter des commentaires ici si vous voulez."
-
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -1827,11 +1827,42 @@ msgstr "pour la période %s"
 msgid "intrastat-%(year_month)s-%(declaration_type)s%(draft)s"
 msgstr ""
 
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
+msgid "kg"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.actions.report,print_report_name:intrastat_product.intrastat_product_xlsx_report
 msgid "object._get_xlsx_report_filename()"
 msgstr ""
 
+#~ msgid "<span>Intrastat Product Declaration </span>"
+#~ msgstr "<span>EMEBI</span>"
+
+#~ msgid ""
+#~ "Generate declaration lines, generate XML export and set declaration to "
+#~ "'Done'"
+#~ msgstr ""
+#~ "Générer les lignes de déclaration, générer l'export XML et passer la "
+#~ "déclaration à l'état \"Terminé\""
+
+#~ msgid "Last Modified on"
+#~ msgstr "Dernière modification le"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Pièce jointe principale"
+
+#~ msgid ""
+#~ "State of the declaration. When the state is set to 'Done', the parameters "
+#~ "become read-only."
+#~ msgstr ""
+#~ "État de la déclaration. Quand l'état est à 'Terminé', les champs passent "
+#~ "en lecture seule."
+
+#~ msgid "You can add some comments here if you want."
+#~ msgstr "Vous pouvez ajouter des commentaires ici si vous voulez."
+
 #~ msgid ""
 #~ "'intrastat-%s-%s%s' % (object.year_month, object.declaration_type, object."
 #~ "state == 'draft' and '-draft' or '')"
diff --git a/intrastat_product/i18n/fr_BE.po b/intrastat_product/i18n/fr_BE.po
index 86f81a3..56d2a6a 100644
--- a/intrastat_product/i18n/fr_BE.po
+++ b/intrastat_product/i18n/fr_BE.po
@@ -117,11 +117,6 @@ msgid ""
 "Specify 'XI' for Northern Ireland."
 msgstr ""
 
-#. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid "<span>Intrastat Product Declaration </span>"
-msgstr ""
-
 #. module: intrastat_product
 #: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_product_declaration_date_uniq
 msgid ""
@@ -134,6 +129,7 @@ msgstr ""
 #. odoo-python
 #: code:addons/intrastat_product/report/intrastat_product_report_xls.py:0
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__amount_accessory_cost_company_currency
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 #, python-format
 msgid "Accessory Costs"
 msgstr ""
@@ -215,6 +211,11 @@ msgid ""
 "delete it."
 msgstr ""
 
+#. module: intrastat_product
+#: model:ir.model.constraint,message:intrastat_product.constraint_intrastat_unit_name_uniq
+msgid "An intrastat supplementary unit with the same name already exists!"
+msgstr ""
+
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -341,6 +342,12 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#. module: intrastat_product
+#: model:ir.model.fields.selection,name:intrastat_product.selection__intrastat_product_declaration__state__confirmed
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
+msgid "Confirmed"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_res_partner
 msgid "Contact"
@@ -351,9 +358,9 @@ msgstr ""
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
 #, python-format
 msgid ""
-"Conversion from unit of measure <em>%(source_uom)s</em> to <em>"
-"%(target_uom)s</em>, which is configured on the intrastat supplementary unit "
-"<i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
+"Conversion from unit of measure <em>%(source_uom)s</em> to "
+"<em>%(target_uom)s</em>, which is configured on the intrastat supplementary "
+"unit <i>%(intrastat_unit)s</i> of H.S. code <i>%(hs_code)s</i>, is not "
 "implemented yet"
 msgstr ""
 
@@ -608,8 +615,17 @@ msgstr ""
 
 #. module: intrastat_product
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
-msgid ""
-"Generate declaration lines, generate XML export and set declaration to 'Done'"
+msgid "Generate XML File"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate XML file and set declaration to 'Done'"
+msgstr ""
+
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form
+msgid "Generate declaration lines"
 msgstr ""
 
 #. module: intrastat_product
@@ -694,6 +710,7 @@ msgstr ""
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_res_company__intrastat_accessory_costs
 #: model:ir.model.fields,field_description:intrastat_product.field_res_config_settings__intrastat_accessory_costs
+#: model_terms:ir.ui.view,arch_db:intrastat_product.view_res_config_settings
 msgid "Include Accessory Costs in Fiscal Value of Product"
 msgstr ""
 
@@ -764,6 +781,13 @@ msgstr ""
 msgid "Intrastat Product Declaration"
 msgstr ""
 
+#. module: intrastat_product
+#. odoo-python
+#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
+#, python-format
+msgid "Intrastat Product Declaration %(declaration_type)s %(year_month)s"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.model,name:intrastat_product.model_intrastat_product_declaration_line
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__declaration_line_ids
@@ -920,24 +944,10 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: intrastat_product
-#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
 #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_form
 msgid "Kg"
 msgstr ""
 
-#. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode____last_update
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_account_move_intrastat_line__write_uid
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_computation_line__write_uid
@@ -965,8 +975,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: intrastat_product
-#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__message_main_attachment_id
-msgid "Main Attachment"
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_line_view_tree
+msgid "Line"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__line_number
+msgid "Line Number"
 msgstr ""
 
 #. module: intrastat_product
@@ -1384,16 +1399,10 @@ msgstr ""
 
 #. module: intrastat_product
 #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__state
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_search
 msgid "State"
 msgstr ""
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__state
-msgid ""
-"State of the declaration. When the state is set to 'Done', the parameters "
-"become read-only."
-msgstr ""
-
 #. module: intrastat_product
 #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__activity_state
 msgid ""
@@ -1680,8 +1689,8 @@ msgid ""
 "VAT number is <em>%(vat)s</em>. If this partner is from Northern Ireland, "
 "his VAT number should be updated to his new VAT number starting with <em>XI</"
 "em> following Brexit. If this partner is from Great Britain, maybe the "
-"fiscal position was wrong on the invoice (the fiscal position was <i>"
-"%(fiscal_position)s</i>)."
+"fiscal position was wrong on the invoice (the fiscal position was "
+"<i>%(fiscal_position)s</i>)."
 msgstr ""
 
 #. module: intrastat_product
@@ -1734,11 +1743,6 @@ msgstr ""
 msgid "Year and month of the declaration."
 msgstr ""
 
-#. module: intrastat_product
-#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__note
-msgid "You can add some comments here if you want."
-msgstr ""
-
 #. module: intrastat_product
 #. odoo-python
 #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0
@@ -1774,6 +1778,11 @@ msgstr ""
 msgid "intrastat-%(year_month)s-%(declaration_type)s%(draft)s"
 msgstr ""
 
+#. module: intrastat_product
+#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_computation_line_view_form
+msgid "kg"
+msgstr ""
+
 #. module: intrastat_product
 #: model:ir.actions.report,print_report_name:intrastat_product.intrastat_product_xlsx_report
 msgid "object._get_xlsx_report_filename()"