OCA Transbot updated translations from Transifex

base_location/i18n/am.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 03:39+0000\n"
-"PO-Revision-Date: 2017-03-10 03:39+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,11 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -71,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -93,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -119,19 +125,31 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude
+msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "ተባባሪ"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -144,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -158,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ar.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "أنشئ بواسطة"
 msgid "Created on"
 msgstr "أنشئ في"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "اسم العرض"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "الاسم"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "الشريك"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/bg.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Създадено от"
 msgid "Created on"
 msgstr "Създадено на"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Име за показване"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Име"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Партньор"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/bs.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Kreirao"
 msgid "Created on"
 msgstr "Kreirano"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Prikaži naziv"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Ime"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ca.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creat per"
 msgid "Created on"
 msgstr "Creat el"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Veure el nom"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nom"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/cs.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Vytvořil(a)"
 msgid "Created on"
 msgstr "Vytvořeno"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Zobrazovaný název"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Název"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Společník"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/da.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr "Byer"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Byer/Loaktions administration"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "By"
@@ -56,12 +51,6 @@ msgstr "Postnummer"
 msgid "City completion"
 msgstr "Slå by/postnummer op"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Postnr/by "
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Virksomheder"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Oprettet af"
 msgid "Created on"
 msgstr "Oprettet den"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Vist navn"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Postnr/by "
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Navn"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Søg by"
 msgid "State"
 msgstr "Delstat"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Postnummer"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Søg på bynavn eller postnummer"
 
@@ -169,3 +212,10 @@ msgstr "Søg på bynavn eller postnummer"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "Postnr."
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/de.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr "Orte"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Standorte-Verwaltung"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Stadt"
@@ -56,12 +51,6 @@ msgstr "Ortskennung"
 msgid "City completion"
 msgstr "Orts-Vervollständigung"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Stadt/Standort"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr "Stadt/Standorte-Vervollständungsobjekt"
 msgid "Companies"
 msgstr "Unternehmen"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "erstellt von"
 msgid "Created on"
 msgstr "erstellt am"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Standort"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Bezeichnung"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Suche Ort"
 msgid "State"
 msgstr "Bundesland"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Die offizielle Kennung der Stadt"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 "Verwenden Sie den Stadtnamen oder die PLZ, um nach diesem Standort zu suchen"
@@ -170,3 +213,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "PLZ"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/el_GR.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Δημιουργήθηκε από "
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Ονομασία"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Συνεργάτης"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/en_GB.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Created by"
 msgid "Created on"
 msgstr "Created on"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Display Name"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Name"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
-msgstr "Ciudades/Ubicaciones"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
+msgstr ""
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
@@ -29,18 +32,10 @@ msgstr "Ciudades/Ubicaciones"
 msgid "Cities"
 msgstr "Ciudades"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr "Ciudades/Ubicaciones"
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Ciudad/Ubicaciones"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Ciudad"
@@ -56,12 +51,6 @@ msgstr "Código de ciudad"
 msgid "City completion"
 msgstr "Autocompletado a partir de la ciudad"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Ciudad/Ubicación"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr "Autocompletado de objetos a partir de ciudades/ubicaciones"
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Ubicación"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Buscar ciudad"
 msgid "State"
 msgstr "Provincia"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "El código oficial para la ciudad"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 "Utilice el nombre de ciudad o el código postal para buscar la ubicación"
@@ -170,3 +213,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "C.P."
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_AR.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Mostrar Nombre"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_CL.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_CO.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre Público"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_CR.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_DO.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_EC.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_ES.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre para mostrar"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_MX.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre desplegado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_PE.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nombre a Mostrar"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_PY.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/es_VE.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Mostrar nombre"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/et.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Loonud"
 msgid "Created on"
 msgstr "Loodud"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Näidatav nimi"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nimi"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/eu.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Nork sortua"
 msgid "Created on"
 msgstr "Created on"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Izena erakutsi"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Izena"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Kidea"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/fa.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "ایجاد شده توسط"
 msgid "Created on"
 msgstr "ایجاد شده در"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "نام نمایشی"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "نام"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/fi.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Luonut"
 msgid "Created on"
 msgstr "Luotu"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nimi"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nimi"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Kumppani"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr "Tila"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/fr.po

