diff --git a/base_location_geonames_import/i18n/am.po b/base_location_geonames_import/i18n/am.po
index 2c2c3a0e2..ff5f6f2c7 100644
--- a/base_location_geonames_import/i18n/am.po
+++ b/base_location_geonames_import/i18n/am.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,24 +10,35 @@ msgstr ""
 "POT-Creation-Date: 2016-08-20 23:45+0000\n"
 "PO-Revision-Date: 2016-04-28 11:44+0000\n"
 "Last-Translator: <>\n"
-"Language-Team: Amharic (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/am/)\n"
+"Language-Team: Amharic (http://www.transifex.com/oca/OCA-partner-contact-9-0/"
+"language/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: am\n"
 "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
+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
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_title_case
-msgid "Converts retreived city and state names to Title Case."
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_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)."
 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
 msgid "Country"
 msgstr ""
@@ -47,16 +58,30 @@ msgstr "Creado en"
 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
 msgid ""
-"For the country selected above, this wizard will download the latest version"
-" of the list of cities from geonames.org, create new location entries if not"
-" found already in the system, and DELETE MISSING ENTRIES from new file."
+"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
+msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:118
+#: 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
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -99,7 +124,18 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:65
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_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 "
@@ -107,12 +143,21 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_title_case
+#: selection:better.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:94
-#, python-format
-msgid "Too many states with code %s for country %s"
+#: selection:better.zip.geonames.import,letter_case:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.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
+msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/ar.po b/base_location_geonames_import/i18n/ar.po
index b6775d11c..ad97a0118 100644
--- a/base_location_geonames_import/i18n/ar.po
+++ b/base_location_geonames_import/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& 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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "أنشئ في"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/base_location_geonames_import.pot b/base_location_geonames_import/i18n/base_location_geonames_import.pot
new file mode 100644
index 000000000..920c6a076
--- /dev/null
+++ b/base_location_geonames_import/i18n/base_location_geonames_import.pot
@@ -0,0 +1,151 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* base_location_geonames_import
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_location_geonames_import
+#: model:ir.ui.view,arch_db:base_location_geonames_import.better_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
+msgid "Cancel"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_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)."
+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
+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
+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
+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
+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
+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
+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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
+#, 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
+msgid "ID"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: model:ir.ui.view,arch_db:base_location_geonames_import.better_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"
+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
+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
+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
+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
+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
+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
+msgid "Title Case"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.zip.geonames.import,letter_case:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.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
+msgid "geonames.org"
+msgstr ""
+
diff --git a/base_location_geonames_import/i18n/bg.po b/base_location_geonames_import/i18n/bg.po
index a4331f300..0e1f485f0 100644
--- a/base_location_geonames_import/i18n/bg.po
+++ b/base_location_geonames_import/i18n/bg.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Създадено на"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/bs.po b/base_location_geonames_import/i18n/bs.po
index 91e001dd3..f5472b5c8 100644
--- a/base_location_geonames_import/i18n/bs.po
+++ b/base_location_geonames_import/i18n/bs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Kreirano"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/ca.po b/base_location_geonames_import/i18n/ca.po
index 034dd3d1e..903a9a672 100644
--- a/base_location_geonames_import/i18n/ca.po
+++ b/base_location_geonames_import/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Creat el"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/cs.po b/base_location_geonames_import/i18n/cs.po
index 45ee8b439..29a3b4925 100644
--- a/base_location_geonames_import/i18n/cs.po
+++ b/base_location_geonames_import/i18n/cs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Vytvořeno"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/da.po b/base_location_geonames_import/i18n/da.po
index fd52976af..3643ff590 100644
--- a/base_location_geonames_import/i18n/da.po
+++ b/base_location_geonames_import/i18n/da.po
@@ -1,21 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Land."
@@ -57,6 +58,11 @@ msgstr "Oprettet den"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/de.po b/base_location_geonames_import/i18n/de.po
index 13ec760dd..a7ffe4eb8 100644
--- a/base_location_geonames_import/i18n/de.po
+++ b/base_location_geonames_import/i18n/de.po
@@ -1,21 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Land"
@@ -57,6 +58,11 @@ msgstr "erstellt am"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, 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."
@@ -95,7 +111,7 @@ 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
 msgid "Last Modified on"
