diff --git a/product_harmonized_system/i18n/product_harmonized_system.pot b/product_harmonized_system/i18n/product_harmonized_system.pot
index 388dc7a..7f35c09 100644
--- a/product_harmonized_system/i18n/product_harmonized_system.pot
+++ b/product_harmonized_system/i18n/product_harmonized_system.pot
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
@@ -14,116 +14,131 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_active
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+msgid " Product Categs"
+msgstr ""
+
+#. module: product_harmonized_system
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+msgid " Products"
+msgstr ""
+
+#. module: product_harmonized_system
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__active
msgid "Active"
msgstr ""
+#. module: product_harmonized_system
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_search
+msgid "Archived"
+msgstr ""
+
#. module: product_harmonized_system
#: model:hs.code,description:product_harmonized_system.84715000
msgid "Automatic data-processing machines (computers)"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_hs_code_local_code
+#: model:ir.model.fields,help:product_harmonized_system.field_hs_code__local_code
msgid "Code used for the national Import/Export declaration. The national code starts with the 6 digits of the H.S. and often has a few additional digits to extend the H.S. code."
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_company_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__company_id
msgid "Company"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_product_product_origin_country_id
-#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template_origin_country_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__origin_country_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__origin_country_id
msgid "Country of Origin"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_product_product_origin_country_id
-#: model:ir.model.fields,help:product_harmonized_system.field_product_template_origin_country_id
+#: model:ir.model.fields,help:product_harmonized_system.field_product_product__origin_country_id
+#: model:ir.model.fields,help:product_harmonized_system.field_product_template__origin_country_id
msgid "Country of origin of the product i.e. product 'made in ____'."
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_create_uid
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__create_uid
msgid "Created by"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_create_date
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__create_date
msgid "Created on"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_description
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__description
msgid "Description"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_display_name
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__display_name
msgid "Display Name"
msgstr ""
#. module: product_harmonized_system
#: model:ir.model,name:product_harmonized_system.model_hs_code
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_hs_code
-#: model:ir.model.fields,field_description:product_harmonized_system.field_product_category_hs_code_id
-#: model:ir.model.fields,field_description:product_harmonized_system.field_product_product_hs_code_id
-#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template_hs_code_id
-#: model:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__hs_code
+#: model:ir.model.fields,field_description:product_harmonized_system.field_product_category__hs_code_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
msgid "H.S. Code"
msgstr ""
#. module: product_harmonized_system
#: model:ir.actions.act_window,name:product_harmonized_system.hs_code_action
-#: model:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_tree
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_tree
msgid "H.S. Codes"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_product_category_hs_code_id
+#: model:ir.model.fields,help:product_harmonized_system.field_product_category__hs_code_id
msgid "Harmonised System Code. If this code is not set on the product itself, it will be read here, on the related product category."
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_product_product_hs_code_id
-#: model:ir.model.fields,help:product_harmonized_system.field_product_template_hs_code_id
+#: model:ir.model.fields,help:product_harmonized_system.field_product_product__hs_code_id
+#: model:ir.model.fields,help:product_harmonized_system.field_product_template__hs_code_id
msgid "Harmonised System Code. Nomenclature is available from the World Customs Organisation, see http://www.wcoomd.org/. You can leave this field empty and configure the H.S. code on the product category."
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_hs_code_hs_code
+#: model:ir.model.fields,help:product_harmonized_system.field_hs_code__hs_code
msgid "Harmonized System code (6 digits). Full list is available from the World Customs Organisation, see http://www.wcoomd.org"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_id
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__id
msgid "ID"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.ui.view,arch_db:product_harmonized_system.product_category_form_view
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_category_form_view
msgid "Import/Export Properties"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code___last_update
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code____last_update
msgid "Last Modified on"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_write_uid
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__write_uid
msgid "Last Updated by"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_write_date
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__write_date
msgid "Last Updated on"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_local_code
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__local_code
msgid "Local Code"
msgstr ""
@@ -138,8 +153,13 @@ msgid "Product"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_product_categ_ids
-#: model:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__product_categ_count
+msgid "Product Categ Count"
+msgstr ""
+
+#. module: product_harmonized_system
+#: model:ir.actions.act_window,name:product_harmonized_system.product_categ_hs_code_action
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__product_categ_ids
msgid "Product Categories"
msgstr ""
@@ -154,18 +174,23 @@ msgid "Product Template"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code_product_tmpl_ids
-#: model:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__product_tmpl_count
+msgid "Product Tmpl Count"
+msgstr ""
+
+#. module: product_harmonized_system
+#: model:ir.actions.act_window,name:product_harmonized_system.product_template_hs_code_action
+#: model:ir.model.fields,field_description:product_harmonized_system.field_hs_code__product_tmpl_ids
msgid "Products"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_search
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_search
msgid "Search H.S. Codes"
msgstr ""
#. module: product_harmonized_system
-#: model:ir.model.fields,help:product_harmonized_system.field_hs_code_description
+#: model:ir.model.fields,help:product_harmonized_system.field_hs_code__description
msgid "Short text description of the H.S. category"
msgstr ""