[UPD] Update base_location_geonames_import.pot

7 years ago · cac8f69523
69 changed files with 1768 additions and 318 deletions
--- a/base_location_geonames_import/i18n/am.po
+++ b/base_location_geonames_import/i18n/am.po
@ -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 ""
--- a/base_location_geonames_import/i18n/ar.po
+++ b/base_location_geonames_import/i18n/ar.po
@ -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 "
--- a/base_location_geonames_import/i18n/base_location_geonames_import.pot
+++ 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 ""
+
--- a/base_location_geonames_import/i18n/bg.po
+++ b/base_location_geonames_import/i18n/bg.po
@ -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 "
--- a/base_location_geonames_import/i18n/bs.po
+++ b/base_location_geonames_import/i18n/bs.po
@ -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 "
--- a/base_location_geonames_import/i18n/ca.po
+++ b/base_location_geonames_import/i18n/ca.po
@ -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 "
--- a/base_location_geonames_import/i18n/cs.po
+++ b/base_location_geonames_import/i18n/cs.po
@ -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 "
--- a/base_location_geonames_import/i18n/da.po
+++ b/base_location_geonames_import/i18n/da.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/de.po
+++ b/base_location_geonames_import/i18n/de.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/el_GR.po
+++ b/base_location_geonames_import/i18n/el_GR.po
@ -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 ""
--- a/base_location_geonames_import/i18n/en_GB.po
+++ b/base_location_geonames_import/i18n/en_GB.po
@ -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 "
--- a/base_location_geonames_import/i18n/es.po
+++ b/base_location_geonames_import/i18n/es.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/es_AR.po
+++ b/base_location_geonames_import/i18n/es_AR.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_CL.po
+++ b/base_location_geonames_import/i18n/es_CL.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_CO.po
+++ b/base_location_geonames_import/i18n/es_CO.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_CR.po
+++ b/base_location_geonames_import/i18n/es_CR.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_DO.po
+++ b/base_location_geonames_import/i18n/es_DO.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_EC.po
+++ b/base_location_geonames_import/i18n/es_EC.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_ES.po
+++ b/base_location_geonames_import/i18n/es_ES.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_MX.po
+++ b/base_location_geonames_import/i18n/es_MX.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_PE.po
+++ b/base_location_geonames_import/i18n/es_PE.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_PY.po
+++ b/base_location_geonames_import/i18n/es_PY.po
@ -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 "
--- a/base_location_geonames_import/i18n/es_VE.po
+++ b/base_location_geonames_import/i18n/es_VE.po
@ -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 "
--- a/base_location_geonames_import/i18n/et.po
+++ b/base_location_geonames_import/i18n/et.po
@ -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 "
--- a/base_location_geonames_import/i18n/eu.po
+++ b/base_location_geonames_import/i18n/eu.po
@ -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 "
--- a/base_location_geonames_import/i18n/fa.po
+++ b/base_location_geonames_import/i18n/fa.po
@ -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 "
--- a/base_location_geonames_import/i18n/fi.po
+++ b/base_location_geonames_import/i18n/fi.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/fr.po
+++ b/base_location_geonames_import/i18n/fr.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/fr_CA.po
+++ b/base_location_geonames_import/i18n/fr_CA.po
@ -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 "
--- a/base_location_geonames_import/i18n/fr_CH.po
+++ b/base_location_geonames_import/i18n/fr_CH.po
@ -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 "
--- a/base_location_geonames_import/i18n/gl.po
+++ b/base_location_geonames_import/i18n/gl.po
@ -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 "
--- a/base_location_geonames_import/i18n/gl_ES.po
+++ b/base_location_geonames_import/i18n/gl_ES.po
@ -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 "
--- a/base_location_geonames_import/i18n/he.po
+++ b/base_location_geonames_import/i18n/he.po
@ -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 "
--- a/base_location_geonames_import/i18n/hr.po
+++ b/base_location_geonames_import/i18n/hr.po
@ -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 "
--- a/base_location_geonames_import/i18n/hr_HR.po
+++ b/base_location_geonames_import/i18n/hr_HR.po
@ -11,12 +11,14 @@ msgstr ""
 "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-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