-msgstr "Zuletzt geändert am"
+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
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/el_GR.po b/base_location_geonames_import/i18n/el_GR.po
index 1223eeccd..cd6cac77a 100644
--- a/base_location_geonames_import/i18n/el_GR.po
+++ b/base_location_geonames_import/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,24 +10,35 @@ msgstr ""
 "POT-Creation-Date: 2016-08-20 23:45+0000\n"
 "PO-Revision-Date: 2016-04-28 11:44+0000\n"
 "Last-Translator: <>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/el_GR/)\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-partner-"
+"contact-9-0/language/el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "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
+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
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_title_case
-msgid "Converts retreived city and state names to Title Case."
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_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)."
 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
 msgid "Country"
 msgstr ""
@@ -47,16 +58,30 @@ msgstr "Δημιουργήθηκε στις"
 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
 msgid ""
-"For the country selected above, this wizard will download the latest version"
-" of the list of cities from geonames.org, create new location entries if not"
-" found already in the system, and DELETE MISSING ENTRIES from new file."
+"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
+msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:118
+#: 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
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -99,7 +124,18 @@ msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:65
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_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 "
@@ -107,12 +143,21 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_title_case
+#: selection:better.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:94
-#, python-format
-msgid "Too many states with code %s for country %s"
+#: selection:better.zip.geonames.import,letter_case:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.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
+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 777fb863f..95cb4c4be 100644
--- a/base_location_geonames_import/i18n/en_GB.po
+++ b/base_location_geonames_import/i18n/en_GB.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
+"teams/23907/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Created on"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es.po b/base_location_geonames_import/i18n/es.po
index b6e46039d..c1943e2d5 100644
--- a/base_location_geonames_import/i18n/es.po
+++ b/base_location_geonames_import/i18n/es.po
@@ -1,22 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -40,10 +39,11 @@ msgid ""
 "first letter of a word) or Upper Case (all letters upper case)."
 msgstr ""
 "Convierte los nombres de ciudades y provincias obtenidos a capitalización "
-"(mayúsculas la primera letra de cada palabra) o a todo mayúsculas (todas las"
-" letras)."
+"(mayúsculas la primera letra de cada palabra) o a todo mayúsculas (todas las "
+"letras)."
 
 #. 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
 msgid "Country"
 msgstr "País"
@@ -63,6 +63,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -73,7 +78,17 @@ msgstr ""
 "país seleccionado."
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, 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."
@@ -121,7 +136,13 @@ msgid "Letter Case"
 msgstr "Capitalización"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_AR.po b/base_location_geonames_import/i18n/es_AR.po
