diff --git a/base_location/i18n/am.po b/base_location/i18n/am.po index 1b9abbf71be..3c6e925d144 100644 --- a/base_location/i18n/am.po +++ b/base_location/i18n/am.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n" +"Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: am\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ar.po b/base_location/i18n/ar.po index ffc7d31e032..036856d904d 100644 --- a/base_location/i18n/ar.po +++ b/base_location/i18n/ar.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/base_location.pot b/base_location/i18n/base_location.pot index 078e79ab292..17ed884bd78 100644 --- a/base_location/i18n/base_location.pot +++ b/base_location/i18n/base_location.pot @@ -1,13 +1,11 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-12 22:33+0000\n" -"PO-Revision-Date: 2013-12-12 22:33+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,34 +14,39 @@ msgstr "" "Plural-Forms: \n" #. module: base_location -#: model:ir.actions.act_window,name:base_location.action_zip_tree -msgid "Cites/locations Management" +#: 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 -#: field:res.better.zip,city:0 -msgid "City" +#: 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 +msgid "Cities" msgstr "" #. module: base_location -#: view:res.better.zip:0 -#: field:res.better.zip,name:0 -msgid "ZIP" +#: 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 "" #. module: base_location -#: field:res.better.zip,state_id:0 -msgid "State" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code +msgid "City Code" msgstr "" #. module: base_location -#: field:res.better.zip,country_id:0 -msgid "Country" +#: model:ir.ui.view,arch_db:base_location.view_company_form_city +#: model:ir.ui.view,arch_db:base_location.view_partner_form +msgid "City completion" msgstr "" #. module: base_location -#: field:res.better.zip,priority:0 -msgid "Priority" +#: model:ir.model,name:base_location.model_res_better_zip +msgid "City/locations completion object" msgstr "" #. module: base_location @@ -52,63 +55,161 @@ msgid "Companies" msgstr "" #. module: base_location -#: field:res.better.zip,code:0 -msgid "City Code" +#: model:ir.model,name:base_location.model_res_partner +msgid "Contact" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip -msgid " City/locations completion object" +#: 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 +msgid "Country" msgstr "" #. module: base_location -#: help:res.company,better_zip_id:0 -msgid "Use the city name or the zip code to search the location" +#: model:ir.model,name:base_location.model_res_country_state +msgid "Country state" msgstr "" #. module: base_location -#: field:res.partner,zip_id:0 -msgid "City/Location" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +msgid "Created by" msgstr "" #. module: base_location -#: view:res.better.zip:0 -msgid "Search city" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +msgid "Created on" msgstr "" #. module: base_location -#: field:res.company,better_zip_id:0 -msgid "Location" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.zip_base -msgid "Cities/Locations Management" +#: 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.model,name:base_location.model_res_partner -msgid "Partner" +#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter +msgid "Group By" msgstr "" #. module: base_location -#: view:res.company:0 -#: view:res.partner:0 -msgid "City completion" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +msgid "ID" msgstr "" #. module: base_location -#: field:res.country.state,better_zip_ids:0 -msgid "Cities" +#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +msgid "Last Modified on" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_country_state -msgid "Country state" +#: model:ir.model.fields,field_description:base_location.field_res_better_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 +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 +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 -#: help:res.better.zip,code:0 +#: 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" +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" +msgstr "" + +#. module: base_location +#: code:addons/base_location/models/partner.py:65 +#, 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:101 +#, 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:61 +#, 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:96 +#, 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 +#: code:addons/base_location/models/better_zip.py:106 +#, 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:57 +#, 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 "" + +#. module: base_location +#: 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 "" + diff --git a/base_location/i18n/bg.po b/base_location/i18n/bg.po index 9b81f435a96..692c4bcb6d8 100644 --- a/base_location/i18n/bg.po +++ b/base_location/i18n/bg.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/bs.po b/base_location/i18n/bs.po index f319487ba32..cbb118f8813 100644 --- a/base_location/i18n/bs.po +++ b/base_location/i18n/bs.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ca.po b/base_location/i18n/ca.po index b47c59d0cf3..c4542aafc9f 100644 --- a/base_location/i18n/ca.po +++ b/base_location/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/cs.po b/base_location/i18n/cs.po index 920560f1d42..759b823710b 100644 --- a/base_location/i18n/cs.po +++ b/base_location/i18n/cs.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/da.po b/base_location/i18n/da.po index 4a15f9245cf..aa6bd4cf929 100644 --- a/base_location/i18n/da.po +++ b/base_location/i18n/da.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "Delstat" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "Postnummer" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/de.po b/base_location/i18n/de.po index a47e1444019..976210f0709 100644 --- a/base_location/i18n/de.po +++ b/base_location/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "Bundesland" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "Die offizielle Kennung der Stadt" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/el_GR.po b/base_location/i18n/el_GR.po index 75676e09c96..699becb0c9a 100644 --- a/base_location/i18n/el_GR.po +++ b/base_location/i18n/el_GR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n" +"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/" +"el_GR/)\n" +"Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/en_GB.po b/base_location/i18n/en_GB.po index a0e3ce4f978..1f0032216ec 100644 --- a/base_location/i18n/en_GB.po +++ b/base_location/i18n/en_GB.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n" +"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/" +"teams/23907/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es.po b/base_location/i18n/es.po index 9b7ba6d26b5..423da73fb0d 100644 --- a/base_location/i18n/es.po +++ b/base_location/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "Provincia" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "El código oficial para la ciudad" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_AR.po b/base_location/i18n/es_AR.po index 1a94159ba05..f82d675b4f7 100644 --- a/base_location/i18n/es_AR.po +++ b/base_location/i18n/es_AR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n" +"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/" +"teams/23907/es_AR/)\n" +"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_CL.po b/base_location/i18n/es_CL.po index e39fb9afce6..814c05f20ea 100644 --- a/base_location/i18n/es_CL.po +++ b/base_location/i18n/es_CL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n" +"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/" +"es_CL/)\n" +"Language: es_CL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_CO.po b/base_location/i18n/es_CO.po index 7f7c384da07..7da14d70efa 100644 --- a/base_location/i18n/es_CO.po +++ b/base_location/i18n/es_CO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 # JOSE ALEJANDRO ECHEVERRI VALENCIA , 2018 @@ -11,12 +11,14 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-01-31 03:42+0000\n" "PO-Revision-Date: 2018-01-31 03:42+0000\n" -"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 2018\n" -"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n" +"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 2018\n" +"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/" +"es_CO/)\n" +"Language: es_CO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -164,25 +166,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -193,13 +195,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_CR.po b/base_location/i18n/es_CR.po index e83379d4258..19f8cdcb486 100644 --- a/base_location/i18n/es_CR.po +++ b/base_location/i18n/es_CR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n" +"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/" +"teams/23907/es_CR/)\n" +"Language: es_CR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_DO.po b/base_location/i18n/es_DO.po index 0d13355fbf0..227bde8fb33 100644 --- a/base_location/i18n/es_DO.po +++ b/base_location/i18n/es_DO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n" +"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/" +"teams/23907/es_DO/)\n" +"Language: es_DO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_DO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_EC.po b/base_location/i18n/es_EC.po index 3478e97494e..822ae95e03e 100644 --- a/base_location/i18n/es_EC.po +++ b/base_location/i18n/es_EC.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n" +"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/" +"es_EC/)\n" +"Language: es_EC\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_EC\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_ES.po b/base_location/i18n/es_ES.po index 9a07ab10de8..0e94d69f8f4 100644 --- a/base_location/i18n/es_ES.po +++ b/base_location/i18n/es_ES.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n" +"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/" +"es_ES/)\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_MX.po b/base_location/i18n/es_MX.po index 5e00e37de63..ccf836d5387 100644 --- a/base_location/i18n/es_MX.po +++ b/base_location/i18n/es_MX.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" +"es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_PE.po b/base_location/i18n/es_PE.po index 3b01f52cde3..897def3aa67 100644 --- a/base_location/i18n/es_PE.po +++ b/base_location/i18n/es_PE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n" +"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/" +"es_PE/)\n" +"Language: es_PE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_PE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_PY.po b/base_location/i18n/es_PY.po index 70a8af4fe97..e896833cda0 100644 --- a/base_location/i18n/es_PY.po +++ b/base_location/i18n/es_PY.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n" +"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/" +"es_PY/)\n" +"Language: es_PY\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_PY\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/es_VE.po b/base_location/i18n/es_VE.po index fcdc3bbe1fe..cc59e5c7292 100644 --- a/base_location/i18n/es_VE.po +++ b/base_location/i18n/es_VE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n" +"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/" +"teams/23907/es_VE/)\n" +"Language: es_VE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_VE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/et.po b/base_location/i18n/et.po index 6f19012399c..2dbb116d226 100644 --- a/base_location/i18n/et.po +++ b/base_location/i18n/et.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/eu.po b/base_location/i18n/eu.po index c2e914349c0..6717f0924c1 100644 --- a/base_location/i18n/eu.po +++ b/base_location/i18n/eu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/fa.po b/base_location/i18n/fa.po index 60592de2a0f..7672e82777a 100644 --- a/base_location/i18n/fa.po +++ b/base_location/i18n/fa.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/fi.po b/base_location/i18n/fi.po index e24911afa3b..9636485e113 100644 --- a/base_location/i18n/fi.po +++ b/base_location/i18n/fi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "Tila" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/fr.po b/base_location/i18n/fr.po index d136de28c8d..8350133805d 100644 --- a/base_location/i18n/fr.po +++ b/base_location/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 # Nicolas JEUDY , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2018-01-03 20:26+0000\n" "Last-Translator: Nicolas JEUDY , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -166,25 +166,25 @@ msgid "State" msgstr "Etat" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -195,13 +195,13 @@ msgid "The official code for the city" msgstr "Code officiel de la ville" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/fr_CA.po b/base_location/i18n/fr_CA.po index c05dff2a3df..989fe1821b6 100644 --- a/base_location/i18n/fr_CA.po +++ b/base_location/i18n/fr_CA.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n" +"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/" +"fr_CA/)\n" +"Language: fr_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/fr_CH.po b/base_location/i18n/fr_CH.po index ad561544b75..92bc9f46c2e 100644 --- a/base_location/i18n/fr_CH.po +++ b/base_location/i18n/fr_CH.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n" +"Language-Team: French (Switzerland) (https://www.transifex.com/oca/" +"teams/23907/fr_CH/)\n" +"Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_CH\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/gl.po b/base_location/i18n/gl.po index 1954724ed55..f1283d6f152 100644 --- a/base_location/i18n/gl.po +++ b/base_location/i18n/gl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/gl_ES.po b/base_location/i18n/gl_ES.po index 32409ac1a72..4bf60b3108b 100644 --- a/base_location/i18n/gl_ES.po +++ b/base_location/i18n/gl_ES.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,16 +11,20 @@ msgstr "" "POT-Creation-Date: 2017-06-10 01:50+0000\n" "PO-Revision-Date: 2017-06-10 01:50+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/gl_ES/)\n" +"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/" +"gl_ES/)\n" +"Language: gl_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: 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 +33,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 +52,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 +62,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 +89,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 +131,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 +163,49 @@ msgstr "" msgid "State" msgstr "" +#. module: base_location +#: code:addons/base_location/models/partner.py:65 +#, 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:101 +#, 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:61 +#, 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:96 +#, 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:106 +#, 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:57 +#, 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 +213,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 "" diff --git a/base_location/i18n/he.po b/base_location/i18n/he.po index 05529422da3..cc1bacf32cf 100644 --- a/base_location/i18n/he.po +++ b/base_location/i18n/he.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/hr.po b/base_location/i18n/hr.po index 3eb642e8a5f..0a8c43b1851 100644 --- a/base_location/i18n/hr.po +++ b/base_location/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/hr_HR.po b/base_location/i18n/hr_HR.po index 7e34d49a5bf..cca5c307370 100644 --- a/base_location/i18n/hr_HR.po +++ b/base_location/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-12-13 03:42+0000\n" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +165,25 @@ msgid "State" msgstr "Oblast/Županija" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +194,13 @@ msgid "The official code for the city" msgstr "Službena šifra ovog grada" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/hu.po b/base_location/i18n/hu.po index f780baafac0..f5e2f9336e2 100644 --- a/base_location/i18n/hu.po +++ b/base_location/i18n/hu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/id.po b/base_location/i18n/id.po index b4c7576a0df..2995d677a73 100644 --- a/base_location/i18n/id.po +++ b/base_location/i18n/id.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/it.po b/base_location/i18n/it.po index 74a958d5b10..67e0b7ec44d 100644 --- a/base_location/i18n/it.po +++ b/base_location/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "Provincia" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "Il codice ufficiale per la città" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ja.po b/base_location/i18n/ja.po index 18ddb62cba9..1463f42e2f0 100644 --- a/base_location/i18n/ja.po +++ b/base_location/i18n/ja.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ko.po b/base_location/i18n/ko.po index 14d4781d6b8..c7b12df1061 100644 --- a/base_location/i18n/ko.po +++ b/base_location/i18n/ko.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/lt.po b/base_location/i18n/lt.po index 4fd050ee7f7..d69d703320a 100644 --- a/base_location/i18n/lt.po +++ b/base_location/i18n/lt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/lt_LT.po b/base_location/i18n/lt_LT.po index a2cdc8e739d..5f4dd1a95d2 100644 --- a/base_location/i18n/lt_LT.po +++ b/base_location/i18n/lt_LT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,16 +11,21 @@ msgstr "" "POT-Creation-Date: 2017-06-10 01:50+0000\n" "PO-Revision-Date: 2017-06-10 01:50+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/23907/lt_LT/)\n" +"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/" +"teams/23907/lt_LT/)\n" +"Language: lt_LT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lt_LT\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: 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 +34,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 +53,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 +63,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 +90,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 "" + +#. 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 +132,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 +164,49 @@ msgstr "" msgid "State" msgstr "" +#. module: base_location +#: code:addons/base_location/models/partner.py:65 +#, 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:101 +#, 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:61 +#, 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:96 +#, 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:106 +#, 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:57 +#, 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 +214,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 "" diff --git a/base_location/i18n/lv.po b/base_location/i18n/lv.po index 3aa60a9fb49..97ddb9ca3ea 100644 --- a/base_location/i18n/lv.po +++ b/base_location/i18n/lv.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/mk.po b/base_location/i18n/mk.po index a14597cbf7a..184b9ca0fb8 100644 --- a/base_location/i18n/mk.po +++ b/base_location/i18n/mk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/mn.po b/base_location/i18n/mn.po index 0fb0e5516f0..e96d72a73fc 100644 --- a/base_location/i18n/mn.po +++ b/base_location/i18n/mn.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/nb.po b/base_location/i18n/nb.po index f96bd216dc2..795ca2de9dc 100644 --- a/base_location/i18n/nb.po +++ b/base_location/i18n/nb.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n" +"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/" +"nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/nb_NO.po b/base_location/i18n/nb_NO.po index 727ecc9a3d2..e591a9dbcf1 100644 --- a/base_location/i18n/nb_NO.po +++ b/base_location/i18n/nb_NO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n" +"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/" +"teams/23907/nb_NO/)\n" +"Language: nb_NO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/nl.po b/base_location/i18n/nl.po index 7cff9e39dc4..ec4497654bf 100644 --- a/base_location/i18n/nl.po +++ b/base_location/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/nl_BE.po b/base_location/i18n/nl_BE.po index 66c2a26a399..4528509bac5 100644 --- a/base_location/i18n/nl_BE.po +++ b/base_location/i18n/nl_BE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n" +"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/" +"nl_BE/)\n" +"Language: nl_BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_BE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/nl_NL.po b/base_location/i18n/nl_NL.po index 51b41e64277..adf345e29bf 100644 --- a/base_location/i18n/nl_NL.po +++ b/base_location/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 # Peter Hageman , 2017 @@ -12,11 +12,12 @@ msgstr "" "POT-Creation-Date: 2017-11-25 06:38+0000\n" "PO-Revision-Date: 2017-11-25 06:38+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -164,25 +165,25 @@ msgid "State" msgstr "Staat/Provincie" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -193,13 +194,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/pl.po b/base_location/i18n/pl.po index 18ba7f94e51..1627eeacf87 100644 --- a/base_location/i18n/pl.po +++ b/base_location/i18n/pl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,13 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pl\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +165,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +194,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/pt.po b/base_location/i18n/pt.po index 463d2beebdf..638bf3a4575 100644 --- a/base_location/i18n/pt.po +++ b/base_location/i18n/pt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/pt_BR.po b/base_location/i18n/pt_BR.po index 22aee121de4..0b7e6bf89fc 100644 --- a/base_location/i18n/pt_BR.po +++ b/base_location/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "Estado" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "O código oficial da cidade" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/pt_PT.po b/base_location/i18n/pt_PT.po index dc50add7c5b..0434cf4c9a1 100644 --- a/base_location/i18n/pt_PT.po +++ b/base_location/i18n/pt_PT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" +"teams/23907/pt_PT/)\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "Estado" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "Código oficial da cidade" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ro.po b/base_location/i18n/ro.po index fbef1aa9656..c6354cb0b82 100644 --- a/base_location/i18n/ro.po +++ b/base_location/i18n/ro.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1));\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/ru.po b/base_location/i18n/ru.po index 66485bb7cfc..6778bf5cb8b 100644 --- a/base_location/i18n/ru.po +++ b/base_location/i18n/ru.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,13 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +165,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +194,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/sk.po b/base_location/i18n/sk.po index a4c3345ef84..f9627b0e845 100644 --- a/base_location/i18n/sk.po +++ b/base_location/i18n/sk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/sl.po b/base_location/i18n/sl.po index 82adc3f7b81..75f906f3aac 100644 --- a/base_location/i18n/sl.po +++ b/base_location/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-12-13 03:42+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "Zvezna država" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "Uradna koda kraja" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/sr.po b/base_location/i18n/sr.po index 95ff1010dd2..4c1a1e13a05 100644 --- a/base_location/i18n/sr.po +++ b/base_location/i18n/sr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/sr@latin.po b/base_location/i18n/sr@latin.po index c62ce8e0d61..110f4e97573 100644 --- a/base_location/i18n/sr@latin.po +++ b/base_location/i18n/sr@latin.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr%40latin/)\n" +"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr" +"%40latin/)\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +165,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +194,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/sv.po b/base_location/i18n/sv.po index 55b5978b640..719d37b87f1 100644 --- a/base_location/i18n/sv.po +++ b/base_location/i18n/sv.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/th.po b/base_location/i18n/th.po index 7ff237cac22..51e41b38ebc 100644 --- a/base_location/i18n/th.po +++ b/base_location/i18n/th.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/tr.po b/base_location/i18n/tr.po index 3a38341c137..a114385187f 100644 --- a/base_location/i18n/tr.po +++ b/base_location/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/tr_TR.po b/base_location/i18n/tr_TR.po index 01eb98e4bb3..f30697c0a5a 100644 --- a/base_location/i18n/tr_TR.po +++ b/base_location/i18n/tr_TR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" +"tr_TR/)\n" +"Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/uk.po b/base_location/i18n/uk.po index ee39d26539f..b852b5d526e 100644 --- a/base_location/i18n/uk.po +++ b/base_location/i18n/uk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location #: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/vi.po b/base_location/i18n/vi.po index e39d45fb8ab..557a4ea7fee 100644 --- a/base_location/i18n/vi.po +++ b/base_location/i18n/vi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +163,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +192,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/vi_VN.po b/base_location/i18n/vi_VN.po index 6f35c2d8d45..8c12755babb 100644 --- a/base_location/i18n/vi_VN.po +++ b/base_location/i18n/vi_VN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/" +"teams/23907/vi_VN/)\n" +"Language: vi_VN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi_VN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/zh_CN.po b/base_location/i18n/zh_CN.po index 4679587df3d..ed4b50240ab 100644 --- a/base_location/i18n/zh_CN.po +++ b/base_location/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" +"zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/i18n/zh_TW.po b/base_location/i18n/zh_TW.po index 73ca9451b2b..9f688316dd3 100644 --- a/base_location/i18n/zh_TW.po +++ b/base_location/i18n/zh_TW.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-22 03:38+0000\n" "PO-Revision-Date: 2017-11-22 03:38+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/" +"zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location @@ -163,25 +164,25 @@ msgid "State" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:64 +#: code:addons/base_location/models/partner.py:65 #, 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 +#: code:addons/base_location/models/better_zip.py:101 #, 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 +#: code:addons/base_location/models/partner.py:61 #, 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 +#: code:addons/base_location/models/better_zip.py:96 #, python-format msgid "The country of the state differs from the country in location %s" msgstr "" @@ -192,13 +193,13 @@ msgid "The official code for the city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:98 +#: code:addons/base_location/models/better_zip.py:106 #, 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 +#: code:addons/base_location/models/partner.py:57 #, python-format msgid "The state of the partner %s differs from that in location %s" msgstr "" diff --git a/base_location/models/better_zip.py b/base_location/models/better_zip.py index be949fe23ed..991ffa6c816 100644 --- a/base_location/models/better_zip.py +++ b/base_location/models/better_zip.py @@ -51,6 +51,14 @@ def name_get(self): result.append((rec.id, ", ".join(name))) return result + @api.model + def name_search(self, name='', args=None, operator='ilike', limit=100): + args = list(args or []) + args += ['|', ('city', operator, name), + '|', ('name', operator, name), ('code', operator, name)] + recs = self.search(args, limit=limit) + return recs.name_get() + @api.onchange('country_id') def _onchange_country_id(self): if self.state_id.country_id != self.country_id: diff --git a/base_location/tests/test_base_location.py b/base_location/tests/test_base_location.py index b179f3b5dab..b86817bcbcf 100644 --- a/base_location/tests/test_base_location.py +++ b/base_location/tests/test_base_location.py @@ -231,6 +231,66 @@ def test_display_name(self): ).name ) + def test_name_search___can_find_using_city_name_or_zip_or_code(self): + barcelona_data = { + 'city_id': self.city_bcn.id, + 'city': self.city_bcn.name, + 'name': '444', + 'code': 'BA', + 'state_id': self.state_bcn.id, + 'country_id': self.ref('base.es'), + } + madrid_data = { + 'city_id': self.city_madrid.id, + 'city': self.city_madrid.name, + 'name': '555', + 'code': 'MD', + 'state_id': self.state_madrid.id, + 'country_id': self.ref('base.es'), + } + lausanne_data = { + 'city_id': self.city_lausanne.id, + 'city': self.city_lausanne.name, + 'name': '666', + 'code': 'LA', + 'state_id': self.state_vd.id, + 'country_id': self.ref('base.ch'), + } + + barcelona = self.env['res.better.zip'].create(barcelona_data) + madrid = self.env['res.better.zip'].create(madrid_data) + lausanne = self.env['res.better.zip'].create(lausanne_data) + + found_recs = self.env['res.better.zip'].name_search(name='444') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], barcelona.id) + found_recs = self.env['res.better.zip'].name_search(name='Barcelona') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], barcelona.id) + found_recs = self.env['res.better.zip'].name_search(name='BA') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], barcelona.id) + + found_recs = self.env['res.better.zip'].name_search(name='555') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], madrid.id) + found_recs = self.env['res.better.zip'].name_search(name='Madrid') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], madrid.id) + found_recs = self.env['res.better.zip'].name_search(name='MD') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], madrid.id) + + found_recs = self.env['res.better.zip'].name_search(name='666') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], lausanne.id) + found_recs = self.env['res.better.zip'].name_search(name='Lausanne') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], lausanne.id) + found_recs = self.env['res.better.zip'].name_search(name='LA') + self.assertEqual(len(found_recs), 1) + self.assertEqual(found_recs[0][0], lausanne.id) + def setUp(self): super(TestBaseLocation, self).setUp() self.state_vd = self.env['res.country.state'].create({