--- a/base_location_geonames_import/i18n/hu.po
+++ b/base_location_geonames_import/i18n/hu.po
@ -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 "
--- a/base_location_geonames_import/i18n/id.po
+++ b/base_location_geonames_import/i18n/id.po
@ -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 "
--- a/base_location_geonames_import/i18n/it.po
+++ b/base_location_geonames_import/i18n/it.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/ja.po
+++ b/base_location_geonames_import/i18n/ja.po
@ -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 "
--- a/base_location_geonames_import/i18n/ko.po
+++ b/base_location_geonames_import/i18n/ko.po
@ -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 "
--- a/base_location_geonames_import/i18n/lt.po
+++ b/base_location_geonames_import/i18n/lt.po
@ -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 "
--- a/base_location_geonames_import/i18n/lt_LT.po
+++ b/base_location_geonames_import/i18n/lt_LT.po
@ -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 "
--- a/base_location_geonames_import/i18n/lv.po
+++ b/base_location_geonames_import/i18n/lv.po
@ -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 "
--- a/base_location_geonames_import/i18n/mk.po
+++ b/base_location_geonames_import/i18n/mk.po
@ -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 "
--- a/base_location_geonames_import/i18n/mn.po
+++ b/base_location_geonames_import/i18n/mn.po
@ -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 "
--- a/base_location_geonames_import/i18n/nb.po
+++ b/base_location_geonames_import/i18n/nb.po
@ -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 "
--- a/base_location_geonames_import/i18n/nb_NO.po
+++ b/base_location_geonames_import/i18n/nb_NO.po
@ -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 "
--- a/base_location_geonames_import/i18n/nl.po
+++ b/base_location_geonames_import/i18n/nl.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/nl_BE.po
+++ b/base_location_geonames_import/i18n/nl_BE.po
@ -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 "
--- a/base_location_geonames_import/i18n/nl_NL.po
+++ b/base_location_geonames_import/i18n/nl_NL.po
@ -12,11 +12,12 @@ msgstr ""
 "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-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
--- a/base_location_geonames_import/i18n/pl.po
+++ b/base_location_geonames_import/i18n/pl.po
@ -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 "
--- a/base_location_geonames_import/i18n/pt.po
+++ b/base_location_geonames_import/i18n/pt.po
@ -12,10 +12,10 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/pt_BR.po
+++ b/base_location_geonames_import/i18n/pt_BR.po
@ -11,11 +11,12 @@ msgstr ""
 "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-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
@ -141,8 +142,7 @@ 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
--- a/base_location_geonames_import/i18n/pt_PT.po
+++ b/base_location_geonames_import/i18n/pt_PT.po
@ -11,11 +11,12 @@ msgstr ""
 "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-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
--- a/base_location_geonames_import/i18n/ro.po
+++ b/base_location_geonames_import/i18n/ro.po
@ -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 "
--- a/base_location_geonames_import/i18n/ru.po
+++ b/base_location_geonames_import/i18n/ru.po
@ -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 "
--- a/base_location_geonames_import/i18n/sk.po
+++ b/base_location_geonames_import/i18n/sk.po
@ -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 "
--- a/base_location_geonames_import/i18n/sl.po
+++ b/base_location_geonames_import/i18n/sl.po
@ -12,11 +12,12 @@ msgstr ""
 "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
--- a/base_location_geonames_import/i18n/sr.po
+++ b/base_location_geonames_import/i18n/sr.po
@ -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 "
--- a/base_location_geonames_import/i18n/sr@latin.po
+++ b/base_location_geonames_import/i18n/sr@latin.po
@ -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 "
--- a/base_location_geonames_import/i18n/sv.po
+++ b/base_location_geonames_import/i18n/sv.po
@ -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 "
--- a/base_location_geonames_import/i18n/th.po
+++ b/base_location_geonames_import/i18n/th.po
@ -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 "
--- a/base_location_geonames_import/i18n/tr.po
+++ b/base_location_geonames_import/i18n/tr.po
@ -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 "
--- a/base_location_geonames_import/i18n/tr_TR.po
+++ b/base_location_geonames_import/i18n/tr_TR.po
@ -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 "
--- a/base_location_geonames_import/i18n/uk.po
+++ b/base_location_geonames_import/i18n/uk.po
@ -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 "
--- a/base_location_geonames_import/i18n/vi.po
+++ b/base_location_geonames_import/i18n/vi.po
@ -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 "
--- a/base_location_geonames_import/i18n/vi_VN.po
+++ b/base_location_geonames_import/i18n/vi_VN.po
@ -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 "
--- a/base_location_geonames_import/i18n/zh_CN.po
+++ b/base_location_geonames_import/i18n/zh_CN.po
@ -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 "
--- a/base_location_geonames_import/i18n/zh_TW.po
+++ b/base_location_geonames_import/i18n/zh_TW.po
@ -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 "