Imported Upstream version 3.32.2

diff --git a/ChangeLog b/ChangeLog
index 860c5e4..561b80c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+iso-codes 3.32.2
+----------------
+Tobias Quathamer <toddy@debian.org>
+Tue, 7 February 2012
+
+  [ All translations ]
+  * Fix and normalize "Plural-Forms:" formula, because wrong or
+    missing formulas can lead to errors in programs which rely on
+    correct formulas. Closes: #658940
+
+
 iso-codes 3.32.1
 ----------------
 Tobias Quathamer <toddy@debian.org>

diff --git a/configure b/configure
index 959fedc..dc0a322 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for iso-codes 3.32.1.
+# Generated by GNU Autoconf 2.68 for iso-codes 3.32.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='iso-codes'
 PACKAGE_TARNAME='iso-codes'
-PACKAGE_VERSION='3.32.1'
-PACKAGE_STRING='iso-codes 3.32.1'
+PACKAGE_VERSION='3.32.2'
+PACKAGE_STRING='iso-codes 3.32.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1183,7 +1183,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.32.1 to adapt to many kinds of systems.
+\`configure' configures iso-codes 3.32.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1249,7 +1249,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of iso-codes 3.32.1:";;
+     short | recursive ) echo "Configuration of iso-codes 3.32.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1323,7 +1323,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-iso-codes configure 3.32.1
+iso-codes configure 3.32.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1340,7 +1340,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.32.1, which was
+It was created by iso-codes $as_me 3.32.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2156,7 +2156,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='iso-codes'
- VERSION='3.32.1'
+ VERSION='3.32.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2953,7 +2953,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.32.1, which was
+This file was extended by iso-codes $as_me 3.32.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3006,7 +3006,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.32.1
+iso-codes config.status 3.32.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 71e76b2..c22a2c3 100644 (file)
--- 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.32.1])
+AC_INIT([iso-codes],[3.32.2])
 
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign])
 AM_MAINTAINER_MODE

diff --git a/iso_15924/ru.po b/iso_15924/ru.po
index 0b4679f..4f1ab0f 100644 (file)
--- a/iso_15924/ru.po
+++ b/iso_15924/ru.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=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"
 
 #. name for Afak

diff --git a/iso_3166/cs.po b/iso_3166/cs.po
index 5c94795..61bac14 100644 (file)
--- a/iso_3166/cs.po
+++ b/iso_3166/cs.po
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/el.po b/iso_3166/el.po
index 8cbc2c1..1efdb63 100644 (file)
--- a/iso_3166/el.po
+++ b/iso_3166/el.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/es.po b/iso_3166/es.po
index 9a056e1..84f6c8e 100644 (file)
--- a/iso_3166/es.po
+++ b/iso_3166/es.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/he.po b/iso_3166/he.po
index e0b6158..2cd24a9 100644 (file)
--- a/iso_3166/he.po
+++ b/iso_3166/he.po
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/id.po b/iso_3166/id.po
index c80717a..96c39c2 100644 (file)
--- a/iso_3166/id.po
+++ b/iso_3166/id.po
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/nb.po b/iso_3166/nb.po
index ae6016e..96fdbee 100644 (file)
--- a/iso_3166/nb.po
+++ b/iso_3166/nb.po
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/nn.po b/iso_3166/nn.po
index c8ec7ce..604fcce 100644 (file)
--- a/iso_3166/nn.po
+++ b/iso_3166/nn.po
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/or.po b/iso_3166/or.po
index 1815496..935120b 100644 (file)
--- a/iso_3166/or.po
+++ b/iso_3166/or.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
 #. name for AFG

diff --git a/iso_3166/pt.po b/iso_3166/pt.po
index af8a7b7..2b36b0a 100644 (file)
--- a/iso_3166/pt.po
+++ b/iso_3166/pt.po
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166/ru.po b/iso_3166/ru.po
index c993a43..42ae688 100644 (file)
--- a/iso_3166/ru.po
+++ b/iso_3166/ru.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=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"
 
 #. name for AFG

diff --git a/iso_3166/sq.po b/iso_3166/sq.po
index 36bfdad..98b3207 100644 (file)
--- a/iso_3166/sq.po
+++ b/iso_3166/sq.po
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for AFG
 msgid "Afghanistan"

diff --git a/iso_3166_2/da.po b/iso_3166_2/da.po
index 9708d7a..5ff7e1b 100644 (file)
--- a/iso_3166_2/da.po
+++ b/iso_3166_2/da.po
@@ -22,7 +22,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for AD-07
 msgid "Andorra la Vella"

diff --git a/iso_3166_2/hu.po b/iso_3166_2/hu.po
index 3919a85..d0ddeed 100644 (file)
--- a/iso_3166_2/hu.po
+++ b/iso_3166_2/hu.po
@@ -19,7 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for AD-07
 msgid "Andorra la Vella"

diff --git a/iso_4217/et.po b/iso_4217/et.po
index d4df85d..35eced3 100644 (file)
--- a/iso_4217/et.po
+++ b/iso_4217/et.po
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. currency_name for AED
 msgid "UAE Dirham"

diff --git a/iso_4217/ru.po b/iso_4217/ru.po
index 58a0e38..85fcdd9 100644 (file)
--- a/iso_4217/ru.po
+++ b/iso_4217/ru.po
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=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"
 
 #. currency_name for AED

diff --git a/iso_639/fr.po b/iso_639/fr.po
index 9b57bd0..e23c9f9 100644 (file)
--- a/iso_639/fr.po
+++ b/iso_639/fr.po
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for aar, aa
 msgid "Afar"

diff --git a/iso_639/kn.po b/iso_639/kn.po
index d89e9fb..36326bf 100644 (file)
--- a/iso_639/kn.po
+++ b/iso_639/kn.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for aar, aa
 msgid "Afar"

diff --git a/iso_639/nn.po b/iso_639/nn.po
index fe56cdb..bbea035 100644 (file)
--- a/iso_639/nn.po
+++ b/iso_639/nn.po
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for aar, aa
 msgid "Afar"

diff --git a/iso_639/or.po b/iso_639/or.po
index 503787b..fc9a0ba 100644 (file)
--- a/iso_639/or.po
+++ b/iso_639/or.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
 

diff --git a/iso_639/ru.po b/iso_639/ru.po
index 2568a7b..a42a135 100644 (file)
--- a/iso_639/ru.po
+++ b/iso_639/ru.po
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=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"
 
 #. name for aar, aa

diff --git a/iso_639_3/da.po b/iso_639_3/da.po
index 050951b..02e7752 100644 (file)
--- a/iso_639_3/da.po
+++ b/iso_639_3/da.po
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for aaa
 msgid "Ghotuo"

diff --git a/iso_639_3/fr.po b/iso_639_3/fr.po
index 1c4f5b0..7c37aa1 100644 (file)
--- a/iso_639_3/fr.po
+++ b/iso_639_3/fr.po
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. name for aaa
 msgid "Ghotuo"

diff --git a/iso_639_3/kn.po b/iso_639_3/kn.po
index 259b42a..5c12aae 100644 (file)
--- a/iso_639_3/kn.po
+++ b/iso_639_3/kn.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for aaa
 msgid "Ghotuo"

diff --git a/iso_639_3/nn.po b/iso_639_3/nn.po
index de5ae2e..df57cf2 100644 (file)
--- a/iso_639_3/nn.po
+++ b/iso_639_3/nn.po
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. name for aaa
 msgid "Ghotuo"

diff --git a/iso_639_3/or.po b/iso_639_3/or.po
index eba594a..3b82555 100644 (file)
--- a/iso_639_3/or.po
+++ b/iso_639_3/or.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
 #. name for aaa

diff --git a/iso_639_3/ru.po b/iso_639_3/ru.po
index 8207858..0f796c4 100644 (file)
--- a/iso_639_3/ru.po
+++ b/iso_639_3/ru.po
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=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"
 
 #. name for aaa