about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--locale/iso-4217.def2
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/SUPPORTED1
-rw-r--r--localedata/locales/ca_ES4
-rw-r--r--localedata/locales/ca_ES@euro4
6 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 310c6b6c05..cb3009a041 100644
--- 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 d35def61a2..b9f3a9f617 100644
--- 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 8e768997db..ce13b01ce5 100644
--- 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 14fbb57086..8522572e92 100644
--- 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 e0f2beba17..4535a24c18 100644
--- 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 3178aa3a0a..f1f1da96a0 100644
--- 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"
 %