index 68b92a6ea..97b76c9e1 100644
--- a/base_location_geonames_import/i18n/es_AR.po
+++ b/base_location_geonames_import/i18n/es_AR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
+"teams/23907/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_CL.po b/base_location_geonames_import/i18n/es_CL.po
index e9a52b877..0fd6f5879 100644
--- a/base_location_geonames_import/i18n/es_CL.po
+++ b/base_location_geonames_import/i18n/es_CL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n"
+"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/"
+"es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_CO.po b/base_location_geonames_import/i18n/es_CO.po
index 2acf64c97..3739b9d71 100644
--- a/base_location_geonames_import/i18n/es_CO.po
+++ b/base_location_geonames_import/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_CR.po b/base_location_geonames_import/i18n/es_CR.po
index 4793d39ba..075ac6eaa 100644
--- a/base_location_geonames_import/i18n/es_CR.po
+++ b/base_location_geonames_import/i18n/es_CR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
+"teams/23907/es_CR/)\n"
+"Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_DO.po b/base_location_geonames_import/i18n/es_DO.po
index 111500b96..40a91ef45 100644
--- a/base_location_geonames_import/i18n/es_DO.po
+++ b/base_location_geonames_import/i18n/es_DO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/"
+"teams/23907/es_DO/)\n"
+"Language: es_DO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_DO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_EC.po b/base_location_geonames_import/i18n/es_EC.po
index 6d3690bfb..2070adc32 100644
--- a/base_location_geonames_import/i18n/es_EC.po
+++ b/base_location_geonames_import/i18n/es_EC.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/"
+"es_EC/)\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_ES.po b/base_location_geonames_import/i18n/es_ES.po
index a77d45721..f20fc61a2 100644
--- a/base_location_geonames_import/i18n/es_ES.po
+++ b/base_location_geonames_import/i18n/es_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n"
+"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/"
+"es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_MX.po b/base_location_geonames_import/i18n/es_MX.po
index 0298908bd..3a93b3ecf 100644
--- a/base_location_geonames_import/i18n/es_MX.po
+++ b/base_location_geonames_import/i18n/es_MX.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
+"es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_PE.po b/base_location_geonames_import/i18n/es_PE.po
index 891728d9e..35cc58397 100644
--- a/base_location_geonames_import/i18n/es_PE.po
+++ b/base_location_geonames_import/i18n/es_PE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n"
+"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/"
+"es_PE/)\n"
+"Language: es_PE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_PY.po b/base_location_geonames_import/i18n/es_PY.po
index 9a6bbab2c..b2c273456 100644
--- a/base_location_geonames_import/i18n/es_PY.po
+++ b/base_location_geonames_import/i18n/es_PY.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n"
+"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/"
+"es_PY/)\n"
+"Language: es_PY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/es_VE.po b/base_location_geonames_import/i18n/es_VE.po
index 2275be39b..2117110cb 100644
--- a/base_location_geonames_import/i18n/es_VE.po
+++ b/base_location_geonames_import/i18n/es_VE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
+"teams/23907/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/et.po b/base_location_geonames_import/i18n/et.po
index c3ea8550f..a8f83a206 100644
--- a/base_location_geonames_import/i18n/et.po
+++ b/base_location_geonames_import/i18n/et.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Loodud"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/eu.po b/base_location_geonames_import/i18n/eu.po
index 48d3be5ed..524ce4d76 100644
--- a/base_location_geonames_import/i18n/eu.po
+++ b/base_location_geonames_import/i18n/eu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Created on"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/fa.po b/base_location_geonames_import/i18n/fa.po
index 98cdf48b0..d85b03190 100644
--- a/base_location_geonames_import/i18n/fa.po
+++ b/base_location_geonames_import/i18n/fa.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "ایجاد شده در"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/fi.po b/base_location_geonames_import/i18n/fi.po
index 90e88c15a..e4c7d66a0 100644
--- a/base_location_geonames_import/i18n/fi.po
+++ b/base_location_geonames_import/i18n/fi.po
@@ -1,33 +1,44 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: partner-contact (9.0)\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 23:45+0000\n"
-"PO-Revision-Date: 2016-09-15 12:45+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Finnish (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/fi/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "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
+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
 msgid "Cancel"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_title_case
-msgid "Converts retreived city and state names to Title Case."
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_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)."
 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
 msgid "Country"
 msgstr "Maa"
@@ -47,16 +58,30 @@ msgstr "Luotu"
 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
 msgid ""
-"For the country selected above, this wizard will download the latest version"
-" of the list of cities from geonames.org, create new location entries if not"
-" found already in the system, and DELETE MISSING ENTRIES from new file."
+"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
+msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:118
+#: 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
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -99,7 +124,18 @@ msgid "Last Updated on"
 msgstr "Viimeksi päivittänyt"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:65
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_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 "
@@ -107,12 +143,21 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_title_case
+#: selection:better.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:94
-#, python-format
-msgid "Too many states with code %s for country %s"
+#: selection:better.zip.geonames.import,letter_case:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.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
+msgid "geonames.org"
 msgstr ""
