From dfb552543f919a86685ea1abd4786f0e8df7a415 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 16 Nov 2018 09:27:15 +0000 Subject: [PATCH] [UPD] Update base_location.pot --- base_location/i18n/base_location.pot | 143 +++++++++++---------------- 1 file changed, 60 insertions(+), 83 deletions(-) diff --git a/base_location/i18n/base_location.pot b/base_location/i18n/base_location.pot index 17ed884bd..75cb6ea80 100644 --- a/base_location/i18n/base_location.pot +++ b/base_location/i18n/base_location.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,38 +14,40 @@ msgstr "" "Plural-Forms: \n" #. module: base_location -#: 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 +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: 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 -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" 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 +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_company_form_city -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -60,156 +62,131 @@ 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 -#: model:ir.ui.view,arch_db:base_location.view_country_search +#: model_terms:ir.ui.view,arch_db:base_location.view_country_search msgid "Country" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_country_state -msgid "Country state" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_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" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: 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 -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "State" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +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:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: 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 "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "You already have a city with that name in the same state.The city must have a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "You already have a zip with that code in the same city. The zip code must be unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: 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 +msgid "ZIP Location" 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" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" 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" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr ""