diff -Nru tryton-modules-country-4.4.0/CHANGELOG tryton-modules-country-4.6.0/CHANGELOG --- tryton-modules-country-4.4.0/CHANGELOG 2017-05-01 17:51:15.000000000 +0000 +++ tryton-modules-country-4.6.0/CHANGELOG 2017-10-30 13:56:19.000000000 +0000 @@ -1,3 +1,6 @@ +Version 4.6.0 - 2017-10-30 +* Bug fixes (see mercurial logs for details) + Version 4.4.0 - 2017-05-01 * Bug fixes (see mercurial logs for details) diff -Nru tryton-modules-country-4.4.0/debian/changelog tryton-modules-country-4.6.0/debian/changelog --- tryton-modules-country-4.4.0/debian/changelog 2017-08-18 10:35:25.000000000 +0000 +++ tryton-modules-country-4.6.0/debian/changelog 2017-11-07 09:20:08.000000000 +0000 @@ -1,3 +1,12 @@ +tryton-modules-country (4.6.0-1) unstable; urgency=medium + + * Bump the Standards-Version to 4.1.0, no changes needed. + * Bump the Standards-Version to 4.1.1, no changes needed. + * Merging upstream version 4.6.0. + * Use https in the watch file. + + -- Mathias Behrle Tue, 07 Nov 2017 10:20:08 +0100 + tryton-modules-country (4.4.0-4) unstable; urgency=medium * Switch to Python3. diff -Nru tryton-modules-country-4.4.0/debian/control tryton-modules-country-4.6.0/debian/control --- tryton-modules-country-4.4.0/debian/control 2017-08-18 09:33:11.000000000 +0000 +++ tryton-modules-country-4.6.0/debian/control 2017-11-06 13:40:54.000000000 +0000 @@ -8,7 +8,7 @@ dh-python, python3, python3-setuptools, -Standards-Version: 4.0.1 +Standards-Version: 4.1.1 Homepage: http://www.tryton.org/ Vcs-Browser: https://anonscm.debian.org/cgit/tryton/tryton-modules-country.git Vcs-Git: https://anonscm.debian.org/cgit/tryton/tryton-modules-country.git diff -Nru tryton-modules-country-4.4.0/debian/watch tryton-modules-country-4.6.0/debian/watch --- tryton-modules-country-4.4.0/debian/watch 2017-08-17 13:11:31.000000000 +0000 +++ tryton-modules-country-4.6.0/debian/watch 2017-11-07 09:15:37.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_country-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_country-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) diff -Nru tryton-modules-country-4.4.0/.drone.yml tryton-modules-country-4.6.0/.drone.yml --- tryton-modules-country-4.4.0/.drone.yml 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-country-4.6.0/.drone.yml 2017-10-23 22:08:00.000000000 +0000 @@ -0,0 +1,51 @@ +clone: + hg: + image: plugins/hg + +pipeline: + tox: + image: ${IMAGE} + environment: + - CFLAGS=-O0 + - DB_CACHE=/cache + - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE + - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ + commands: + - pip install tox + - tox -e "${TOXENV}-${DATABASE}" + volumes: + - cache:/root/.cache + +services: + postgresql: + image: postgres + when: + matrix: + DATABASE: postgresql + +matrix: + include: + - IMAGE: python:2.7 + TOXENV: py27 + DATABASE: sqlite + - IMAGE: python:2.7 + TOXENV: py27 + DATABASE: postgresql + - IMAGE: python:3.4 + TOXENV: py34 + DATABASE: sqlite + - IMAGE: python:3.4 + TOXENV: py34 + DATABASE: postgresql + - IMAGE: python:3.5 + TOXENV: py35 + DATABASE: sqlite + - IMAGE: python:3.5 + TOXENV: py35 + DATABASE: postgresql + - IMAGE: python:3.6 + TOXENV: py36 + DATABASE: sqlite + - IMAGE: python:3.6 + TOXENV: py36 + DATABASE: postgresql diff -Nru tryton-modules-country-4.4.0/.hgtags tryton-modules-country-4.6.0/.hgtags --- tryton-modules-country-4.4.0/.hgtags 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-country-4.6.0/.hgtags 2017-10-30 13:56:19.000000000 +0000 @@ -0,0 +1,19 @@ +448fe2460456cd13a29c1fbb0eb8791c2a3a8628 1.0.0 +7f477ed1d83cb87245a83b971e8798aa9006bbd7 1.2.0 +fadc4c9bfd476e840992273ea1d7c33f2a5eb656 1.4.0 +020c095c37a34b5536e3f553cffd3d5c7a61ace9 1.6.0 +57ecfe6831e082b4eca380e4fb421825e1092f49 1.8.0 +448121ae58527d666e5e5041ef283052a2d2ab78 2.0.0 +4e14138f332644ff40cb46a395696f059758cce7 2.2.0 +8879fc00f58df36d46692c2a19a2fd4c38742aa8 2.4.0 +85501c92ab0b971d3ad4118d54d373e7cf225eb5 2.6.0 +971e5fa499d7a504fea9a1ee4dc1825ce0a57ac9 2.8.0 +62c814e6b4e7ef6249fd497cf44fe034f69560b1 3.0.0 +0f16df3d93a386957544db43be319c90d95925fc 3.2.0 +8a8a72d8dc0776c4908fd0255580486368127993 3.4.0 +2a9242fdd797d21a09d8eab96409c7dcd403c4d7 3.6.0 +e14155cc79385e370c0963f85d7b733b55b1ecb8 3.8.0 +0b6f476903d474366f270451331aa51e3c22776d 4.0.0 +74982ab282e2a57efc914dc827dbbaf14a871ab6 4.2.0 +bef8df7a9f1e1677ac5cc183f1ce3a337216be48 4.4.0 +bfdde1097a9e554aef9ab3f2c93abec9b569e71c 4.6.0 diff -Nru tryton-modules-country-4.4.0/locale/bg.po tryton-modules-country-4.6.0/locale/bg.po --- tryton-modules-country-4.4.0/locale/bg.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/bg.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -32,8 +32,8 @@ msgstr "Име" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Име" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -76,8 +76,8 @@ msgstr "Родител" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Име" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +116,9 @@ msgid "ID" msgstr "ID" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Условие за плащане" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.zip,subdivision:" diff -Nru tryton-modules-country-4.4.0/locale/ca.po tryton-modules-country-4.6.0/locale/ca.po --- tryton-modules-country-4.4.0/locale/ca.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/ca.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Nom" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom del registre" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Pare" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom del registre" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom del registre" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/cs.po tryton-modules-country-4.6.0/locale/cs.po --- tryton-modules-country-4.4.0/locale/cs.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/cs.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,10 +31,9 @@ msgid "Name" msgstr "Namu" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.country,subdivisions:" @@ -79,10 +78,9 @@ msgid "Parent" msgstr "" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -117,10 +115,9 @@ msgid "ID" msgstr "" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.zip,subdivision:" diff -Nru tryton-modules-country-4.4.0/locale/de.po tryton-modules-country-4.6.0/locale/de.po --- tryton-modules-country-4.4.0/locale/de.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/de.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Name Staat" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Name" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Übergeordnet (Subnationale Einheit)" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Name" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Name" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/es_419.po tryton-modules-country-4.6.0/locale/es_419.po --- tryton-modules-country-4.4.0/locale/es_419.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/es_419.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,10 +31,9 @@ msgid "Name" msgstr "Namu" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -78,10 +77,9 @@ msgid "Parent" msgstr "" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +114,9 @@ msgid "ID" msgstr "" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/es.po tryton-modules-country-4.6.0/locale/es.po --- tryton-modules-country-4.4.0/locale/es.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/es.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Nombre" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nombre" +msgid "Record Name" +msgstr "Nombre del registro" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Padre" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nombre" +msgid "Record Name" +msgstr "Nombre del registro" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nombre" +msgid "Record Name" +msgstr "Nombre del registro" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/fr.po tryton-modules-country-4.6.0/locale/fr.po --- tryton-modules-country-4.4.0/locale/fr.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/fr.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Nom" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom de l'enregistrement" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Parent" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom de l'enregistrement" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nom" +msgid "Record Name" +msgstr "Nom de l'enregistrement" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/hu_HU.po tryton-modules-country-4.6.0/locale/hu_HU.po --- tryton-modules-country-4.4.0/locale/hu_HU.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/hu_HU.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,10 +31,9 @@ msgid "Name" msgstr "Név" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Név" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -78,10 +77,9 @@ msgid "Parent" msgstr "Felülrendelt" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Név" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +114,9 @@ msgid "ID" msgstr "ID" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Név" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/it_IT.po tryton-modules-country-4.6.0/locale/it_IT.po --- tryton-modules-country-4.4.0/locale/it_IT.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/it_IT.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -33,8 +33,8 @@ msgstr "Nome" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.country,subdivisions:" @@ -83,8 +83,8 @@ msgstr "Parte" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -123,8 +123,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.zip,subdivision:" diff -Nru tryton-modules-country-4.4.0/locale/ja_JP.po tryton-modules-country-4.6.0/locale/ja_JP.po --- tryton-modules-country-4.4.0/locale/ja_JP.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/ja_JP.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,10 +31,9 @@ msgid "Name" msgstr "Namu" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -78,10 +77,9 @@ msgid "Parent" msgstr "" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +114,9 @@ msgid "ID" msgstr "" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/lo.po tryton-modules-country-4.6.0/locale/lo.po --- tryton-modules-country-4.4.0/locale/lo.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/lo.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "ຊື່" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "ຊື່" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "ຂຶ້ນກັບ" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "ຊື່" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ເລກລໍາດັບ" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "ຊື່" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/lt.po tryton-modules-country-4.6.0/locale/lt.po --- tryton-modules-country-4.4.0/locale/lt.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/lt.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,10 +31,9 @@ msgid "Name" msgstr "Namu" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -78,10 +77,9 @@ msgid "Parent" msgstr "" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +114,9 @@ msgid "ID" msgstr "" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Namu" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/nl.po tryton-modules-country-4.6.0/locale/nl.po --- tryton-modules-country-4.4.0/locale/nl.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/nl.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -35,10 +35,9 @@ msgid "Name" msgstr "Naam bijlage" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Naam bijlage" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.country,subdivisions:" @@ -90,10 +89,9 @@ msgid "Parent" msgstr "Bovenliggend niveau" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Naam bijlage" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.subdivision,type:" @@ -135,10 +133,9 @@ msgid "ID" msgstr "ID" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Naam bijlage" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.zip,subdivision:" diff -Nru tryton-modules-country-4.4.0/locale/pl.po tryton-modules-country-4.6.0/locale/pl.po --- tryton-modules-country-4.4.0/locale/pl.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/pl.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Nazwa" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nazwa" +msgid "Record Name" +msgstr "Nazwa rekordu" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Jednostka nadrzędna" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nazwa" +msgid "Record Name" +msgstr "Nazwa rekordu" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nazwa" +msgid "Record Name" +msgstr "Nazwa rekordu" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/pt_BR.po tryton-modules-country-4.6.0/locale/pt_BR.po --- tryton-modules-country-4.4.0/locale/pt_BR.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/pt_BR.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Nome" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "Nome do Registro" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Pai" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "Nome do Registro" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Nome" +msgid "Record Name" +msgstr "Nome do Registro" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/ru.po tryton-modules-country-4.6.0/locale/ru.po --- tryton-modules-country-4.4.0/locale/ru.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/ru.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -32,8 +32,8 @@ msgstr "Наименование" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Наименование" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -76,8 +76,8 @@ msgstr "Предок" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Наименование" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -116,10 +116,9 @@ msgid "ID" msgstr "ID" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Правило оплаты" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.zip,subdivision:" diff -Nru tryton-modules-country-4.4.0/locale/sl.po tryton-modules-country-4.6.0/locale/sl.po --- tryton-modules-country-4.4.0/locale/sl.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/sl.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -31,8 +31,8 @@ msgstr "Naziv" msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "Ime" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -75,8 +75,8 @@ msgstr "Prednik" msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "Ime" +msgid "Record Name" +msgstr "" msgctxt "field:country.subdivision,type:" msgid "Type" @@ -111,8 +111,8 @@ msgstr "ID" msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "Ime" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/locale/zh_CN.po tryton-modules-country-4.6.0/locale/zh_CN.po --- tryton-modules-country-4.4.0/locale/zh_CN.po 2017-04-29 17:09:25.000000000 +0000 +++ tryton-modules-country-4.6.0/locale/zh_CN.po 2017-10-28 22:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" @@ -35,10 +35,9 @@ msgid "Name" msgstr "纳木" -#, fuzzy msgctxt "field:country.country,rec_name:" -msgid "Name" -msgstr "纳木" +msgid "Record Name" +msgstr "" msgctxt "field:country.country,subdivisions:" msgid "Subdivisions" @@ -89,10 +88,9 @@ msgid "Parent" msgstr "上级" -#, fuzzy msgctxt "field:country.subdivision,rec_name:" -msgid "Name" -msgstr "纳木" +msgid "Record Name" +msgstr "" #, fuzzy msgctxt "field:country.subdivision,type:" @@ -133,10 +131,9 @@ msgid "ID" msgstr "编号" -#, fuzzy msgctxt "field:country.zip,rec_name:" -msgid "Name" -msgstr "纳木" +msgid "Record Name" +msgstr "" msgctxt "field:country.zip,subdivision:" msgid "Subdivision" diff -Nru tryton-modules-country-4.4.0/PKG-INFO tryton-modules-country-4.6.0/PKG-INFO --- tryton-modules-country-4.4.0/PKG-INFO 2017-05-01 17:51:40.000000000 +0000 +++ tryton-modules-country-4.6.0/PKG-INFO 2017-10-30 13:56:22.000000000 +0000 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: trytond_country -Version: 4.4.0 +Version: 4.6.0 Summary: Tryton module with countries Home-page: http://www.tryton.org/ Author: Tryton Author-email: issue_tracker@tryton.org License: GPL-3 -Download-URL: http://downloads.tryton.org/4.4/ +Download-URL: http://downloads.tryton.org/4.6/ Description: trytond_country =============== @@ -70,9 +70,9 @@ Classifier: Natural Language :: Spanish Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Office/Business diff -Nru tryton-modules-country-4.4.0/setup.cfg tryton-modules-country-4.6.0/setup.cfg --- tryton-modules-country-4.4.0/setup.cfg 2017-05-01 17:51:40.000000000 +0000 +++ tryton-modules-country-4.6.0/setup.cfg 2017-10-30 13:56:22.000000000 +0000 @@ -1,5 +1,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -Nru tryton-modules-country-4.4.0/setup.py tryton-modules-country-4.6.0/setup.py --- tryton-modules-country-4.4.0/setup.py 2017-03-08 09:26:10.000000000 +0000 +++ tryton-modules-country-4.6.0/setup.py 2017-10-23 22:08:00.000000000 +0000 @@ -98,9 +98,9 @@ 'Natural Language :: Spanish', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Office/Business', diff -Nru tryton-modules-country-4.4.0/tox.ini tryton-modules-country-4.6.0/tox.ini --- tryton-modules-country-4.4.0/tox.ini 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-country-4.6.0/tox.ini 2017-10-23 22:08:00.000000000 +0000 @@ -0,0 +1,18 @@ +[tox] +envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql} + +[testenv] +commands = {envpython} setup.py test +deps = + {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5 + pypy-postgresql: psycopg2cffi >= 2.5 + mysql: MySQL-python + sqlite: sqlitebck +setenv = + sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://} + postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://} + mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://} + sqlite: DB_NAME={env:SQLITE_NAME::memory:} + postgresql: DB_NAME={env:POSTGRESQL_NAME:test} + mysql: DB_NAME={env:MYSQL_NAME:test} +install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages} diff -Nru tryton-modules-country-4.4.0/tryton.cfg tryton-modules-country-4.6.0/tryton.cfg --- tryton-modules-country-4.4.0/tryton.cfg 2017-05-01 17:50:58.000000000 +0000 +++ tryton-modules-country-4.6.0/tryton.cfg 2017-10-30 13:56:18.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=4.4.0 +version=4.6.0 depends: ir res diff -Nru tryton-modules-country-4.4.0/trytond_country.egg-info/PKG-INFO tryton-modules-country-4.6.0/trytond_country.egg-info/PKG-INFO --- tryton-modules-country-4.4.0/trytond_country.egg-info/PKG-INFO 2017-05-01 17:51:30.000000000 +0000 +++ tryton-modules-country-4.6.0/trytond_country.egg-info/PKG-INFO 2017-10-30 13:56:20.000000000 +0000 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: trytond-country -Version: 4.4.0 +Version: 4.6.0 Summary: Tryton module with countries Home-page: http://www.tryton.org/ Author: Tryton Author-email: issue_tracker@tryton.org License: GPL-3 -Download-URL: http://downloads.tryton.org/4.4/ +Download-URL: http://downloads.tryton.org/4.6/ Description: trytond_country =============== @@ -70,9 +70,9 @@ Classifier: Natural Language :: Spanish Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Office/Business diff -Nru tryton-modules-country-4.4.0/trytond_country.egg-info/requires.txt tryton-modules-country-4.6.0/trytond_country.egg-info/requires.txt --- tryton-modules-country-4.4.0/trytond_country.egg-info/requires.txt 2017-05-01 17:51:30.000000000 +0000 +++ tryton-modules-country-4.6.0/trytond_country.egg-info/requires.txt 2017-10-30 13:56:20.000000000 +0000 @@ -1,4 +1,4 @@ -trytond >= 4.4, < 4.5 +trytond >= 4.6, < 4.7 [GeoNames] -proteus >= 4.4, < 4.5 +proteus >= 4.6, < 4.7 diff -Nru tryton-modules-country-4.4.0/trytond_country.egg-info/SOURCES.txt tryton-modules-country-4.6.0/trytond_country.egg-info/SOURCES.txt --- tryton-modules-country-4.4.0/trytond_country.egg-info/SOURCES.txt 2017-05-01 17:51:30.000000000 +0000 +++ tryton-modules-country-4.6.0/trytond_country.egg-info/SOURCES.txt 2017-10-30 13:56:20.000000000 +0000 @@ -1,12 +1,17 @@ +.drone.yml +.hgtags CHANGELOG COPYRIGHT INSTALL LICENSE MANIFEST.in README +__init__.py +country.py country.xml data.xml setup.py +tox.ini tryton.cfg ./__init__.py ./country.py @@ -60,6 +65,8 @@ locale/zh_CN.po scripts/countries.py scripts/trytond_import_zip +tests/__init__.py +tests/test_country.py trytond_country.egg-info/PKG-INFO trytond_country.egg-info/SOURCES.txt trytond_country.egg-info/dependency_links.txt