diff --git a/base_location_geonames_import/i18n/fr.po b/base_location_geonames_import/i18n/fr.po
index abb0a56df..5e9b891ae 100644
--- a/base_location_geonames_import/i18n/fr.po
+++ b/base_location_geonames_import/i18n/fr.po
@@ -1,21 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Pays"
@@ -57,6 +58,11 @@ msgstr "Créé le"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, 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."
@@ -113,14 +129,20 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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)."
+"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
diff --git a/base_location_geonames_import/i18n/fr_CA.po b/base_location_geonames_import/i18n/fr_CA.po
index 87a4420b5..25fa52c8f 100644
--- a/base_location_geonames_import/i18n/fr_CA.po
+++ b/base_location_geonames_import/i18n/fr_CA.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n"
+"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/"
+"fr_CA/)\n"
+"Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Créé le"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/fr_CH.po b/base_location_geonames_import/i18n/fr_CH.po
index 82ee6be87..166999abc 100644
--- a/base_location_geonames_import/i18n/fr_CH.po
+++ b/base_location_geonames_import/i18n/fr_CH.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n"
+"Language-Team: French (Switzerland) (https://www.transifex.com/oca/"
+"teams/23907/fr_CH/)\n"
+"Language: fr_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Créé le"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/gl.po b/base_location_geonames_import/i18n/gl.po
index cd74871bc..1b0b5fad5 100644
--- a/base_location_geonames_import/i18n/gl.po
+++ b/base_location_geonames_import/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Creado en"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/gl_ES.po b/base_location_geonames_import/i18n/gl_ES.po
index 7e7a69c9f..d0e6d89a8 100644
--- a/base_location_geonames_import/i18n/gl_ES.po
+++ b/base_location_geonames_import/i18n/gl_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/gl_ES/)\n"
+"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/"
+"gl_ES/)\n"
+"Language: gl_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr ""
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/he.po b/base_location_geonames_import/i18n/he.po
index 4857f08fc..94e21f89e 100644
--- a/base_location_geonames_import/i18n/he.po
+++ b/base_location_geonames_import/i18n/he.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "נוצר ב-"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/hr.po b/base_location_geonames_import/i18n/hr.po
index 0636a41ff..5a43fd878 100644
--- a/base_location_geonames_import/i18n/hr.po
+++ b/base_location_geonames_import/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Kreirano"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/hr_HR.po b/base_location_geonames_import/i18n/hr_HR.po
index ce7c7752d..38863b1f9 100644
--- a/base_location_geonames_import/i18n/hr_HR.po
+++ b/base_location_geonames_import/i18n/hr_HR.po
@@ -1,23 +1,24 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Bole <bole@dajmi5.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
+"hr_HR/)\n"
+"Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -39,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Država"
@@ -58,6 +60,11 @@ msgstr "Kreirano"
 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
 msgid ""
@@ -66,7 +73,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Pogreška : %d pri pokušaju preuzimanja datoteke %s."
@@ -114,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/hu.po b/base_location_geonames_import/i18n/hu.po
index c5ce599fc..61e5ad0c9 100644
--- a/base_location_geonames_import/i18n/hu.po
+++ b/base_location_geonames_import/i18n/hu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Létrehozás dátuma"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/id.po b/base_location_geonames_import/i18n/id.po
index efea717e5..59dc5a940 100644
--- a/base_location_geonames_import/i18n/id.po
+++ b/base_location_geonames_import/i18n/id.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Dibuat pada"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/it.po b/base_location_geonames_import/i18n/it.po
index 47148d0d2..39cb0023c 100644
--- a/base_location_geonames_import/i18n/it.po
+++ b/base_location_geonames_import/i18n/it.po
@@ -1,21 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -39,10 +39,11 @@ msgid ""
 "first letter of a word) or Upper Case (all letters upper case)."
 msgstr ""
 "Converte i nomi recuperati di città e stato con iniziale maiuscola "
-"(maiuscole su ogni prima lettera di una parola) o tutte maiuscole (con tutte"
-" lettere maiuscole)."
+"(maiuscole su ogni prima lettera di una parola) o tutte maiuscole (con tutte "
+"lettere maiuscole)."
 
 #. 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
 msgid "Country"
 msgstr "Paese"
@@ -62,17 +63,32 @@ msgstr "Creato il"
 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
 msgid ""
 "For the selected country, this wizard will download the latest version of "
 "the list of cities from"
 msgstr ""
-"Per la nazione selezionata, questo wizard scaricherà l'ultima versione della"
-" lista delle città"
+"Per la nazione selezionata, questo wizard scaricherà l'ultima versione della "
+"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
+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
+msgid "Geonames State Name Column"
+msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Errore %d mentre si stava scaricando il file %s."
@@ -120,7 +136,13 @@ msgid "Letter Case"
 msgstr "Maiuscolo/Minuscolo"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/ja.po b/base_location_geonames_import/i18n/ja.po