@@ -3,15 +3,15 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# leemannd <denis.leemann@camptocamp.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Nicolas JEUDY <njeudy@panda-chi.io>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: leemannd <denis.leemann@camptocamp.com>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@panda-chi.io>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
-msgstr "Villes / lieux"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
+msgstr ""
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
@@ -30,18 +33,10 @@ msgstr "Villes / lieux"
 msgid "Cities"
 msgstr "Villes"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr "Villes / Lieux"
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Cities/Locations Management"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Ville"
@@ -57,12 +52,6 @@ msgstr "Code de la ville"
 msgid "City completion"
 msgstr "Complétion par ville"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Ville/location"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -73,6 +62,11 @@ msgstr "Objet de compléte de Ville / lieux"
 msgid "Companies"
 msgstr "Sociétés"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr "Contacte"
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -95,6 +89,17 @@ msgstr "Créé par"
 msgid "Created on"
 msgstr "Créé le"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Intitulé"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -123,27 +128,29 @@ msgstr "Mis à jour le"
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude
 msgid "Latitude"
-msgstr ""
+msgstr "Latitude"
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nom"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr "Longitude"
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -156,13 +163,49 @@ msgstr "Rechercher ville"
 msgid "State"
 msgstr "Etat"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Code officiel de la ville"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Utilisez le nom de la ville ou le zip lors des recherches"
 
@@ -170,3 +213,10 @@ msgstr "Utilisez le nom de la ville ou le zip lors des recherches"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "ZIP"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr "Code postal"

base_location/i18n/fr_CA.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Créé par"
 msgid "Created on"
 msgstr "Créé le"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Afficher le nom"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nom"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/fr_CH.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Créé par"
 msgid "Created on"
 msgstr "Créé le"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/gl.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nome"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/he.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "נוצר על ידי"
 msgid "Created on"
 msgstr "נוצר ב-"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "השם המוצג"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "שם"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/hr.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Kreirao"
 msgid "Created on"
 msgstr "Kreirano"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Naziv za prikaz"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naziv"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/hr_HR.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,12 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
-msgstr "Gradovi / Lokacije"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
+msgstr ""
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
@@ -29,18 +32,10 @@ msgstr "Gradovi / Lokacije"
 msgid "Cities"
 msgstr "Gradovi"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr "Gradovi / Lokacije"
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Upravljanje gradovima/lokacijama"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Grad"
@@ -56,12 +51,6 @@ msgstr "Šifra grada"
 msgid "City completion"
 msgstr "Popunjavanje grada"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Grad/Lokacija"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr "Objekt popunjavanja Grada/Lokacije"
 msgid "Companies"
 msgstr "Poduzeća"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Kreirao"
 msgid "Created on"
 msgstr "Kreirano"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Naziv"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Lokacija"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naziv"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Pretraži gradove"
 msgid "State"
 msgstr "Oblast/Županija"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Službena šifra ovog grada"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Koristite naziv ili šifru grada za pretraživanje"
 
@@ -169,3 +212,10 @@ msgstr "Koristite naziv ili šifru grada za pretraživanje"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "ZIP"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/hu.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Készítette"
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Név megjelenítése"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Név"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/id.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Dibuat oleh"
 msgid "Created on"
 msgstr "Dibuat pada"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nama Tampilan"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nama"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/it.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
-msgstr "Città/luoghi"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
+msgstr ""
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
@@ -29,18 +32,10 @@ msgstr "Città/luoghi"
 msgid "Cities"
 msgstr "Città"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr "Città/luoghi"
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Gestione Città/Locazioni"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Città"
@@ -56,12 +51,6 @@ msgstr "Codice Città"
 msgid "City completion"
 msgstr "Completamento città"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Città/Locazione"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr "Città/luoghi di completamento oggetto"
 msgid "Companies"
 msgstr "Aziende"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creato da"
 msgid "Created on"
 msgstr "Creato il"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nome da visualizzare"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Locazione"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nome"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Ricerca città"
 msgid "State"
 msgstr "Provincia"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Il codice ufficiale per la città"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Usare il nome della città o il codice CAP per ricercare la locazione"
 
@@ -169,3 +212,10 @@ msgstr "Usare il nome della città o il codice CAP per ricercare la locazione"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "CAP"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ja.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "作成者"
 msgid "Created on"
 msgstr "作成日"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "表示名"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "名称"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "パートナ"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ko.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "작성자"
 msgid "Created on"
 msgstr "작성일"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "표시 이름"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "이름"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/lt.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Sukūrė"
 msgid "Created on"
 msgstr "Sukurta"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Vaizduojamas pavadinimas"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Pavadinimas"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/lv.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Izveidoja"
 msgid "Created on"
 msgstr "Izveidots"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nosaukums"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/mk.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Креирано од"
 msgid "Created on"
 msgstr "Креирано на"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Прикажи име"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Име"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Партнер"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/mn.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Үүсгэгч"
 msgid "Created on"
 msgstr "Үүсгэсэн"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Дэлгэцийн Нэр"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Нэр"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Харилцагч"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/nb.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Opprettet av"
 msgid "Created on"
 msgstr "Opprettet den"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Visnings navn"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Navn"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/nb_NO.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Laget av"
 msgid "Created on"
 msgstr "Laget den"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Vis navn"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/nl.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Plaats"
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Plaats/Locatie"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Aangemaakt door"
 msgid "Created on"
 msgstr "Aangemaakt op"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Te tonen naam"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naam"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/nl_BE.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Gemaakt door"
 msgid "Created on"
 msgstr "Gemaakt op"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Schermnaam"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naam:"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/nl_NL.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# Peter Hageman <hageman.p@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Plaats"
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Bedrijven"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Aangemaakt door"
 msgid "Created on"
 msgstr "Aangemaakt op"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Weergavenaam"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr "Breedtegraad"
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
-msgstr "Lengtegraad"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naam"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr "Lengtegraad"
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Gebruik de plaatsnaam of de postcode om de locatie te bepalen"
 
@@ -169,3 +212,10 @@ msgstr "Gebruik de plaatsnaam of de postcode om de locatie te bepalen"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "Postcode"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/pl.po

@@ -6,21 +6,24 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Utworzone przez"
 msgid "Created on"
 msgstr "Utworzono"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Wyświetlana nazwa "
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nazwa"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/pt.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Criado por"
 msgid "Created on"
 msgstr "Criado em"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nome a Apresentar"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nome"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/pt_BR.po

@@ -3,15 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# falexandresilva <falexandresilva@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: falexandresilva <falexandresilva@gmail.com>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -30,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr "Cidades"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr "Cidades/Locais"
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Gerenciamento Cidade/Locais"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Cidade"
@@ -57,12 +51,6 @@ msgstr "Código da cidade"
 msgid "City completion"
 msgstr "Autocompletar de cidades"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Cidade/Localização"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -73,6 +61,11 @@ msgstr "Objeto autocompletar de Cidades/Locais"
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -95,6 +88,17 @@ msgstr "Criado por"
 msgid "Created on"
 msgstr "Criado em"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nome a mostrar"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -126,24 +130,26 @@ msgid "Latitude"
 msgstr "Latitude"
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Localização"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
-msgstr "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nome"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr "Longitude"
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -156,13 +162,49 @@ msgstr "Buscar cidade"
 msgid "State"
 msgstr "Estado"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "O código oficial da cidade"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Use o nome da cidade ou o CEP para pesquisar a localização"
 
@@ -170,3 +212,10 @@ msgstr "Use o nome da cidade ou o CEP para pesquisar a localização"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "CEP"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/pt_PT.po

@@ -3,15 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Tiago Baptista <tiago@baptista.net>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-20 18:18+0000\n"
-"PO-Revision-Date: 2017-01-20 18:18+0000\n"
-"Last-Translator: Tiago Baptista <tiago@baptista.net>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -30,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr "Cidades"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Cidade"
@@ -57,11 +51,6 @@ msgstr "Código da Cidade"
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Criado por"
 msgid "Created on"
 msgstr "Criado em"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nome"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -120,19 +125,31 @@ msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Local"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude
+msgid "Latitude"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nome"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -145,13 +162,49 @@ msgstr "Procurar cidade"
 msgid "State"
 msgstr "Estado"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Código oficial da cidade"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Utilize o nome da cidade ou o código postal para pesquisar o local"
 
