Update.

2002-02-28  Ulrich Drepper  <drepper@redhat.com>

	* locale/iso-4217.def: Remove obsolete currencies for countries
	with Euro.

38 files changed, 108 insertions, 341 deletions

diff --git a/ChangeLog b/ChangeLog
index e17162fb00..2b80b2555d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/iso-4217.def: Remove obsolete currencies for countries
+	with Euro.
+
 2002-02-28  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
 	* posix/regcomp.c (regcomp): Remove a redundant condition.
diff --git a/locale/iso-4217.def b/locale/iso-4217.def
index 9d5d92927c..f8634d004f 100644
--- a/locale/iso-4217.def
+++ b/locale/iso-4217.def
@@ -6,7 +6,6 @@
  *
  * !!! The list has to be sorted !!!
  */
-DEFINE_INT_CURR("ADP ")		/* Andorran Peseta -> EUR  */
 DEFINE_INT_CURR("AED ")		/* United Arab Emirates Dirham  */
 DEFINE_INT_CURR("AFA ")		/* Afghanistan Afgani  */
 DEFINE_INT_CURR("ALL ")		/* Albanian Lek  */
@@ -14,14 +13,12 @@ DEFINE_INT_CURR("AMD ")		/* Armenia Dram  */
 DEFINE_INT_CURR("ANG ")		/* Netherlands Antilles  */
 DEFINE_INT_CURR("AOA ")		/* Angolan Kwanza  */
 DEFINE_INT_CURR("ARS ")		/* Argentine Peso  */
-DEFINE_INT_CURR("ATS ")		/* Austrian Schilling -> EUR  */
 DEFINE_INT_CURR("AUD ")		/* Australian Dollar  */
 DEFINE_INT_CURR("AWG ")		/* Aruba Guilder  */
 DEFINE_INT_CURR("AZM ")		/* Azerbaijan Manat  */
 DEFINE_INT_CURR("BAK ")		/* Bosnian and Herzegovina Convertible Mark  */
 DEFINE_INT_CURR("BBD ")		/* Barbados Dollar  */
 DEFINE_INT_CURR("BDT ")		/* Bangladesh Taka  */
-DEFINE_INT_CURR("BEF ")		/* Belgian Franc -> EUR  */
 DEFINE_INT_CURR("BGL ")		/* Bulgarian Lev  */
 DEFINE_INT_CURR("BHD ")		/* Bahraini Dinar  */
 DEFINE_INT_CURR("BIF ")		/* Burundi Franc  */
@@ -45,7 +42,6 @@ DEFINE_INT_CURR("CUP ")		/* Cuban Peso  */
 DEFINE_INT_CURR("CVE ")		/* Cape Verde Escudo  */
 DEFINE_INT_CURR("CYP ")		/* Cypriot Pound  */
 DEFINE_INT_CURR("CZK ")		/* Czech Koruna  */
-DEFINE_INT_CURR("DEM ")		/* German Mark -> EUR  */
 DEFINE_INT_CURR("DJF ")		/* Djibouti Franc  */
 DEFINE_INT_CURR("DKK ")		/* Danish Krone (Faroe Islands, Greenland)  */
 DEFINE_INT_CURR("DOP ")		/* Dominican Republic  */
@@ -53,20 +49,16 @@ DEFINE_INT_CURR("DZD ")		/* Algerian Dinar  */
 DEFINE_INT_CURR("EEK ")		/* Estonian Kroon  */
 DEFINE_INT_CURR("EGP ")		/* Egyptian Pound  */
 DEFINE_INT_CURR("ERN ")		/* Eritrean Nakfa  */
-DEFINE_INT_CURR("ESP ")		/* Spanish Peseta -> EUR  */
 DEFINE_INT_CURR("ETB ")		/* Ethiopian Birr  */
 DEFINE_INT_CURR("EUR ")		/* European Union Euro  */
-DEFINE_INT_CURR("FIM ")		/* Finnish Markka -> EUR  */
 DEFINE_INT_CURR("FJD ")		/* Fiji Dollar  */
 DEFINE_INT_CURR("FKP ")		/* Falkland Islands Pound (Malvinas)  */
-DEFINE_INT_CURR("FRF ")		/* French Franc -> EUR  */
 DEFINE_INT_CURR("GBP ")		/* British Pound  */
 DEFINE_INT_CURR("GEL ")		/* Georgia Lari  */
 DEFINE_INT_CURR("GHC ")		/* Ghana Cedi  */
 DEFINE_INT_CURR("GIP ")		/* Gibraltar Pound  */
 DEFINE_INT_CURR("GMD ")		/* Gambian Dalasi  */
 DEFINE_INT_CURR("GNF ")		/* Guinea Franc  */
-DEFINE_INT_CURR("GRD ")		/* Greek Drachma -> EUR  */
 DEFINE_INT_CURR("GTQ ")		/* Guatemala Quetzal  */
 DEFINE_INT_CURR("GYD ")		/* Guyana Dollar  */
 DEFINE_INT_CURR("HKD ")		/* Hong Kong Dollar  */
@@ -75,14 +67,12 @@ DEFINE_INT_CURR("HRK ")		/* Croatia Kuna  */
 DEFINE_INT_CURR("HTG ")		/* Haiti Gourde  */
 DEFINE_INT_CURR("HUF ")		/* Hungarian Forint  */
 DEFINE_INT_CURR("IDR ")		/* Indonesia Rupiah  */
-DEFINE_INT_CURR("IEP ")		/* Irish Pound -> EUR  */
 DEFINE_INT_CURR("ILS ")		/* Israeli Shekel  */
 DEFINE_INT_CURR("IMP ")		/* Isle of Man Pounds  */
 DEFINE_INT_CURR("INR ")		/* Indian Rupee (Bhutan)  */
 DEFINE_INT_CURR("IQD ")		/* Iraqi Dinar  */
 DEFINE_INT_CURR("IRR ")		/* Iranian Rial  */
 DEFINE_INT_CURR("ISK ")		/* Iceland Krona  */
-DEFINE_INT_CURR("ITL ")		/* Italian Lira -> EUR  */
 DEFINE_INT_CURR("JMD ")		/* Jamaican Dollar  */
 DEFINE_INT_CURR("JOD ")		/* Jordanian Dinar  */
 DEFINE_INT_CURR("JPY ")		/* Japanese Yen  */
@@ -101,7 +91,6 @@ DEFINE_INT_CURR("LKR ")		/* Sri Lankan Rupee  */
 DEFINE_INT_CURR("LRD ")		/* Liberian Dollar  */
 DEFINE_INT_CURR("LSL ")		/* Lesotho Maloti  */
 DEFINE_INT_CURR("LTL ")		/* Lithuanian Litas  */
-DEFINE_INT_CURR("LUF ")		/* Luxembourg Franc -> EUR  */
 DEFINE_INT_CURR("LVL ")		/* Latvia Lat  */
 DEFINE_INT_CURR("LYD ")		/* Libyan Arab Jamahiriya Dinar  */
 DEFINE_INT_CURR("MAD ")		/* Moroccan Dirham  */
@@ -122,7 +111,6 @@ DEFINE_INT_CURR("MZM ")		/* Mozambique Metical  */
 DEFINE_INT_CURR("NAD ")		/* Namibia Dollar  */
 DEFINE_INT_CURR("NGN ")		/* Nigeria Naira  */
 DEFINE_INT_CURR("NIO ")		/* Nicaragua Cordoba Oro  */
-DEFINE_INT_CURR("NLG ")		/* Netherlands Guilder -> EUR  */
 DEFINE_INT_CURR("NOK ")		/* Norwegian Krone  */
 DEFINE_INT_CURR("NPR ")		/* Nepalese Rupee  */
 DEFINE_INT_CURR("NZD ")		/* New Zealand Dollar  */
@@ -133,7 +121,6 @@ DEFINE_INT_CURR("PGK ")		/* Papau New Guinea Kina  */
 DEFINE_INT_CURR("PHP ")		/* Philippines Peso  */
 DEFINE_INT_CURR("PKR ")		/* Pakistan Rupee  */
 DEFINE_INT_CURR("PLN ")		/* Polish Zloty  */
-DEFINE_INT_CURR("PTE ")		/* Portugese Escudo -> EUR  */
 DEFINE_INT_CURR("PYG ")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR ")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL ")		/* Romanian Leu  */
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 92a27484e8..f023454f67 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,42 @@
 2002-02-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* locales/br_FR: Eliminate old national currencies of countries
+	participating in Euro.  Make @euro files pure copies.
+	* locales/ca_ES: Likewise.
+	* locales/ca_ES@euro: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_AT@euro: Likewise.
+	* locales/de_BE: Likewise.
+	* locales/de_BE@euro: Likewise.
+	* locales/de_DE: Likewise.
+	* locales/de_DE@euro: Likewise.
+	* locales/de_LU: Likewise.
+	* locales/de_LU@euro: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/el_GR@euro: Likewise.
+	* locales/en_IE: Likewise.
+	* locales/en_IE@euro: Likewise.
+	* locales/es_ES: Likewise.
+	* locales/es_ES@euro: Likewise.
+	* locales/fi_FI: Likewise.
+	* locales/fi_FI@euro: Likewise.
+	* locales/fr_BE: Likewise.
+	* locales/fr_BE@euro: Likewise.
+	* locales/fr_FR: Likewise.
+	* locales/fr_FR@euro: Likewise.
+	* locales/fr_LU: Likewise.
+	* locales/fr_LU@euro: Likewise.
+	* locales/ga_IE: Likewise.
+	* locales/ga_IE@euro: Likewise.
+	* locales/gl_ES: Likewise.
+	* locales/gl_ES@euro: Likewise.
+	* locales/it_IT: Likewise.
+	* locales/it_IT@euro: Likewise.
+	* locales/nl_NL: Likewise.
+	* locales/nl_NL@euro: Likewise.
+	* locales/pt_PT: Likewise.
+	* locales/pt_PT@euro: Likewise.
+
 	* locales/br_FR@euro: New file.
 
 2002-02-23  Ulrich Drepper  <drepper@redhat.com>
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index e79f994829..a9afbc0af8 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -13,7 +13,6 @@ escape_char  /
 % Revision: 0.5
 % Date: 2001-01-28
 % Users: general