index b02b8da9f..c8bb5f31d 100644
--- a/base_location_geonames_import/i18n/ja.po
+++ b/base_location_geonames_import/i18n/ja.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "作成日"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/ko.po b/base_location_geonames_import/i18n/ko.po
index 07c4d0e01..30449794b 100644
--- a/base_location_geonames_import/i18n/ko.po
+++ b/base_location_geonames_import/i18n/ko.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "작성일"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/lt.po b/base_location_geonames_import/i18n/lt.po
index b3cbbd6a7..a101f5561 100644
--- a/base_location_geonames_import/i18n/lt.po
+++ b/base_location_geonames_import/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Sukurta"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/lt_LT.po b/base_location_geonames_import/i18n/lt_LT.po
index c58b1e61c..e9fa9a1c4 100644
--- a/base_location_geonames_import/i18n/lt_LT.po
+++ b/base_location_geonames_import/i18n/lt_LT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,12 +11,14 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/23907/lt_LT/)\n"
+"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/"
+"teams/23907/lt_LT/)\n"
+"Language: lt_LT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (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
@@ -38,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +60,11 @@ msgstr "Sukurta"
 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
 msgid ""
@@ -65,7 +73,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/lv.po b/base_location_geonames_import/i18n/lv.po
index 7dc9eedd0..6fc89868e 100644
--- a/base_location_geonames_import/i18n/lv.po
+++ b/base_location_geonames_import/i18n/lv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Izveidots"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/mk.po b/base_location_geonames_import/i18n/mk.po
index f9c49b6f8..4f7c11e8f 100644
--- a/base_location_geonames_import/i18n/mk.po
+++ b/base_location_geonames_import/i18n/mk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Креирано на"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/mn.po b/base_location_geonames_import/i18n/mn.po
index bcfc07898..9417b0026 100644
--- a/base_location_geonames_import/i18n/mn.po
+++ b/base_location_geonames_import/i18n/mn.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Үүсгэсэн"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/nb.po b/base_location_geonames_import/i18n/nb.po
index 2b7e96c9e..0e71f987f 100644
--- a/base_location_geonames_import/i18n/nb.po
+++ b/base_location_geonames_import/i18n/nb.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/"
+"nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Opprettet den"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/nb_NO.po b/base_location_geonames_import/i18n/nb_NO.po
index 25634192c..dc3f9ca2f 100644
--- a/base_location_geonames_import/i18n/nb_NO.po
+++ b/base_location_geonames_import/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Laget den"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/nl.po b/base_location_geonames_import/i18n/nl.po
index 094e16afd..1fbf6a3ee 100644
--- a/base_location_geonames_import/i18n/nl.po
+++ b/base_location_geonames_import/i18n/nl.po
@@ -1,33 +1,44 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: partner-contact (9.0)\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 23:45+0000\n"
-"PO-Revision-Date: 2016-04-28 11:44+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: Dutch (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/nl/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl\n"
 "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
+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
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_title_case
-msgid "Converts retreived city and state names to Title Case."
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_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)."
 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
 msgid "Country"
 msgstr "Land"
@@ -47,16 +58,30 @@ msgstr "Aangemaakt op"
 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
 msgid ""
-"For the country selected above, this wizard will download the latest version"
-" of the list of cities from geonames.org, create new location entries if not"
-" found already in the system, and DELETE MISSING ENTRIES from new file."
+"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
+msgid "Geonames State Code Column"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:118
+#: 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
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -99,7 +124,18 @@ msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:65
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_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 "
@@ -107,12 +143,21 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_title_case
+#: selection:better.zip.geonames.import,letter_case:0
 msgid "Title Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:94
-#, python-format
-msgid "Too many states with code %s for country %s"
+#: selection:better.zip.geonames.import,letter_case:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: selection:better.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
+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 fd57a39ba..317771776 100644
--- a/base_location_geonames_import/i18n/nl_BE.po
+++ b/base_location_geonames_import/i18n/nl_BE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/"
+"nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Gemaakt op"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/nl_NL.po b/base_location_geonames_import/i18n/nl_NL.po
index 7433b8163..44cd33d8a 100644
--- a/base_location_geonames_import/i18n/nl_NL.po
+++ b/base_location_geonames_import/i18n/nl_NL.po
@@ -1,21 +1,23 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# Peter Hageman <hageman.p@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2018
+# Peter Hageman <hageman.p@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 02:48+0000\n"
-"PO-Revision-Date: 2017-06-30 02:48+0000\n"
-"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2018\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -28,7 +30,7 @@ msgstr ""
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid "Cancel"
-msgstr ""
+msgstr "Verwijderen"
 
 #. module: base_location_geonames_import
 #: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_letter_case
