diff options
author | Tobias Quathamer <toddy@debian.org> | 2011-04-03 12:06:41 +0200 |
---|---|---|
committer | Tobias Quathamer <toddy@debian.org> | 2012-02-17 10:25:26 +0100 |
commit | 0f140f2744b87bed58bdcba067debe59750403c1 (patch) | |
tree | 8e00902aa1c65fb2ecfeed71cfa9f33aab7f4c4d | |
parent | deb5ae2b34ffcc56a07f83438b68d61099c02873 (diff) | |
parent | 04520a66c414aff7b17c511504b6a2974a376a24 (diff) | |
download | iso-codes-debian/3.25-1.tar.gz |
Imported Debian patch 3.25-1debian/3.25-1
46 files changed, 72 insertions, 57 deletions
@@ -1,3 +1,12 @@ +iso-codes 3.25 +-------------- +Tobias Quathamer <toddy@debian.org> +Sun, 3 April 2011 + + [ ISO 3166-2 ] + * Correct spelling for São Paulo + + iso-codes 3.24.2 ---------------- Tobias Quathamer <toddy@debian.org> @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for iso-codes 3.24.2. +# Generated by GNU Autoconf 2.67 for iso-codes 3.25. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -548,8 +548,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='iso-codes' PACKAGE_TARNAME='iso-codes' -PACKAGE_VERSION='3.24.2' -PACKAGE_STRING='iso-codes 3.24.2' +PACKAGE_VERSION='3.25' +PACKAGE_STRING='iso-codes 3.25' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1175,7 +1175,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures iso-codes 3.24.2 to adapt to many kinds of systems. +\`configure' configures iso-codes 3.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1241,7 +1241,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of iso-codes 3.24.2:";; + short | recursive ) echo "Configuration of iso-codes 3.25:";; esac cat <<\_ACEOF @@ -1315,7 +1315,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -iso-codes configure 3.24.2 +iso-codes configure 3.25 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1332,7 +1332,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by iso-codes $as_me 3.24.2, which was +It was created by iso-codes $as_me 3.25, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2148,7 +2148,7 @@ fi # Define the identity of the package. PACKAGE='iso-codes' - VERSION='3.24.2' + VERSION='3.25' cat >>confdefs.h <<_ACEOF @@ -2933,7 +2933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by iso-codes $as_me 3.24.2, which was +This file was extended by iso-codes $as_me 3.25, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2986,7 +2986,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -iso-codes config.status 3.24.2 +iso-codes config.status 3.25 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 797a8fd2..7ee2043f 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License along dnl with this program; if not, write to the Free Software Foundation, Inc., dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_INIT([iso-codes],[3.24.2]) +AC_INIT([iso-codes],[3.25]) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign]) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 9f5777e6..40d201d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +iso-codes (3.25-1) unstable; urgency=low + + * New upstream release. + + -- Tobias Quathamer <toddy@debian.org> Sun, 03 Apr 2011 12:06:41 +0200 + iso-codes (3.24.2-1) unstable; urgency=low * New upstream release. This closes the following bugs from Debian diff --git a/iso_3166_2/az.po b/iso_3166_2/az.po index 462affc1..ddeda933 100644 --- a/iso_3166_2/az.po +++ b/iso_3166_2/az.po @@ -2233,7 +2233,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/bg.po b/iso_3166_2/bg.po index 793c5ab1..8f88545b 100644 --- a/iso_3166_2/bg.po +++ b/iso_3166_2/bg.po @@ -2201,7 +2201,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Сан Марино" #. name for BR-TO diff --git a/iso_3166_2/bs.po b/iso_3166_2/bs.po index 16a434f0..6c088abf 100644 --- a/iso_3166_2/bs.po +++ b/iso_3166_2/bs.po @@ -2233,7 +2233,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/ca.po b/iso_3166_2/ca.po index 62cd4829..55169ed8 100644 --- a/iso_3166_2/ca.po +++ b/iso_3166_2/ca.po @@ -2232,7 +2232,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/crh.po b/iso_3166_2/crh.po index 58d2d571..74a477b0 100644 --- a/iso_3166_2/crh.po +++ b/iso_3166_2/crh.po @@ -1986,7 +1986,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/cs.po b/iso_3166_2/cs.po index 6635a871..06be90bd 100644 --- a/iso_3166_2/cs.po +++ b/iso_3166_2/cs.po @@ -2232,7 +2232,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/da.po b/iso_3166_2/da.po index 66652833..3843d0f6 100644 --- a/iso_3166_2/da.po +++ b/iso_3166_2/da.po @@ -2109,7 +2109,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Sao Paulo" #. name for BR-TO diff --git a/iso_3166_2/el.po b/iso_3166_2/el.po index c1959866..e6620c13 100644 --- a/iso_3166_2/el.po +++ b/iso_3166_2/el.po @@ -1992,7 +1992,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/en.po b/iso_3166_2/en.po index 223d4ba2..6294cb04 100644 --- a/iso_3166_2/en.po +++ b/iso_3166_2/en.po @@ -2132,7 +2132,7 @@ msgstr "Sergipe" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Sao Paulo" #. name for BR-TO diff --git a/iso_3166_2/eo.po b/iso_3166_2/eo.po index e7e5ef73..68e3775a 100644 --- a/iso_3166_2/eo.po +++ b/iso_3166_2/eo.po @@ -2220,7 +2220,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San-Marino" #. name for BR-TO diff --git a/iso_3166_2/es.po b/iso_3166_2/es.po index e6d9bb0c..b2ce0620 100644 --- a/iso_3166_2/es.po +++ b/iso_3166_2/es.po @@ -2226,7 +2226,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/eu.po b/iso_3166_2/eu.po index 3d0c2f43..7194d7e6 100644 --- a/iso_3166_2/eu.po +++ b/iso_3166_2/eu.po @@ -2224,7 +2224,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/fi.po b/iso_3166_2/fi.po index 288c1c82..afa7b89e 100644 --- a/iso_3166_2/fi.po +++ b/iso_3166_2/fi.po @@ -1984,7 +1984,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/fr.po b/iso_3166_2/fr.po index 458418c0..3b6c5565 100644 --- a/iso_3166_2/fr.po +++ b/iso_3166_2/fr.po @@ -1994,7 +1994,7 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Sôo Paulo" #. name for BR-TO diff --git a/iso_3166_2/ga.po b/iso_3166_2/ga.po index fb0c835f..19e00d19 100644 --- a/iso_3166_2/ga.po +++ b/iso_3166_2/ga.po @@ -2136,7 +2136,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Héilin" #. name for BR-TO diff --git a/iso_3166_2/hu.po b/iso_3166_2/hu.po index 241ead30..6fa63764 100644 --- a/iso_3166_2/hu.po +++ b/iso_3166_2/hu.po @@ -2028,7 +2028,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Szent Mária" #. name for BR-TO diff --git a/iso_3166_2/id.po b/iso_3166_2/id.po index 90911e9e..d6c4f6ec 100644 --- a/iso_3166_2/id.po +++ b/iso_3166_2/id.po @@ -1984,8 +1984,8 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" -msgstr "Sâo Paulo" +msgid "São Paulo" +msgstr "São Paulo" #. name for BR-TO msgid "Tocantins" diff --git a/iso_3166_2/iso_3166_2.pot b/iso_3166_2/iso_3166_2.pot index 697a14d1..ca8b7b95 100644 --- a/iso_3166_2/iso_3166_2.pot +++ b/iso_3166_2/iso_3166_2.pot @@ -1983,7 +1983,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/iso_3166_2.xml b/iso_3166_2/iso_3166_2.xml index fad33fc9..b9c6d723 100644 --- a/iso_3166_2/iso_3166_2.xml +++ b/iso_3166_2/iso_3166_2.xml @@ -1216,7 +1216,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2. <iso_3166_2_entry code="BR-SE" name="Sergipe" /> <iso_3166_2_entry - code="BR-SP" name="Sâo Paulo" /> + code="BR-SP" name="São Paulo" /> <iso_3166_2_entry code="BR-TO" name="Tocantins" /> </iso_3166_subset> diff --git a/iso_3166_2/it.po b/iso_3166_2/it.po index 5e03f2f6..87f2c3ba 100644 --- a/iso_3166_2/it.po +++ b/iso_3166_2/it.po @@ -1989,7 +1989,7 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Paolo" #. name for BR-TO diff --git a/iso_3166_2/ja.po b/iso_3166_2/ja.po index bf3af25b..de1eb431 100644 --- a/iso_3166_2/ja.po +++ b/iso_3166_2/ja.po @@ -2087,7 +2087,7 @@ msgstr "セルジッペ" # 地図帳 #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "サンパウロ" #. name for BR-TO diff --git a/iso_3166_2/ko.po b/iso_3166_2/ko.po index d66e2f5c..dc6f1765 100644 --- a/iso_3166_2/ko.po +++ b/iso_3166_2/ko.po @@ -2191,7 +2191,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "수리남" #. name for BR-TO diff --git a/iso_3166_2/lt.po b/iso_3166_2/lt.po index 3fdff5e3..3d0b1851 100644 --- a/iso_3166_2/lt.po +++ b/iso_3166_2/lt.po @@ -1996,7 +1996,7 @@ msgid "Sergipe" msgstr "Seržipė" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Paulas" #. name for BR-TO diff --git a/iso_3166_2/lv.po b/iso_3166_2/lv.po index 3279b2e8..753256f0 100644 --- a/iso_3166_2/lv.po +++ b/iso_3166_2/lv.po @@ -2187,7 +2187,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Mārīno" #. name for BR-TO diff --git a/iso_3166_2/nl.po b/iso_3166_2/nl.po index ae580bdd..e2c97ecd 100644 --- a/iso_3166_2/nl.po +++ b/iso_3166_2/nl.po @@ -1996,8 +1996,8 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" -msgstr "Sâo Paulo" +msgid "São Paulo" +msgstr "São Paulo" #. name for BR-TO msgid "Tocantins" diff --git a/iso_3166_2/nso.po b/iso_3166_2/nso.po index 460dc26e..90244a7b 100644 --- a/iso_3166_2/nso.po +++ b/iso_3166_2/nso.po @@ -2223,7 +2223,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/oc.po b/iso_3166_2/oc.po index 8b0d5917..dce0dde8 100644 --- a/iso_3166_2/oc.po +++ b/iso_3166_2/oc.po @@ -1987,7 +1987,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/pl.po b/iso_3166_2/pl.po index 01dd8066..f54dba8b 100644 --- a/iso_3166_2/pl.po +++ b/iso_3166_2/pl.po @@ -1989,8 +1989,8 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" -msgstr "Sâo Paulo" +msgid "São Paulo" +msgstr "São Paulo" #. name for BR-TO msgid "Tocantins" diff --git a/iso_3166_2/ro.po b/iso_3166_2/ro.po index c1caef2a..35e33202 100644 --- a/iso_3166_2/ro.po +++ b/iso_3166_2/ro.po @@ -2007,7 +2007,7 @@ msgstr "Sergipe" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "São Paulo" #. name for BR-TO diff --git a/iso_3166_2/sk.po b/iso_3166_2/sk.po index 4816e13b..da7c37b3 100644 --- a/iso_3166_2/sk.po +++ b/iso_3166_2/sk.po @@ -2089,7 +2089,7 @@ msgstr "Sergipe" # [geodesy] #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "São Paulo" # [geodesy] diff --git a/iso_3166_2/sl.po b/iso_3166_2/sl.po index 9f503f5f..9c259953 100644 --- a/iso_3166_2/sl.po +++ b/iso_3166_2/sl.po @@ -2227,7 +2227,7 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Sao Paulo" #. name for BR-TO diff --git a/iso_3166_2/sr.po b/iso_3166_2/sr.po index c3dd09bd..8c7a25a9 100644 --- a/iso_3166_2/sr.po +++ b/iso_3166_2/sr.po @@ -2008,7 +2008,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/sr@latin.po b/iso_3166_2/sr@latin.po index 7510b8c9..be3436ba 100644 --- a/iso_3166_2/sr@latin.po +++ b/iso_3166_2/sr@latin.po @@ -2008,7 +2008,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO diff --git a/iso_3166_2/sv.po b/iso_3166_2/sv.po index 5e713bb6..4be8189f 100644 --- a/iso_3166_2/sv.po +++ b/iso_3166_2/sv.po @@ -2221,7 +2221,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/th.po b/iso_3166_2/th.po index 8c38b83a..fa1cb0e5 100644 --- a/iso_3166_2/th.po +++ b/iso_3166_2/th.po @@ -1995,7 +1995,7 @@ msgid "Sergipe" msgstr "เซร์ชิเป" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "เซาเปาลู" #. name for BR-TO diff --git a/iso_3166_2/tr.po b/iso_3166_2/tr.po index 991103d6..d9b2aaa1 100644 --- a/iso_3166_2/tr.po +++ b/iso_3166_2/tr.po @@ -2225,7 +2225,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/uk.po b/iso_3166_2/uk.po index 9a1c83e2..3af9b7c5 100644 --- a/iso_3166_2/uk.po +++ b/iso_3166_2/uk.po @@ -1988,7 +1988,7 @@ msgid "Sergipe" msgstr "Сержипі" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Сан-Паулу" #. name for BR-TO diff --git a/iso_3166_2/ve.po b/iso_3166_2/ve.po index 3c4e0601..57cf55cd 100644 --- a/iso_3166_2/ve.po +++ b/iso_3166_2/ve.po @@ -2222,7 +2222,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "San Marino" #. name for BR-TO diff --git a/iso_3166_2/vi.po b/iso_3166_2/vi.po index 86f6f454..ae2c5f17 100644 --- a/iso_3166_2/vi.po +++ b/iso_3166_2/vi.po @@ -1999,8 +1999,8 @@ msgid "Sergipe" msgstr "Sergipe" #. name for BR-SP -msgid "Sâo Paulo" -msgstr "Sâo Paulo" +msgid "São Paulo" +msgstr "São Paulo" #. name for BR-TO msgid "Tocantins" diff --git a/iso_3166_2/wa.po b/iso_3166_2/wa.po index b58381fe..accf3892 100644 --- a/iso_3166_2/wa.po +++ b/iso_3166_2/wa.po @@ -2083,7 +2083,7 @@ msgstr "" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "Canada" #. name for BR-TO diff --git a/iso_3166_2/zh_CN.po b/iso_3166_2/zh_CN.po index 0e74c35e..88a7147d 100644 --- a/iso_3166_2/zh_CN.po +++ b/iso_3166_2/zh_CN.po @@ -2039,7 +2039,7 @@ msgstr "塞尔希培" #. name for BR-SP #, fuzzy -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "圣保罗" #. name for BR-TO diff --git a/iso_3166_2/zh_TW.po b/iso_3166_2/zh_TW.po index e3c50ffe..d2ba14b9 100644 --- a/iso_3166_2/zh_TW.po +++ b/iso_3166_2/zh_TW.po @@ -1983,7 +1983,7 @@ msgid "Sergipe" msgstr "" #. name for BR-SP -msgid "Sâo Paulo" +msgid "São Paulo" msgstr "" #. name for BR-TO |