@@ -159,3 +212,10 @@ msgstr "Utilize o nome da cidade ou o código postal para pesquisar o local"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "Código Postal"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ro.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Creat de"
 msgid "Created on"
 msgstr "Creat la"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Nume Afişat"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Nume"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partener"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/ru.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Создано"
 msgid "Created on"
 msgstr "Создан"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Название"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Контрагент"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/sk.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Vytvoril"
 msgid "Created on"
 msgstr "Vytvorené"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Zobraziť meno"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Meno"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/sl.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:42+0000\n"
-"PO-Revision-Date: 2017-05-01 20:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr "Kraji"
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr "Kraji/Upravljanje lokacij"
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr "Kraj"
@@ -56,12 +51,6 @@ msgstr "Koda kraja"
 msgid "City completion"
 msgstr "Izpolnjevanje kraja"
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr "Kraj/Lokacija"
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr "Objekt izpolnjevanja kraja/lokacije"
 msgid "Companies"
 msgstr "Družbe"
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Ustvaril"
 msgid "Created on"
 msgstr "Ustvarjeno"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Prikazni naziv"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
-msgstr "Lokacija"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Naziv"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr "Iskanje kraja"
 msgid "State"
 msgstr "Zvezna država"
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Uradna koda kraja"
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr "Iskanje lokacije z uporabo imena kraja ali poštne številke"
 
@@ -169,3 +212,10 @@ msgstr "Iskanje lokacije z uporabo imena kraja ali poštne številke"
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr "Poštna številka"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/sr.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr ""
 msgid "Created on"
 msgstr "Kreiran"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Ime"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/sr@latin.po

@@ -6,12 +6,12 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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%40latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Kreirao"
 msgid "Created on"
 msgstr "Kreiran"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Ime za prikaz"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Ime:"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/sv.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Skapad av"
 msgid "Created on"
 msgstr "Skapad den"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Visa namn"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Namn"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Företag"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/th.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "สร้างโดย"
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "ชื่อที่ใช้แสดง"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "ชื่อ"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "พาร์ทเนอร์"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/tr.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Oluşturan"
 msgid "Created on"
 msgstr "Oluşturuldu"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Görünen İsim"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Adı"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "İş Ortağı"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/tr_TR.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Oluşturan"
 msgid "Created on"
 msgstr "Oluşturulma tarihi"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Görünen ad"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Ad"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Ortak"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/uk.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "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
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Створив"
 msgid "Created on"
 msgstr "Дата створення"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Назва для відображення"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Name"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/vi.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Được tạo bởi"
 msgid "Created on"
 msgstr "Được tạo vào"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "Tên hiển thị"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Tên"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "Đối tác"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/vi_VN.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "Tạo bởi"
 msgid "Created on"
 msgstr "Tạo vào"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,23 +130,25 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "Tên"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
 msgstr ""
 
 #. module: base_location
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/zh_CN.po

@@ -3,14 +3,14 @@
 # * base_location
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "创建者"
 msgid "Created on"
 msgstr "创建时间"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "名称"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "业务伙伴"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location/i18n/zh_TW.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_location
-#: model:ir.actions.act_window,name:base_location.action_zip_tree
-msgid "Cites/locations"
+#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities
+msgid ""
+"Check this box to ensure every address created in that country has a 'City' "
+"chosen in the list of the country's cities."
 msgstr ""
 
 #. module: base_location
@@ -29,18 +32,10 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_menu
-msgid "Cities/Locations"
-msgstr ""
-
-#. module: base_location
-#: model:ir.ui.menu,name:base_location.locations_root_menu
-msgid "Cities/Locations Management"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id
+#: model:ir.model.fields,field_description:base_location.field_res_company_city_id
 #: model:ir.ui.view,arch_db:base_location.better_zip_form
 msgid "City"
 msgstr ""
@@ -56,12 +51,6 @@ msgstr ""
 msgid "City completion"
 msgstr ""
 
-#. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
-#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
-msgid "City/Location"
-msgstr ""
-
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_better_zip
 msgid "City/locations completion object"