@@ -38,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Land"
@@ -57,6 +60,11 @@ msgstr "Aangemaakt op"
 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
 msgid ""
@@ -65,10 +73,20 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
-msgstr ""
+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
@@ -78,7 +96,7 @@ msgstr "ID"
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
 #. module: base_location_geonames_import
 #: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import
@@ -113,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/pl.po b/base_location_geonames_import/i18n/pl.po
index 203713ef0..e07e89a21 100644
--- a/base_location_geonames_import/i18n/pl.po
+++ b/base_location_geonames_import/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,13 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%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
@@ -38,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +60,11 @@ msgstr "Utworzono"
 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
 msgid ""
@@ -65,7 +73,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/pt.po b/base_location_geonames_import/i18n/pt.po
index 245882fc2..d87338483 100644
--- a/base_location_geonames_import/i18n/pt.po
+++ b/base_location_geonames_import/i18n/pt.po
@@ -1,21 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "País"
@@ -57,6 +58,11 @@ msgstr "Criado em"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/pt_BR.po b/base_location_geonames_import/i18n/pt_BR.po
index 54ce53e3d..2b48c78f9 100644
--- a/base_location_geonames_import/i18n/pt_BR.po
+++ b/base_location_geonames_import/i18n/pt_BR.po
@@ -1,21 +1,22 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "País"
@@ -57,6 +59,11 @@ msgstr "Criado em"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, 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."
@@ -95,7 +112,7 @@ 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
 msgid "Last Modified on"
-msgstr "Última atualização em"
+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
@@ -113,14 +130,19 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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)"
+"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
diff --git a/base_location_geonames_import/i18n/pt_PT.po b/base_location_geonames_import/i18n/pt_PT.po
index f59797b7d..aa52f9df0 100644
--- a/base_location_geonames_import/i18n/pt_PT.po
+++ b/base_location_geonames_import/i18n/pt_PT.po
@@ -1,22 +1,22 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Tiago Baptista <tiago@baptista.net>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-25 01:45+0000\n"
-"PO-Revision-Date: 2017-01-25 01:45+0000\n"
-"Last-Translator: Tiago Baptista <tiago@baptista.net>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -39,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "País"
@@ -58,6 +59,11 @@ msgstr "Criado em"
 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
 msgid ""
@@ -66,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:125
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -114,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:69
+#: 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 "
@@ -126,12 +148,6 @@ msgstr ""
 msgid "Title Case"
 msgstr ""
 
-#. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:101
-#, python-format
-msgid "Too many states with code %s for country %s"
-msgstr ""
-
 #. module: base_location_geonames_import
 #: selection:better.zip.geonames.import,letter_case:0
 msgid "Unchanged"
diff --git a/base_location_geonames_import/i18n/ro.po b/base_location_geonames_import/i18n/ro.po
index ca9c1dedb..a1e6da2d7 100644
--- a/base_location_geonames_import/i18n/ro.po
+++ b/base_location_geonames_import/i18n/ro.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Creat la"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/ru.po b/base_location_geonames_import/i18n/ru.po
index a00d173ae..a9d463dcb 100644
--- a/base_location_geonames_import/i18n/ru.po
+++ b/base_location_geonames_import/i18n/ru.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,13 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%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
@@ -38,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +60,11 @@ msgstr "Создан"
 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
 msgid ""
@@ -65,7 +73,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/sk.po b/base_location_geonames_import/i18n/sk.po
index 957694786..c0f2692ed 100644
--- a/base_location_geonames_import/i18n/sk.po
+++ b/base_location_geonames_import/i18n/sk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Vytvorené"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/sl.po b/base_location_geonames_import/i18n/sl.po
index ac419f7bd..83de45044 100644
--- a/base_location_geonames_import/i18n/sl.po
+++ b/base_location_geonames_import/i18n/sl.po
@@ -1,22 +1,23 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2018-01-03 20:26+0000\n"
+"PO-Revision-Date: 2018-01-03 20:26+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr "Država"
@@ -55,7 +57,12 @@ msgstr "Ustvaril"
 #. module: base_location_geonames_import
 #: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_display_name
 msgid "Display Name"