-% Repertoiremap:
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.
@@ -99,8 +98,8 @@ noexpr  "<U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0046><U0052><U0046><U0020>"
-currency_symbol           "<U0046>"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U0020>"
 mon_grouping              3;3
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 8a76bef46c..4161efffd6 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -2120,8 +2120,8 @@ noexpr  "<U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol      "<U0045><U0053><U0050><U0020>"
-currency_symbol      "<U0050><U0074><U0073>"
+int_curr_symbol      "<U0045><U0055><U0052><U0020>"
+currency_symbol      "<U20AC>"
 mon_decimal_point    "<U002C>"
 mon_thousands_sep    "<U002E>"
 mon_grouping         2;3
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index f1f1da96a0..73fffd0da9 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -53,21 +53,7 @@ copy "ca_ES"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol      "<U0045><U0055><U0052><U0020>"
-currency_symbol      "<U20AC>"
-mon_decimal_point    "<U002C>"
-mon_thousands_sep    "<U002E>"
-mon_grouping         2;3
-positive_sign        ""
-negative_sign        "<U002D>"
-int_frac_digits      0
-frac_digits          0
-p_cs_precedes        1
-p_sep_by_space       1
-n_cs_precedes        1
-n_sep_by_space       1
-p_sign_posn          1
-n_sign_posn          1
+copy "ca_ES"
 END LC_MONETARY
 
 LC_NUMERIC
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 7b2c3d92ee..335b1e7d09 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -13,7 +13,6 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.
@@ -60,9 +59,8 @@ noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
-
-int_curr_symbol           "<U0041><U0054><U0053><U0020>"
-currency_symbol           "<U0053>"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U0020>"
 mon_grouping              3;3
diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro
index 58ae9fab05..6e01cf4e71 100644
--- a/localedata/locales/de_AT@euro
+++ b/localedata/locales/de_AT@euro
@@ -58,22 +58,7 @@ copy "de_AT"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0045><U0055><U0052><U0020>"
-currency_symbol           "<U20AC>"
-mon_decimal_point         "<U002C>"
-mon_thousands_sep         "<U0020>"
-mon_grouping              3;3
-positive_sign             ""
-negative_sign             "<U002D>"
-int_frac_digits           2
-frac_digits               2
-p_cs_precedes             1
-p_sep_by_space            1
-n_cs_precedes             1
-n_sep_by_space            1
-p_sign_posn               1
-n_sign_posn               1
-
+copy "de_AT"
 END LC_MONETARY
 
 LC_NUMERIC
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 12580399d7..91351f5b8f 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -59,8 +59,8 @@ copy "de_DE"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0042><U0045><U0046><U0020>"
-currency_symbol           "<U0046><U0072>"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U002E>"
 mon_grouping              3;3
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index 4efef0baf3..8ea7ab2b99 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -51,21 +51,7 @@ copy "de_BE"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0045><U0055><U0052><U0020>"
-currency_symbol           "<U20AC>"
-mon_decimal_point         "<U002C>"
-mon_thousands_sep         "<U002E>"
-mon_grouping              3;3
-positive_sign             ""
-negative_sign             "<U002D>"
-int_frac_digits           2
-frac_digits               2
-p_cs_precedes             1
-p_sep_by_space            1
-n_cs_precedes             1
-n_sep_by_space            1
-p_sign_posn               4
-n_sign_posn               4
+copy "de_BE"
 END LC_MONETARY
 
 LC_NUMERIC
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 05111ab893..765b2d634b 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -69,8 +69,8 @@ copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MONETARY
-int_curr_symbol     "<U0044><U0045><U004D><U0020>"
-currency_symbol     "<U0044><U004D>"
+int_curr_symbol     "<U0045><U0055><U0052><U0020>"
+currency_symbol     "<U20AC>"
 mon_decimal_point   "<U002C>"
 mon_thousands_sep   "<U002E>"
 mon_grouping        3;3
diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
index 5d80fa3589..b2770ff611 100644
--- a/localedata/locales/de_DE@euro
+++ b/localedata/locales/de_DE@euro
@@ -42,22 +42,7 @@ copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MONETARY
-int_curr_symbol     "<U0045><U0055><U0052><U0020>"
-currency_symbol     "<U20AC>"
-mon_decimal_point   "<U002C>"
-mon_thousands_sep   "<U002E>"
-mon_grouping        3;3
-positive_sign       ""
-negative_sign       "<U002D>"
-int_frac_digits     2
-frac_digits         2
-p_cs_precedes       0
-p_sep_by_space      1
-n_cs_precedes       0
-n_sep_by_space      1
-p_sign_posn         1
-n_sign_posn         1
-%
+copy "de_DE"
 END LC_MONETARY
 
 LC_NUMERIC
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 5f3cafb160..2396502fa3 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -59,8 +59,8 @@ copy "de_DE"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U004C><U0055><U0046><U0020>"
-currency_symbol           "<U0046><U004C><U0055><U0058>"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U002E>"
 mon_grouping              3;3
diff -