@@ -72,6 +61,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -94,6 +88,17 @@ msgstr "建立者"
 msgid "Created on"
 msgstr "建立於"
 
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Display Name"
+msgstr "顯示名稱"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities
+#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
@@ -125,24 +130,26 @@ msgid "Latitude"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
-msgid "Location"
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "Location completion"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
-msgid "Longitude"
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+#: model:ir.ui.menu,name:base_location.locations_menu
+#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
+msgid "Locations"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
-msgid "Name"
-msgstr "名稱"
+#: model:ir.ui.menu,name:base_location.locations_root_menu
+msgid "Locations Management"
+msgstr ""
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_partner
-msgid "Partner"
-msgstr "夥伴"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude
+msgid "Longitude"
+msgstr ""
 
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
@@ -155,13 +162,49 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_location
+#: code:addons/base_location/models/partner.py:64
+#, python-format
+msgid "The city of partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:93
+#, python-format
+msgid "The country of the city differs from the country in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:60
+#, python-format
+msgid "The country of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/better_zip.py:88
+#, python-format
+msgid "The country of the state differs from the country in location %s"
+msgstr ""
+
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr ""
 
 #. module: base_location
-#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+#: code:addons/base_location/models/better_zip.py:98
+#, python-format
+msgid "The state of the city differs from the state in location %s"
+msgstr ""
+
+#. module: base_location
+#: code:addons/base_location/models/partner.py:56
+#, python-format
+msgid "The state of the partner %s differs from that in location %s"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_zip_id
 msgid "Use the city name or the zip code to search the location"
 msgstr ""
 
@@ -169,3 +212,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
 msgid "ZIP"
 msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id
+msgid "ZIP Location"
+msgstr ""

base_location_geonames_import/i18n/de.po

@@ -3,14 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,6 +57,11 @@ msgstr "erstellt am"
 msgid "Display Name"
 msgstr "Anzeigename"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -65,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Erhielt einen Fehler %d beim Versuch die Datei %s herunter zu laden."
@@ -113,7 +118,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 "

base_location_geonames_import/i18n/es.po

@@ -3,15 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,6 +62,11 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -73,7 +77,7 @@ msgstr ""
 "país seleccionado."
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Se obtuvo un error %d cuando se descargaba el archivo %s."
@@ -121,7 +125,13 @@ msgid "Letter Case"
 msgstr "Capitalización"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "The city will be created as a separate entity."
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
 #, python-format
 msgid ""
 "The country code inside the file (%s) doesn't correspond to the selected "

base_location_geonames_import/i18n/fr.po

@@ -3,14 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,6 +57,11 @@ msgstr "Créé le"
 msgid "Display Name"
 msgstr "Intitulé"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -65,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Erreur %d reçue suite à la tentative de téléchargement du fichier %s."
@@ -113,7 +118,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 "

base_location_geonames_import/i18n/hr_HR.po

@@ -3,15 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
-# Bole <bole@dajmi5.com>, 2017
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,6 +57,11 @@ msgstr "Kreirano"
 msgid "Display Name"
 msgstr "Naziv"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -66,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Pogreška : %d pri pokušaju preuzimanja datoteke %s."
@@ -114,7 +118,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 "

base_location_geonames_import/i18n/it.po

@@ -3,14 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,6 +62,11 @@ msgstr "Creato il"
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -72,7 +77,7 @@ msgstr ""
 " lista delle città"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Errore %d mentre si stava scaricando il file %s."
@@ -120,7 +125,13 @@ msgid "Letter Case"
 msgstr "Maiuscolo/Minuscolo"
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:71
+#: model:ir.model.fields,help:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "The city will be created as a separate entity."
+msgstr ""
+
+#. module: base_location_geonames_import
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:96
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:124
 #, python-format
 msgid ""
 "The country code inside the file (%s) doesn't correspond to the selected "

base_location_geonames_import/i18n/pt_BR.po

@@ -3,14 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,6 +57,11 @@ msgstr "Criado em"
 msgid "Display Name"
 msgstr "Nome a mostrar"
 