-msgstr "Prikazni naziv"
+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
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, 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."
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/sr.po b/base_location_geonames_import/i18n/sr.po
index bd76c6678..151a7bcd6 100644
--- a/base_location_geonames_import/i18n/sr.po
+++ b/base_location_geonames_import/i18n/sr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Kreiran"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/sr@latin.po b/base_location_geonames_import/i18n/sr@latin.po
index 6e9140bb5..18e2229b6 100644
--- a/base_location_geonames_import/i18n/sr@latin.po
+++ b/base_location_geonames_import/i18n/sr@latin.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,12 +11,14 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/"
+"sr@latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -38,6 +40,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +60,11 @@ msgstr "Kreiran"
 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
 msgid ""
@@ -65,7 +73,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +131,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/sv.po b/base_location_geonames_import/i18n/sv.po
index 3c3fdb055..c828c6f0e 100644
--- a/base_location_geonames_import/i18n/sv.po
+++ b/base_location_geonames_import/i18n/sv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Skapad den"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/th.po b/base_location_geonames_import/i18n/th.po
index 76c53a785..8f73d445e 100644
--- a/base_location_geonames_import/i18n/th.po
+++ b/base_location_geonames_import/i18n/th.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "สร้างเมื่อ"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/tr.po b/base_location_geonames_import/i18n/tr.po
index 61f436525..b348a83cb 100644
--- a/base_location_geonames_import/i18n/tr.po
+++ b/base_location_geonames_import/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Oluşturuldu"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/tr_TR.po b/base_location_geonames_import/i18n/tr_TR.po
index 1f2e95754..5d9c6a717 100644
--- a/base_location_geonames_import/i18n/tr_TR.po
+++ b/base_location_geonames_import/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
+"tr_TR/)\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Oluşturulma tarihi"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/uk.po b/base_location_geonames_import/i18n/uk.po
index 84bf6e0f0..be06fd79b 100644
--- a/base_location_geonames_import/i18n/uk.po
+++ b/base_location_geonames_import/i18n/uk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%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
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Дата створення"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/vi.po b/base_location_geonames_import/i18n/vi.po
index 8a34fbf5e..3da59d51b 100644
--- a/base_location_geonames_import/i18n/vi.po
+++ b/base_location_geonames_import/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +38,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +58,11 @@ msgstr "Được tạo vào"
 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
 msgid ""
@@ -65,7 +71,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +129,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/vi_VN.po b/base_location_geonames_import/i18n/vi_VN.po
index a7c67e773..e40876319 100644
--- a/base_location_geonames_import/i18n/vi_VN.po
+++ b/base_location_geonames_import/i18n/vi_VN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/"
+"teams/23907/vi_VN/)\n"
+"Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "Tạo vào"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/zh_CN.po b/base_location_geonames_import/i18n/zh_CN.po
index c6e025f94..a330a7f57 100644
--- a/base_location_geonames_import/i18n/zh_CN.po
+++ b/base_location_geonames_import/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "创建时间"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "
diff --git a/base_location_geonames_import/i18n/zh_TW.po b/base_location_geonames_import/i18n/zh_TW.po
index e51ed538d..31639e201 100644
--- a/base_location_geonames_import/i18n/zh_TW.po
+++ b/base_location_geonames_import/i18n/zh_TW.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * base_location_geonames_import
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2017-06-10 01:50+0000\n"
 "PO-Revision-Date: 2017-06-10 01:50+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/"
+"zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location_geonames_import
@@ -38,6 +39,7 @@ msgid ""
 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
 msgid "Country"
 msgstr ""
@@ -57,6 +59,11 @@ msgstr "建立於"
 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
 msgid ""
@@ -65,7 +72,17 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: 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
+msgid "Geonames State Name Column"
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:189
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr ""
@@ -113,7 +130,13 @@ msgid "Letter Case"
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: 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 "