diff --git a/base_location_geonames_import/i18n/am.po b/base_location_geonames_import/i18n/am.po
index ff5f6f2c7..a1b83270e 100644
--- a/base_location_geonames_import/i18n/am.po
+++ b/base_location_geonames_import/i18n/am.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ar.po b/base_location_geonames_import/i18n/ar.po
index ad97a0118..cccf4f84f 100644
--- a/base_location_geonames_import/i18n/ar.po
+++ b/base_location_geonames_import/i18n/ar.po
@@ -20,19 +20,19 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "إلغاء"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "المعرف"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/bg.po b/base_location_geonames_import/i18n/bg.po
index 0e1f485f0..7784d97ac 100644
--- a/base_location_geonames_import/i18n/bg.po
+++ b/base_location_geonames_import/i18n/bg.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Име за показване"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/bs.po b/base_location_geonames_import/i18n/bs.po
index f5472b5c8..67be11908 100644
--- a/base_location_geonames_import/i18n/bs.po
+++ b/base_location_geonames_import/i18n/bs.po
@@ -20,19 +20,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ca.po b/base_location_geonames_import/i18n/ca.po
index 903a9a672..e61a7a34f 100644
--- a/base_location_geonames_import/i18n/ca.po
+++ b/base_location_geonames_import/i18n/ca.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creat el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Darrera Actualització per"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/cs.po b/base_location_geonames_import/i18n/cs.po
index 29a3b4925..374598e50 100644
--- a/base_location_geonames_import/i18n/cs.po
+++ b/base_location_geonames_import/i18n/cs.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Vytvořil(a)"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Naposled upraveno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Naposled upraveno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/da.po b/base_location_geonames_import/i18n/da.po
index 3643ff590..2c8002f74 100644
--- a/base_location_geonames_import/i18n/da.po
+++ b/base_location_geonames_import/i18n/da.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Land."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/de.po b/base_location_geonames_import/i18n/de.po
index a7ffe4eb8..e75c08c55 100644
--- a/base_location_geonames_import/i18n/de.po
+++ b/base_location_geonames_import/i18n/de.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "abbrechen"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,126 +39,115 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Land"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "erstellt von"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "erstellt am"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Erhielt einen Fehler %d beim Versuch die Datei %s herunter zu laden."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Import"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Importiere bessere PLZ von geonames.org"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Importiere von Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt verändert am"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "zuletzt aktualisiert von"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "zuletzt aktualisiert am"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"Die Landeskennung in der Datei (%s) passt nicht zum gewählten Land (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr "Fall-Bezeichnung"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "Die Landeskennung in der Datei (%s) passt nicht zum gewählten Land (%s)."
diff --git a/base_location_geonames_import/i18n/el_GR.po b/base_location_geonames_import/i18n/el_GR.po
index cd6cac77a..b511e9bb2 100644
--- a/base_location_geonames_import/i18n/el_GR.po
+++ b/base_location_geonames_import/i18n/el_GR.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από "
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "Κωδικός"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία ενημέρωση από"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/en_GB.po b/base_location_geonames_import/i18n/en_GB.po
index 95cb4c4be..6d7d2f0d1 100644
--- a/base_location_geonames_import/i18n/en_GB.po
+++ b/base_location_geonames_import/i18n/en_GB.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Created by"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es.po b/base_location_geonames_import/i18n/es.po
index c1943e2d5..e051ea5af 100644
--- a/base_location_geonames_import/i18n/es.po
+++ b/base_location_geonames_import/i18n/es.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
@@ -28,12 +28,12 @@ msgstr ""
 "<b>borrar los registros ausentes</b> del nuevo archivo."
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -44,32 +44,27 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "País"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
@@ -78,95 +73,89 @@ msgstr ""
 "país seleccionado."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Se obtuvo un error %d cuando se descargaba el archivo %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Importar"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Importar ubicaciones de Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Importar de GeoNames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Modificado por última vez el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr "Capitalización"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"El código de país dentro del archivo (%s) no se corresponde con el país "
-"seleccionado (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr "Nombre Propio"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr "Sin cambios"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr "Todo mayúsculas"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr "geonames.org"
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "El código de país dentro del archivo (%s) no se corresponde con el país "
+#~ "seleccionado (%s)."
diff --git a/base_location_geonames_import/i18n/es_AR.po b/base_location_geonames_import/i18n/es_AR.po
index 97b76c9e1..e07fd9822 100644
--- a/base_location_geonames_import/i18n/es_AR.po
+++ b/base_location_geonames_import/i18n/es_AR.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_CL.po b/base_location_geonames_import/i18n/es_CL.po
index 0fd6f5879..d0e597d82 100644
--- a/base_location_geonames_import/i18n/es_CL.po
+++ b/base_location_geonames_import/i18n/es_CL.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_CO.po b/base_location_geonames_import/i18n/es_CO.po
index 3739b9d71..8b36e6d74 100644
--- a/base_location_geonames_import/i18n/es_CO.po
+++ b/base_location_geonames_import/i18n/es_CO.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_CR.po b/base_location_geonames_import/i18n/es_CR.po
index 075ac6eaa..c1b1c3fb4 100644
--- a/base_location_geonames_import/i18n/es_CR.po
+++ b/base_location_geonames_import/i18n/es_CR.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_DO.po b/base_location_geonames_import/i18n/es_DO.po
index 40a91ef45..fe8538a2a 100644
--- a/base_location_geonames_import/i18n/es_DO.po
+++ b/base_location_geonames_import/i18n/es_DO.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_EC.po b/base_location_geonames_import/i18n/es_EC.po
index 2070adc32..30a603ee4 100644
--- a/base_location_geonames_import/i18n/es_EC.po
+++ b/base_location_geonames_import/i18n/es_EC.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_ES.po b/base_location_geonames_import/i18n/es_ES.po
index f20fc61a2..66eb61199 100644
--- a/base_location_geonames_import/i18n/es_ES.po
+++ b/base_location_geonames_import/i18n/es_ES.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_MX.po b/base_location_geonames_import/i18n/es_MX.po
index 3a93b3ecf..3ab1fc0e4 100644
--- a/base_location_geonames_import/i18n/es_MX.po
+++ b/base_location_geonames_import/i18n/es_MX.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificacion realizada"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizacion por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_PE.po b/base_location_geonames_import/i18n/es_PE.po
index 35cc58397..d3fdb8fe5 100644
--- a/base_location_geonames_import/i18n/es_PE.po
+++ b/base_location_geonames_import/i18n/es_PE.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado última vez por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_PY.po b/base_location_geonames_import/i18n/es_PY.po
index b2c273456..ad3f430ea 100644
--- a/base_location_geonames_import/i18n/es_PY.po
+++ b/base_location_geonames_import/i18n/es_PY.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/es_VE.po b/base_location_geonames_import/i18n/es_VE.po
index 2117110cb..cc7683dd0 100644
--- a/base_location_geonames_import/i18n/es_VE.po
+++ b/base_location_geonames_import/i18n/es_VE.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/et.po b/base_location_geonames_import/i18n/et.po
index a8f83a206..6683275f3 100644
--- a/base_location_geonames_import/i18n/et.po
+++ b/base_location_geonames_import/i18n/et.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Loobu"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Loonud"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Loodud"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Viimati uuendatud"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/eu.po b/base_location_geonames_import/i18n/eu.po
index 524ce4d76..f2823460c 100644
--- a/base_location_geonames_import/i18n/eu.po
+++ b/base_location_geonames_import/i18n/eu.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Nork sortua"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/fa.po b/base_location_geonames_import/i18n/fa.po
index d85b03190..da203e779 100644
--- a/base_location_geonames_import/i18n/fa.po
+++ b/base_location_geonames_import/i18n/fa.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "شناسه"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "تاریخ آخرین به‌روزرسانی"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "آخرین به روز رسانی توسط"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/fi.po b/base_location_geonames_import/i18n/fi.po
index e4c7d66a0..9e49092ca 100644
--- a/base_location_geonames_import/i18n/fi.po
+++ b/base_location_geonames_import/i18n/fi.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Maa"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Luotu"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivitetty"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivittänyt"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/fr.po b/base_location_geonames_import/i18n/fr.po
index 5e9b891ae..39dc4e553 100644
--- a/base_location_geonames_import/i18n/fr.po
+++ b/base_location_geonames_import/i18n/fr.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,127 +39,116 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Pays"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Intitulé"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Erreur %d reçue suite à la tentative de téléchargement du fichier %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Importer"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Import Better Zip from Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Importer de Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Mis à jour par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Mis à jour le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"Le code pays utilisé à l'intérieur du fichier (%s) ne correspond pas au pays "
-"sélectionné (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "Le code pays utilisé à l'intérieur du fichier (%s) ne correspond pas au "
+#~ "pays sélectionné (%s)."
diff --git a/base_location_geonames_import/i18n/fr_CA.po b/base_location_geonames_import/i18n/fr_CA.po
index 25fa52c8f..a785d67cd 100644
--- a/base_location_geonames_import/i18n/fr_CA.po
+++ b/base_location_geonames_import/i18n/fr_CA.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "Identifiant"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/fr_CH.po b/base_location_geonames_import/i18n/fr_CH.po
index 166999abc..31e48628a 100644
--- a/base_location_geonames_import/i18n/fr_CH.po
+++ b/base_location_geonames_import/i18n/fr_CH.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Modifié par"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/gl.po b/base_location_geonames_import/i18n/gl.po
index 1b0b5fad5..18d82981f 100644
--- a/base_location_geonames_import/i18n/gl.po
+++ b/base_location_geonames_import/i18n/gl.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Modificado por última vez o"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "ültima actualización por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/gl_ES.po b/base_location_geonames_import/i18n/gl_ES.po
index d0e6d89a8..272b9cf84 100644
--- a/base_location_geonames_import/i18n/gl_ES.po
+++ b/base_location_geonames_import/i18n/gl_ES.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/he.po b/base_location_geonames_import/i18n/he.po
index 94e21f89e..49502eb6a 100644
--- a/base_location_geonames_import/i18n/he.po
+++ b/base_location_geonames_import/i18n/he.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "נוצר על ידי"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "מזהה"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "תאריך שינוי אחרון"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על ידי"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/hr.po b/base_location_geonames_import/i18n/hr.po
index 5a43fd878..dc2e03470 100644
--- a/base_location_geonames_import/i18n/hr.po
+++ b/base_location_geonames_import/i18n/hr.po
@@ -20,19 +20,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Naziv za prikaz"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažuriranje"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/hr_HR.po b/base_location_geonames_import/i18n/hr_HR.po
index 38863b1f9..5a39075f2 100644
--- a/base_location_geonames_import/i18n/hr_HR.po
+++ b/base_location_geonames_import/i18n/hr_HR.po
@@ -21,19 +21,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,126 +41,115 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Država"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Pogreška : %d pri pokušaju preuzimanja datoteke %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Uvezi"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Uvezi Gradove sa Geonames servisa"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Uvezi sa Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnji modificirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"Šifra države unutar datoteke (%s) ne odgovara šifri odabrane države (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr "Početna Velika "
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr "geonames.org"
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "Šifra države unutar datoteke (%s) ne odgovara šifri odabrane države (%s)."
diff --git a/base_location_geonames_import/i18n/hu.po b/base_location_geonames_import/i18n/hu.po
index 61e5ad0c9..297026d83 100644
--- a/base_location_geonames_import/i18n/hu.po
+++ b/base_location_geonames_import/i18n/hu.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Utolsó frissítés dátuma"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítve, által"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/id.po b/base_location_geonames_import/i18n/id.po
index 59dc5a940..4003402ba 100644
--- a/base_location_geonames_import/i18n/id.po
+++ b/base_location_geonames_import/i18n/id.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Terakhir Dimodifikasi pada"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Diperbaharui oleh"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/it.po b/base_location_geonames_import/i18n/it.po
index 39cb0023c..417c1e701 100644
--- a/base_location_geonames_import/i18n/it.po
+++ b/base_location_geonames_import/i18n/it.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
@@ -28,12 +28,12 @@ msgstr ""
 "eliminare le voci mancanti </ b> dal nuovo file."
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Annulla"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -44,32 +44,27 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Paese"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creato il"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
@@ -78,95 +73,89 @@ msgstr ""
 "lista delle città"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Errore %d mentre si stava scaricando il file %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Importa"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Importa Better Zip da Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Importazione da Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultimo caricamento il"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultimo caricamento di"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr "Maiuscolo/Minuscolo"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"Il codice paese all'interno del file (%s) non corrisponde al paese "
-"selezionato (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr "Iniziale Maiuscola"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr "Invariato"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr "Lettere Maiuscole"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr "geonames.org"
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "Il codice paese all'interno del file (%s) non corrisponde al paese "
+#~ "selezionato (%s)."
diff --git a/base_location_geonames_import/i18n/ja.po b/base_location_geonames_import/i18n/ja.po
index c8bb5f31d..6f904ee07 100644
--- a/base_location_geonames_import/i18n/ja.po
+++ b/base_location_geonames_import/i18n/ja.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "作成者"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "作成日"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "表示名"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ko.po b/base_location_geonames_import/i18n/ko.po
index 30449794b..8e41597cf 100644
--- a/base_location_geonames_import/i18n/ko.po
+++ b/base_location_geonames_import/i18n/ko.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "작성자"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "작성일"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/lt.po b/base_location_geonames_import/i18n/lt.po
index a101f5561..3d3caed6b 100644
--- a/base_location_geonames_import/i18n/lt.po
+++ b/base_location_geonames_import/i18n/lt.po
@@ -20,19 +20,19 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Atšaukti"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/lt_LT.po b/base_location_geonames_import/i18n/lt_LT.po
index e9fa9a1c4..ab2c2ee44 100644
--- a/base_location_geonames_import/i18n/lt_LT.po
+++ b/base_location_geonames_import/i18n/lt_LT.po
@@ -21,19 +21,19 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,125 +41,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/lv.po b/base_location_geonames_import/i18n/lv.po
index 6fc89868e..98bcb00c7 100644
--- a/base_location_geonames_import/i18n/lv.po
+++ b/base_location_geonames_import/i18n/lv.po
@@ -20,19 +20,19 @@ msgstr ""
 "2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/mk.po b/base_location_geonames_import/i18n/mk.po
index 4f7c11e8f..bdaf13e2f 100644
--- a/base_location_geonames_import/i18n/mk.po
+++ b/base_location_geonames_import/i18n/mk.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/mn.po b/base_location_geonames_import/i18n/mn.po
index 9417b0026..1dc5684e2 100644
--- a/base_location_geonames_import/i18n/mn.po
+++ b/base_location_geonames_import/i18n/mn.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Үүсгэгч"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлийн засвар хийсэн"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/nb.po b/base_location_geonames_import/i18n/nb.po
index 0e71f987f..3dc663dd1 100644
--- a/base_location_geonames_import/i18n/nb.po
+++ b/base_location_geonames_import/i18n/nb.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Opprettet den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Sist oppdatert "
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/nb_NO.po b/base_location_geonames_import/i18n/nb_NO.po
index dc3f9ca2f..d35231299 100644
--- a/base_location_geonames_import/i18n/nb_NO.po
+++ b/base_location_geonames_import/i18n/nb_NO.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Laget av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Laget den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/nl.po b/base_location_geonames_import/i18n/nl.po
index 1fbf6a3ee..5433219db 100644
--- a/base_location_geonames_import/i18n/nl.po
+++ b/base_location_geonames_import/i18n/nl.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Land"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/nl_BE.po b/base_location_geonames_import/i18n/nl_BE.po
index 317771776..894f06f68 100644
--- a/base_location_geonames_import/i18n/nl_BE.po
+++ b/base_location_geonames_import/i18n/nl_BE.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Gemaakt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Gemaakt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst Aangepast op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/nl_NL.po b/base_location_geonames_import/i18n/nl_NL.po
index 44cd33d8a..ea11b676d 100644
--- a/base_location_geonames_import/i18n/nl_NL.po
+++ b/base_location_geonames_import/i18n/nl_NL.po
@@ -21,19 +21,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Verwijderen"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,125 +41,111 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Land"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Weergavenaam"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr "Plaatsen afdwingen"
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Kreeg een fout %d tijdens de poging om bestand %s te downloaden."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Import"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr "Onveranderd"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr "geonames.org"
+
+#~ msgid "Enforce Cities"
+#~ msgstr "Plaatsen afdwingen"
diff --git a/base_location_geonames_import/i18n/pl.po b/base_location_geonames_import/i18n/pl.po
index e07e89a21..36041f64c 100644
--- a/base_location_geonames_import/i18n/pl.po
+++ b/base_location_geonames_import/i18n/pl.po
@@ -21,19 +21,19 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,125 +41,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Utworzone przez"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Utworzono"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ostatnio modyfikowano"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio modyfikowane przez"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/pt.po b/base_location_geonames_import/i18n/pt.po
index d87338483..176369477 100644
--- a/base_location_geonames_import/i18n/pt.po
+++ b/base_location_geonames_import/i18n/pt.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "País"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Modificado a última vez por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/pt_BR.po b/base_location_geonames_import/i18n/pt_BR.po
index 2b48c78f9..839848147 100644
--- a/base_location_geonames_import/i18n/pt_BR.po
+++ b/base_location_geonames_import/i18n/pt_BR.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,126 +40,116 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "País"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nome a mostrar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Recebido um erro %d ao tentar o download do arquivo %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Importar"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Importar códigos postais de Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Importar de Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificação em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Útima atualização por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Útima atualização em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-"O código país dentro do arquivo (%s) não corresponde ao país selecionado (%s)"
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr ""
+#~ "O código país dentro do arquivo (%s) não corresponde ao país selecionado "
+#~ "(%s)"
diff --git a/base_location_geonames_import/i18n/pt_PT.po b/base_location_geonames_import/i18n/pt_PT.po
index aa52f9df0..613c5ddfb 100644
--- a/base_location_geonames_import/i18n/pt_PT.po
+++ b/base_location_geonames_import/i18n/pt_PT.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "País"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nome"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Modificado em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ro.po b/base_location_geonames_import/i18n/ro.po
index a1e6da2d7..754f11114 100644
--- a/base_location_geonames_import/i18n/ro.po
+++ b/base_location_geonames_import/i18n/ro.po
@@ -20,19 +20,19 @@ msgstr ""
 "2:1));\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Anuleaza"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Creat de"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Creat la"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizare făcută de"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ru.po b/base_location_geonames_import/i18n/ru.po
index a9d463dcb..7ef61823f 100644
--- a/base_location_geonames_import/i18n/ru.po
+++ b/base_location_geonames_import/i18n/ru.po
@@ -21,19 +21,19 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Отменена"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,125 +41,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Создан"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновлено"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/sk.po b/base_location_geonames_import/i18n/sk.po
index c0f2692ed..d88dcb091 100644
--- a/base_location_geonames_import/i18n/sk.po
+++ b/base_location_geonames_import/i18n/sk.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravoval"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravované"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/sl.po b/base_location_geonames_import/i18n/sl.po
index 83de45044..655abb78b 100644
--- a/base_location_geonames_import/i18n/sl.po
+++ b/base_location_geonames_import/i18n/sl.po
@@ -20,19 +20,19 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,114 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr "Država"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Ustvaril"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Ustvaril"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Prikazno ime"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Prišlo je do napake %d pri poizkusu prenosa datoteke %s."
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr "Uvozi"
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+#, fuzzy
+msgid "Import City Zips from Geonames"
 msgstr "Uvozi Better Zip iz Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr "Uvozi iz Geonames"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji posodobil"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr "Oznaka države v datoteki (%s) ne ustreza izbrani državi (%s)."
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr "Velike začetnice besed"
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
+
+#~ msgid ""
+#~ "The country code inside the file (%s) doesn't correspond to the selected "
+#~ "country (%s)."
+#~ msgstr "Oznaka države v datoteki (%s) ne ustreza izbrani državi (%s)."
diff --git a/base_location_geonames_import/i18n/sr.po b/base_location_geonames_import/i18n/sr.po
index 151a7bcd6..cab63f043 100644
--- a/base_location_geonames_import/i18n/sr.po
+++ b/base_location_geonames_import/i18n/sr.po
@@ -20,19 +20,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/sr@latin.po b/base_location_geonames_import/i18n/sr@latin.po
index 18e2229b6..b49c3cdd4 100644
--- a/base_location_geonames_import/i18n/sr@latin.po
+++ b/base_location_geonames_import/i18n/sr@latin.po
@@ -21,19 +21,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -41,125 +41,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnja izmjena"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/sv.po b/base_location_geonames_import/i18n/sv.po
index c828c6f0e..e297a2ab4 100644
--- a/base_location_geonames_import/i18n/sv.po
+++ b/base_location_geonames_import/i18n/sv.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Senast redigerad"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/th.po b/base_location_geonames_import/i18n/th.po
index 8f73d445e..8516e08c1 100644
--- a/base_location_geonames_import/i18n/th.po
+++ b/base_location_geonames_import/i18n/th.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "รหัส"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/tr.po b/base_location_geonames_import/i18n/tr.po
index b348a83cb..360b2922b 100644
--- a/base_location_geonames_import/i18n/tr.po
+++ b/base_location_geonames_import/i18n/tr.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Vazgeç"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Oluşturuldu"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Son değişiklik"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Son güncelleyen"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Son güncelleme"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/tr_TR.po b/base_location_geonames_import/i18n/tr_TR.po
index 5d9c6a717..89569c119 100644
--- a/base_location_geonames_import/i18n/tr_TR.po
+++ b/base_location_geonames_import/i18n/tr_TR.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Oluşturulma tarihi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "Kimlik"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "En son güncelleme tarihi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "En son güncelleyen "
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/uk.po b/base_location_geonames_import/i18n/uk.po
index be06fd79b..3d386e224 100644
--- a/base_location_geonames_import/i18n/uk.po
+++ b/base_location_geonames_import/i18n/uk.po
@@ -20,19 +20,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Створив"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Дата створення"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Остання модифікація"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє оновив"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/vi.po b/base_location_geonames_import/i18n/vi.po
index 3da59d51b..98d2a0605 100644
--- a/base_location_geonames_import/i18n/vi.po
+++ b/base_location_geonames_import/i18n/vi.po
@@ -19,19 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -39,125 +39,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Được tạo bởi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Được tạo vào"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối vào"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/vi_VN.po b/base_location_geonames_import/i18n/vi_VN.po
index e40876319..0c32ab626 100644
--- a/base_location_geonames_import/i18n/vi_VN.po
+++ b/base_location_geonames_import/i18n/vi_VN.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "Tạo bởi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "Tạo vào"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật lần cuối bởi"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/zh_CN.po b/base_location_geonames_import/i18n/zh_CN.po
index a330a7f57..bad5e68d6 100644
--- a/base_location_geonames_import/i18n/zh_CN.po
+++ b/base_location_geonames_import/i18n/zh_CN.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "创建者"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "创建时间"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "ID"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/zh_TW.po b/base_location_geonames_import/i18n/zh_TW.po
index 31639e201..6913865a0 100644
--- a/base_location_geonames_import/i18n/zh_TW.po
+++ b/base_location_geonames_import/i18n/zh_TW.po
@@ -20,19 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 ", create new location entries if not found already in the system, and "
 "<b>delete missing entries</b> from new file."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,help:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid ""
 "Converts retreived city and state names to Title Case (upper case on each "
 "first letter of a word) or Upper Case (all letters upper case)."
@@ -40,125 +40,108 @@ msgstr ""
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_res_country
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_country_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__country_id
 msgid "Country"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_uid
 msgid "Created by"
 msgstr "建立者"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_create_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__create_date
 msgid "Created on"
 msgstr "建立於"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_code_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__code_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_code_column
 msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country_geonames_state_name_column
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__name_row_index
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_res_country__geonames_state_name_column
 msgid "Geonames State Name Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:126
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_id
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__id
 msgid "ID"
 msgstr "編號"
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
-msgid "Import Better Zip from Geonames"
+#: model:ir.model,name:base_location_geonames_import.model_city_zip_geonames_import
+msgid "Import City Zips from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action
-#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model:ir.actions.act_window,name:base_location_geonames_import.city_zip_geonames_import_action
+#: model:ir.ui.menu,name:base_location_geonames_import.city_zip_geonames_import_menu
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "Import from Geonames"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import___last_update
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import____last_update
 msgid "Last Modified on"
 msgstr "最後修改:"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_uid
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_uid
 msgid "Last Updated by"
 msgstr "最後更新："
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_write_date
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__write_date
 msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_letter_case
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_city_zip_geonames_import__letter_case
 msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
-msgid "The city will be created as a separate entity."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
-#, python-format
-msgid ""
-"The country code inside the file (%s) doesn't correspond to the selected "
-"country (%s)."
-msgstr ""
-
-#. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Unchanged"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: selection:better.zip.geonames.import,letter_case:0
+#: selection:city.zip.geonames.import,letter_case:0
 msgid "Upper Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
+#: model_terms:ir.ui.view,arch_db:base_location_geonames_import.city_zip_geonames_import_form
 msgid "geonames.org"
 msgstr ""