+#. module: base_location_geonames_import
+#: model:ir.model.fields,field_description:base_location_geonames_import.field_better_zip_geonames_import_enforce_cities
+msgid "Enforce Cities"
+msgstr ""
+
 #. module: base_location_geonames_import
 #: model:ir.ui.view,arch_db:base_location_geonames_import.better_zip_geonames_import_form
 msgid ""
@@ -65,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Recebido um erro %d ao tentar o download do arquivo %s."
@@ -113,7 +118,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 "

base_location_geonames_import/i18n/sl.po

@@ -3,14 +3,14 @@
 # * base_location_geonames_import
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 00:41+0000\n"
-"PO-Revision-Date: 2017-04-24 00:41+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,6 +57,11 @@ msgstr "Ustvaril"
 msgid "Display Name"
 msgstr "Prikazni 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 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_location_geonames_import
-#: code:addons/base_location_geonames_import/wizard/geonames_import.py:129
+#: code:addons/base_location_geonames_import/wizard/geonames_import.py:185
 #, python-format
 msgid "Got an error %d when trying to download the file %s."
 msgstr "Prišlo je do napake %d pri poizkusu prenosa datoteke %s."
@@ -113,7 +118,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 "

partner_external_map/i18n/am.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 03:39+0000\n"
-"PO-Revision-Date: 2017-03-10 03:39+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ msgid "Address missing on partner '%s'."
 msgstr ""
 
 #. module: partner_external_map
-#: model:ir.model.fields,field_description:partner_external_map.field_res_users_zip_id
-msgid "City/Location"
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
 msgstr ""
 
 #. module: partner_external_map
@@ -159,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "ተባባሪ"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"
@@ -189,11 +184,6 @@ msgstr ""
 msgid "Start Address for Route Map"
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model.fields,field_description:partner_external_map.field_res_users_street3
-msgid "Street 3"
-msgstr ""
-
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_lat_lon_url
 msgid "URL that uses latitude and longitude"

partner_external_map/i18n/ar.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "الشريك"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/bg.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Партньор"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/bs.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/ca.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/cs.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Společník"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/da.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/de.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:43+0000\n"
-"PO-Revision-Date: 2017-05-01 20:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr "Adresse zum Partner '%s' fehlt."
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -173,11 +178,6 @@ msgstr ""
 "Fehlender Ausgangsadresse in Routenkarte: Sie müssen diesen in Ihren "
 "Präferenzen einstellen."
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/el_GR.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 03:39+0000\n"
-"PO-Revision-Date: 2017-03-10 03:39+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ msgid "Address missing on partner '%s'."
 msgstr ""
 
 #. module: partner_external_map
-#: model:ir.model.fields,field_description:partner_external_map.field_res_users_zip_id
-msgid "City/Location"
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
 msgstr ""
 
 #. module: partner_external_map
@@ -159,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Συνεργάτης"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"
@@ -189,11 +184,6 @@ msgstr ""
 msgid "Start Address for Route Map"
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model.fields,field_description:partner_external_map.field_res_users_street3
-msgid "Street 3"
-msgstr ""
-
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_lat_lon_url
 msgid "URL that uses latitude and longitude"

partner_external_map/i18n/en_GB.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/es.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:43+0000\n"
-"PO-Revision-Date: 2017-05-01 20:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr "Falta la dirección del socio '%s'."
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -170,11 +175,6 @@ msgstr ""
 "Falta la dirección de origen para el mapa de la ruta: debes establecerlo en "
 "tus preferencias."
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Socio"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/es_CR.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/es_EC.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/es_MX.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/es_VE.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/et.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/eu.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Kidea"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/fi.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-21 03:40+0000\n"
-"PO-Revision-Date: 2016-12-21 03:40+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Kumppani"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"
@@ -184,11 +184,6 @@ msgstr ""
 msgid "Start Address for Route Map"
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model.fields,field_description:partner_external_map.field_res_users_street3
-msgid "Street 3"
-msgstr ""
-
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_lat_lon_url
 msgid "URL that uses latitude and longitude"

partner_external_map/i18n/fr.po

