Update.

2000-08-22  Ulrich Drepper  <drepper@redhat.com>

	* locale/iso-4217.def: Update entry for Nicaragua.

diff --git a/ChangeLog b/ChangeLog
index 310c6b6c052638766bdb41cd6a999cea817aef4a..cb3009a04130d615bc6ee81bd7852676e089f903 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-22  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/iso-4217.def: Update entry for Nicaragua.
+
 2000-08-22  Mark Kettenis  <kettenis@gnu.org>
 
        * hurd/hurdsig.c: Rearrange headers a bit.

diff --git a/locale/iso-4217.def b/locale/iso-4217.def
index d35def61a2fba64ac64b48cd334d3f3d90c5dadb..b9f3a9f6171bc32904c4167240fb0edc7cb17da8 100644 (file)
--- a/locale/iso-4217.def
+++ b/locale/iso-4217.def
@@ -129,7 +129,7 @@ DEFINE_INT_CURR("MYR ")             /* Malaysian Ringgit  */
 DEFINE_INT_CURR("MZM ")                /* Mozambique Metical  */
 DEFINE_INT_CURR("NAD ")                /* Namibia Dollar  */
 DEFINE_INT_CURR("NGN ")                /* Nigeria Naira  */
-DEFINE_INT_CURR("NIC ")                /* Nicaragua Cordoba  */
+DEFINE_INT_CURR("NIO ")                /* Nicaragua Cordoba Oro  */
 DEFINE_INT_CURR("NLG ")                /* Netherlands Guilder  */
 DEFINE_INT_CURR("NOK ")                /* Norwegian Krone  */
 DEFINE_INT_CURR("NPR ")                /* Nepalese Rupee  */

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8e768997db52f0cad47459b9c14cafc163a98118..ce13b01ce5f5a92b027ea088f04a7484482deb36 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-22  Ulrich Drepper  <drepper@redhat.com>
 
+       * locales/ca_ES@euro: Country is Spain.
+       * locales/ca_ES: Likewise.
+
        * locales/es_MX: Correct int_curr_symbol.
        * locales/es_PE: Likewise.
 

diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 14fbb57086fd617c9e2e09bd5f8737a901a94281..8522572e92fe2b586aeb110752343498460d8e8c 100644 (file)
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -70,7 +70,6 @@ es_VE ISO-8859-1
 et_EE ISO-8859-1
 eu_ES ISO-8859-1
 eu_ES@euro ISO-8859-15
-fa_IR ISIRI-3342
 fi_FI ISO-8859-1
 fi_FI@euro ISO-8859-15
 fo_FO ISO-8859-1

diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index e0f2beba17779970c9d913d876d32b6456e3f715..4535a24c18b579112ea1816b68b175a659209d1d 100644 (file)
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -1,7 +1,7 @@
 comment_char %
 escape_char  /
 %
-% Catalan Language Locale for Catalonia
+% Catalan Language Locale for Spain
 % Source: RAP
 % Contact: Joan Carles Soler
 % Email: Joan.Soler@uv.es
@@ -27,7 +27,7 @@ email      "bug-glibc@gnu.org"
 tel        ""
 fax        ""
 language   "Catalan"
-territory  "Catalonia"
+territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
 %

diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index 3178aa3a0af74fcc2e04496609e7d3e761b3b842..f1f1da96a05985f509d13e86855d1215320eb521 100644 (file)
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -1,7 +1,7 @@
 comment_char %
 escape_char  /
 %
-% Catalan Language Locale for Catalonia with Euro
+% Catalan Language Locale for Spain with Euro
 % Language: ca
 % Territory: ES
 % Option: euro
@@ -22,7 +22,7 @@ email      "bug-glibc@gnu.org"
 tel        ""
 fax        ""
 language   "Catalan"
-territory  "Catalonia"
+territory  "Spain"
 revision   "1.0"
 date       "2000-08-20"
 %