@@ -3,14 +3,15 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Nicolas JEUDY <njeudy@panda-chi.io>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:43+0000\n"
-"PO-Revision-Date: 2017-05-01 20:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@panda-chi.io>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +25,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr "Adresse manquante sur le partenaire '%s'."
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr "Contacte"
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -47,7 +53,7 @@ msgstr "ID"
 #. module: partner_external_map
 #: model:ir.model.fields,help:partner_external_map.field_map_website_address_url
 msgid "In this URL, {ADDRESS} will be replaced by the address."
-msgstr ""
+msgstr "Dans cette URL, {ADDRESS} sera remplacé par l'adresse."
 
 #. module: partner_external_map
 #: model:ir.model.fields,help:partner_external_map.field_map_website_lat_lon_url
@@ -55,6 +61,8 @@ msgid ""
 "In this URL, {LATITUDE} and {LONGITUDE} will be replaced by the latitude and"
 " longitude (requires the module 'base_geolocalize')"
 msgstr ""
+"Dans cette URL, {LATITUDE} et {LONGITUDE} seront remplacés par la latitude "
+"et la longitude (necessite l'installation du module 'base_geolocalize')"
 
 #. module: partner_external_map
 #: model:ir.model.fields,help:partner_external_map.field_map_website_route_address_url
@@ -62,6 +70,8 @@ msgid ""
 "In this URL, {START_ADDRESS} and {DEST_ADDRESS} will be replaced by the "
 "start and destination addresses."
 msgstr ""
+"Dans cette URL, {START_ADDRESS} et {DEST_ADDRESS} seront respectivement "
+"remplacés par l'adresse de départ et l'adresse de destination."
 
 #. module: partner_external_map
 #: model:ir.model.fields,help:partner_external_map.field_map_website_route_lat_lon_url
@@ -70,6 +80,10 @@ msgid ""
 "{DEST_LONGITUDE} will be replaced by the latitude and longitude of the start"
 " and destination adresses (requires the module 'base_geolocalize')."
 msgstr ""
+"Dans cette URL, {START_LATITUDE}, {START_LONGITUDE}, {DEST_LATITUDE} et "
+"{DEST_LONGITUDE} seront respectivement remplacés par la latitude et la "
+"longitude de l'adresse de départ et de l'adresse de destination (nécessite "
+"l'installation du module 'base_geolocalize')."
 
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website___last_update
@@ -121,13 +135,15 @@ msgstr ""
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_users_form
 msgid "Maps"
-msgstr ""
+msgstr "Cartes"
 
 #. module: partner_external_map
 #: code:addons/partner_external_map/models/res_partner.py:52
 #, python-format
 msgid "Missing map provider: you should set it in your preferences."
 msgstr ""
+"Il manque le service de cartes: vous devriez le configurer dans vos "
+"préférences."
 
 #. module: partner_external_map
 #: code:addons/partner_external_map/models/res_partner.py:63
@@ -154,11 +170,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/fr_CA.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/fr_CH.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+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"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/gl.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/hr.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/hr_HR.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:43+0000\n"
-"PO-Revision-Date: 2017-05-01 20:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr "Nedostaje adresa na partneru : '%s'."
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/hu.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/it.po

@@ -3,14 +3,14 @@
 # * partner_external_map
 # 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016
+# OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 20:43+0000\n"
-"PO-Revision-Date: 2017-05-01 20:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"

partner_external_map/i18n/ja.po

@@ -6,10 +6,10 @@
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 01:50+0000\n"
-"PO-Revision-Date: 2017-06-10 01:50+0000\n"
+"POT-Creation-Date: 2017-11-22 03:38+0000\n"
+"PO-Revision-Date: 2017-11-22 03:38+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,11 @@ msgstr ""
 msgid "Address missing on partner '%s'."
 msgstr ""
 
+#. module: partner_external_map
+#: model:ir.model,name:partner_external_map.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: partner_external_map
 #: model:ir.model.fields,field_description:partner_external_map.field_map_website_create_uid
 msgid "Created by"
@@ -154,11 +159,6 @@ msgid ""
 "Missing start address for route map: you should set it in your preferences."
 msgstr ""
 
-#. module: partner_external_map
-#: model:ir.model,name:partner_external_map.model_res_partner
-msgid "Partner"
-msgstr "パートナ"
-
 #. module: partner_external_map
 #: model:ir.ui.view,arch_db:partner_external_map.view_partner_form
 msgid "Route Map"