ICU-2119 update and reorganize currency data

X-SVN-Rev: 11517

icu4c/source/data/locales/af.txt

@@ -87,4 +87,9 @@ af {
     // ShortLanguage { }
     // localPatternChars{}
     //
+
+    // Currency display names
+    Currencies {
+        ZAR { "R", "ZAR" }
+    }
 }

icu4c/source/data/locales/af_ZA.txt

@@ -8,11 +8,6 @@
 af_ZA {
     Version { "1.0" }
 
-    CurrencyElements { 
-        "R",
-        "ZAR",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a",
         "h:mm:ss a",

icu4c/source/data/locales/am_ET.txt

@@ -13,13 +13,6 @@ am_ET {
         "\u1320\u12CB\u1275",
         "\u12A8\u1233\u12D3\u1275",
     }
-    // CountryISBNNumber { "231" }
-    // CountryNumber { "231" }
-    CurrencyElements {
-        "$",
-        "ETB",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a",
         "hh:mm:ss a",
@@ -56,4 +49,9 @@ am_ET {
     //    Width { "210" }
     //    Units { "mm" }
     // }
+
+    // Currency display names
+    Currencies {
+        ETB { "$", "ETB" }
+    }
  }

icu4c/source/data/locales/ar.txt

@@ -142,4 +142,26 @@ ar {
 //        "[\u0621 \u0627-\u063A \u0641-\u064A\u0651 \u0653-\u0655 \u0670-\u06B7 \u06BA-\u06BE \u06C1 \u06C3-\u06CE \u06D0-\u06D2]"
         "[\u0621-\u063A\u0640-\u0655\u0660-\u066C\u200c\u200d\u200f\u200e]"
     }
+
+    // Currency display names
+    Currencies {
+        AED { "\u062F.\u0625.\u200F", "AED" }
+        BHD { "\u062F.\u0628.\u200F", "BHD" }
+        DZD { "\u062F.\u062C.\u200F", "DZD" }
+        EGP { "\u062C.\u0645.\u200F", "EGP" }
+        INR { "\u20A8", "INR" }
+        IQD { "\u062F.\u0639.\u200F", "IQD" }
+        JOD { "\u062F.\u0623.\u200F", "JOD" }
+        KWD { "\u062F.\u0643.\u200F", "KWD" }
+        LBP { "\u0644.\u0644.\u200F", "LBP" }
+        LYD { "\u062F.\u0644.\u200F", "LYD" }
+        MAD { "\u062F.\u0645.\u200F", "MAD" }
+        OMR { "\u0631.\u0639.\u200F", "OMR" }
+        QAR { "\u0631.\u0642.\u200F", "QAR" }
+        SAR { "\u0631.\u0633.\u200F", "SAR" }
+        SDP { "\u062C.\u0633.\u200F", "SDP" }
+        SYP { "\u0644.\u0633.\u200F", "SYP" }
+        TND { "\u062F.\u062A.\u200F", "TND" }
+        YER { "\u0631.\u064A.\u200F", "YER" }
+    }
 }

icu4c/source/data/locales/ar_AE.txt

@@ -7,11 +7,6 @@
 
 ar_AE {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u062F.\u0625.\u200F",
-        "AED",
-        ".",
-    }
 //    LocaleString { "ar_AE" }
 //    ShortCountry { "ARE" }
     LocaleID:int { 0x3801 }

icu4c/source/data/locales/ar_BH.txt

@@ -7,11 +7,6 @@
 
 ar_BH {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u062F.\u0628.\u200F",
-        "BHD",
-        ".",
-    }
 //    LocaleString { "ar_BH" }
 //    ShortCountry { "BHR" }
     LocaleID:int { 0x3c01 }

icu4c/source/data/locales/ar_DZ.txt

@@ -7,11 +7,6 @@
 
 ar_DZ {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u062F.\u062C.\u200F",
-        "DZD",
-        ".",
-    }
 //    LocaleString { "ar_DZ" }
 //    ShortCountry { "DZA" }
     LocaleID:int { 0x1401 }

icu4c/source/data/locales/ar_EG.txt

@@ -7,11 +7,6 @@
 
 ar_EG {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u062C.\u0645.\u200F",
-        "EGP",
-        ".",
-    }
 //    LocaleString { "ar_EG" }
 //    ShortCountry { "EGY" }
     LocaleID:int { 0x0c01 }

icu4c/source/data/locales/ar_IN.txt

@@ -8,11 +8,6 @@
 
 ar_IN {
     Version{ "1.2" }
-    CurrencyElements { 
-        "\u20A8",
-        "INR",
-        ".",
-    }
     DateTimePatterns {
         "h:mm:ss a z",
         "h:mm:ss a z",

icu4c/source/data/locales/ar_IQ.txt

@@ -7,11 +7,6 @@
 
 ar_IQ {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u062F.\u0639.\u200F",
-        "IQD",
-        ".",
-    }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",

icu4c/source/data/locales/ar_JO.txt

@@ -7,11 +7,6 @@
 
 ar_JO {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u062F.\u0623.\u200F",
-        "JOD",
-        ".",
-    }
     DayAbbreviations { 
         "\u0627\u0644\u0623\u062D\u062F",
         "\u0627\u0644\u0627\u062B\u0646\u064A\u0646",

icu4c/source/data/locales/ar_KW.txt

@@ -7,11 +7,6 @@
 
 ar_KW {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u062F.\u0643.\u200F",
-        "KWD",
-        ".",
-    }
 //    LocaleString { "ar_KW" }
 //    ShortCountry { "KWT" }
     LocaleID:int { 0x3401 }

icu4c/source/data/locales/ar_LB.txt

@@ -7,11 +7,6 @@
 
 ar_LB {
     Version{ "1.0" }
-    CurrencyElements { 
-        "\u0644.\u0644.\u200F",
-        "LBP",
-        ".",
-    }
     DayAbbreviations { 
         "\u0627\u0644\u0623\u062D\u062F",
         "\u0627\u0644\u0627\u062B\u0646\u064A\u0646",

icu4c/source/data/locales/ar_LY.txt

@@ -7,11 +7,6 @@
 
 ar_LY {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u062F.\u0644.\u200F",
-        "LYD",
-        ".",
-    }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",

icu4c/source/data/locales/ar_MA.txt

@@ -7,11 +7,6 @@
 
 ar_MA {
     Version{ "1.0" }
-    CurrencyElements { 
-        "\u062F.\u0645.\u200F",
-        "MAD",
-        ".",
-    }
 //    LocaleString { "ar_MA" }
 //    ShortCountry { "MAR" }
     LocaleID:int { 0x1801 }

icu4c/source/data/locales/ar_OM.txt

@@ -7,11 +7,6 @@
 
 ar_OM {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u0631.\u0639.\u200F",
-        "OMR",
-        ".",
-    }
 //    LocaleString { "ar_OM" }
 //    ShortCountry { "OMN" }
     LocaleID:int { 0x2001 }

icu4c/source/data/locales/ar_QA.txt

@@ -7,11 +7,6 @@
 
 ar_QA {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u0631.\u0642.\u200F",
-        "QAR",
-        ".",
-    }
 //    LocaleString { "ar_QA" }
 //    ShortCountry { "QAT" }
     LocaleID:int { 0x4001 }

icu4c/source/data/locales/ar_SA.txt

@@ -7,11 +7,6 @@
 
 ar_SA {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u0631.\u0633.\u200F",
-        "SAR",
-        ".",
-    }
 //    LocaleString { "ar_SA" }
 //    ShortCountry { "SAU" }
     LocaleID:int { 0x0401 }

icu4c/source/data/locales/ar_SD.txt

@@ -7,11 +7,6 @@
 
 ar_SD {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u062C.\u0633.\u200F",
-        "SDP",
-        ".",
-    }
 //    LocaleString { "ar_SD" }
 //    ShortCountry { "SDN" }
 }

icu4c/source/data/locales/ar_SY.txt

@@ -7,11 +7,6 @@
 
 ar_SY {
     Version{ "1.0" }
-    CurrencyElements { 
-        "\u0644.\u0633.\u200F",
-        "SYP",
-        ".",
-    }
     DayAbbreviations { 
         "\u0627\u0644\u0623\u062D\u062F",
         "\u0627\u0644\u0627\u062B\u0646\u064A\u0646",

icu4c/source/data/locales/ar_TN.txt

@@ -7,11 +7,6 @@
 
 ar_TN {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u062F.\u062A.\u200F",
-        "TND",
-        ".",
-    }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",

icu4c/source/data/locales/ar_YE.txt

@@ -7,11 +7,6 @@
 
 ar_YE {
     Version{ "1.0" }
-    CurrencyElements { 
-            "\u0631.\u064A.\u200F",
-            "YER",
-            ".",
-    }
 //    LocaleString { "ar_YE" }
 //    ShortCountry { "YEM" }
     LocaleID:int { 0x2401 }

icu4c/source/data/locales/be.txt

@@ -97,6 +97,7 @@ be {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "bel" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
@@ -113,4 +114,9 @@ be {
         "Cyrl",     // Abbreviation 
     }
     ExemplarCharacters { "[\u0430-\u0437 \u0439-\u0448 \u044b-\u044f \u2019\u0451\u0456\u045e {\u0434\u0436} {\u0434\u0437}]" }
+
+    // Currency display names
+    Currencies {
+        BYB { "\u0420\u0443\u0431", "BYB" }
+    }
 }

icu4c/source/data/locales/be_BY.txt

@@ -7,11 +7,6 @@
 
 be_BY {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u0420\u0443\u0431",
-        "BYB",
-        ",",
-    }
 //    LocaleString { "be_BY" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/bg.txt

@@ -96,6 +96,7 @@ bg {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "bul" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
@@ -115,4 +116,9 @@ bg {
         "Cyrl",     // Abbreviation 
     }
     ExemplarCharacters { "[\u0430-\u044c \u044e\u044f\u0463\u046b]" }
+
+    // Currency display names
+    Currencies {
+        BGL { "\u043B\u0432", "BGL" }
+    }
 }

icu4c/source/data/locales/bg_BG.txt

@@ -7,11 +7,6 @@
 
 bg_BG {
     Version { "1.1" }
-    CurrencyElements { 
-        "\u043B\u0432",
-        "BGL",
-        ",",
-    }
 //    LocaleString { "bg_BG" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/bn.txt

@@ -70,4 +70,9 @@ bn {
         "Beng"
     }
     ExemplarCharacters{"[[:Beng:]\u200c\u200d]"}
+
+    // Currency display names
+    Currencies {
+        INR { "\u099F\u09BE\u0995\u09BE", "INR" }
+    }
 }

icu4c/source/data/locales/bn_IN.txt

@@ -8,11 +8,6 @@
 
 bn_IN {
     Version{ "1.1" }
-    CurrencyElements { 
-        "\u099F\u09BE\u0995\u09BE",
-        "INR",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",

icu4c/source/data/locales/ca.txt

@@ -90,6 +90,7 @@ ca {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "cat" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
@@ -107,4 +108,9 @@ ca {
 //    }
     ExemplarCharacters { "[a-z \u00e9 \u00ed \u00f3 \u00fa \u00e0 \u00e8 \u00f2 \u00ef \u00fc \u0140 \u00e7 \u00f1]" }
 
+
+    // Currency display names
+    Currencies {
+        ESP { "Pts", "ESP" }
+    }
 }

icu4c/source/data/locales/ca_ES.txt

@@ -7,11 +7,6 @@
 
 ca_ES {
     Version{ "1.0" }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     DateTimeElements:intvector {
         2,
         1,

icu4c/source/data/locales/ca_ES_PREEURO.txt

@@ -13,9 +13,4 @@ ca_ES_PREEURO {
         "#,##0%",
         "#E0",
     }
-    CurrencyElements { 
-        "Pts",
-        "ESP",
-        ",",
-    }
 }

icu4c/source/data/locales/cs.txt

@@ -98,6 +98,7 @@ cs {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "ces" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
@@ -114,4 +115,9 @@ cs {
 //        "Latn",  // ISO 15924 Name 
 //    }
     ExemplarCharacters { "[a-z \u00fd \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u011b \u016f \u010d \u010f \u0148 \u0159 \u0161 \u0165 \u017e]" }
+
+    // Currency display names
+    Currencies {
+        CZK { "K\u010D", "CZK" }
+    }
 }

icu4c/source/data/locales/cs_CZ.txt

@@ -7,11 +7,6 @@
 
 cs_CZ {
     Version{ "1.0" }
-    CurrencyElements { 
-        "K\u010D",
-        "CZK",
-        ",",
-    }
 //    LocaleString { "cs_CZ" }
     NumberPatterns { 
         "#,##0.##;-#,##0.##",

icu4c/source/data/locales/da.txt

@@ -94,6 +94,7 @@ da {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "dan" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
@@ -116,4 +117,9 @@ da {
 //        "Latn",  // ISO 15924 Name 
 //    }
     ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fd]" }
+
+    // Currency display names
+    Currencies {
+        DKK { "kr", "DKK" }
+    }
 }

icu4c/source/data/locales/da_DK.txt

@@ -7,11 +7,6 @@
 
 da_DK {
     Version{"1.0"}
-    CurrencyElements { 
-        "kr",
-        "DKK",
-        ",",
-    }
 //    LocaleString { "da_DK" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/de.txt

@@ -502,6 +502,7 @@ de {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "deu" }
     localPatternChars { "GjMtkHmsSEDFwWahKzJe" }
@@ -571,4 +572,11 @@ de {
         "    & oe , \u00f6 & oe , \u00d6\n"
         "    & ue , \u00fc & ue , \u00dc\n"
     }
+
+    // Currency display names
+    Currencies {
+        ATS { "\u00F6S", "ATS" }
+        CHF { "SFr.", "CHF" }
+        DEM { "DM", "DEM" }
+    }
 }

icu4c/source/data/locales/de_AT.txt

@@ -7,11 +7,6 @@
 
 de_AT {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     DateTimeElements:intvector { 
         2,
         1,

icu4c/source/data/locales/de_AT_PREEURO.txt

@@ -7,9 +7,4 @@
 
 de_AT_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "\u00F6S",
-        "ATS",
-        ",",
-    }
 }

icu4c/source/data/locales/de_BE.txt

@@ -11,11 +11,6 @@ de_BE {
 //        "vorm",
 //        "nachm",
 //    }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     DateTimePatterns { 
         "HH 'h' mm 'min' ss 's' z",
         "HH:mm:ss z",

icu4c/source/data/locales/de_CH.txt

@@ -28,11 +28,6 @@ de_CH {
         ZW { "Zimbabwe" }
         GB { "Grossbritannien" }
     }
-    CurrencyElements { 
-        "SFr.",
-        "CHF",
-        ".",
-    }
     LocaleID:int { 0x0807 }
 //    LocaleString { "de_CH" }
     NumberElements { 
@@ -47,6 +42,7 @@ de_CH {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ".",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/de_DE.txt

@@ -7,11 +7,6 @@
 
 de_DE {
     Version { "1.0" }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
 //    LocaleString { "de_DE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/de_DE_PREEURO.txt

@@ -7,9 +7,4 @@
 
 de_DE_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "DM",
-        "DEM",
-        ",",
-    }
 }

icu4c/source/data/locales/de_LU.txt

@@ -7,11 +7,6 @@
 
 de_LU {
     Version { "1.0" }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
 //    LocaleString { "de_LU" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -25,4 +20,9 @@ de_LU {
         2,
         1,
     }
+
+    // Currency display names
+    Currencies {
+        LUF { "F", "LUF" }
+    }
 }

icu4c/source/data/locales/de_LU_PREEURO.txt

@@ -7,11 +7,6 @@
 
 de_LU_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "F",
-        "LUF",
-        ",",
-    }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0 \u00A4;-#,##0 \u00A4",

icu4c/source/data/locales/el.txt

@@ -170,6 +170,7 @@ el {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "ell" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
@@ -244,4 +245,9 @@ el {
         "UNGEGN",
         "::Greek-Latin/UNGEGN;"
     }
+
+    // Currency display names
+    Currencies {
+        GRD { "\u0394\u03C1\u03C7", "GRD" }
+    }
 }

icu4c/source/data/locales/el_GR.txt

@@ -9,11 +9,6 @@ el_GR {
     Version { "1.0" }
 //    LocaleString { "el_GR" }
 
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00\u00a4;-\u00a4#,##0.00",

icu4c/source/data/locales/el_GR_PREEURO.txt

@@ -7,11 +7,6 @@
 
 el_GR_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "\u0394\u03C1\u03C7",
-        "GRD",
-        ",",
-    }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",

icu4c/source/data/locales/en.txt

@@ -464,4 +464,181 @@ en {
         "%%lenient-parse:\n"
         "    & ':' = '.' = ' ' = '-';\n" 
     }
+
+    // Last update: Tue Apr  8 16:57:53 2003
+    Currencies {
+        ADP { "ADP", "Andorran Peseta" } // ANDORRA (AD)
+        AED { "Dh", "UAE Dirham" } // UNITED ARAB EMIRATES (AE)
+        AFN { "Af", "Afghani" } // AFGHANISTAN (AF)
+        ALL { "lek", "Leck" } // ALBANIA (AL)
+        AMD { "dram", "Armenian Dram" } // ARMENIA (AM)
+        ANG { "NA f.", "Netherlands Antillan Guilder" } // NETHERLANDS ANTILLES (AN)
+        AOA { "KZR", "Kwanza" } // ANGOLA (AO)
+        ARS { "Arg$", "Argentine Peso" } // ARGENTINA (AR)
+        AUD { "$A", "Australian Dollar" } // AUSTRALIA (AU), CHRISTMAS ISLAND (CX), COCOS (KEELING) ISLANDS (CC), HEARD ISLAND AND MCDONALD ISLANDS (HM), KIRIBATI (KI), NAURU (NR), NORFOLK ISLAND (NF), TUVALU (TV)
+        AWG { "AWG", "Aruban Guilder" } // ARUBA (AW)
+        AZM { "AZM", "Azerbaijanian Manat" } // AZERBAIJAN (AZ)
+        BAM { "KM", "Convertible Marks" } // BOSNIA AND HERZEGOVINA (BA)
+        BBD { "BDS$", "Barbados Dollar" } // BARBADOS (BB)
+        BDT { "Tk", "Taka" } // BANGLADESH (BD)
+        BGL { "lev", "Lev" } // BULGARIA (BG)
+        BGN { "BGN", "Bulgarian Lev" } // BULGARIA (BG)
+        BHD { "BD", "Bahraini Dinar" } // BAHRAIN (BH)
+        BIF { "Fbu", "Burundi Franc" } // BURUNDI (BI)
+        BMD { "Ber$", "Bermudian Dollar" } // BERMUDA (BM)
+        BND { "BND", "Brunei Dollar" } // BRUNEI DARUSSALAM (BN)
+        BOB { "Bs", "Boliviano" } // BOLIVIA (BO)
+        BOV { "BOV", "Mvdol" } // BOLIVIA (BO)
+        BRL { "R$", "Brazilian Real" } // BRAZIL (BR)
+        BSD { "BSD", "Bahamian Dollar" } // BAHAMAS (BS)
+        BTN { "Nu", "Ngultrum" } // BHUTAN (BT)
+        BWP { "BWP", "Pula" } // BOTSWANA (BW)
+        BYR { "Rbl", "Belarussian Ruble" } // BELARUS (BY)
+        BZD { "BZ$", "Belize Dollar" } // BELIZE (BZ)
+        CAD { "Can$", "Canadian Dollar" } // CANADA (CA)
+        CDF { "CGF", "Franc Congolais" } // CONGO, THE DEMOCRATIC REPUBLIC OF THE (CD)
+        CHF { "SwF", "Swiss Franc" } // LIECHTENSTEIN (LI), SWITZERLAND (CH)
+        CLF { "CLF", "Unidades de fomento" } // CHILE (CL)
+        CLP { "Ch$", "Chilean Peso" } // CHILE (CL)
+        CNY { "Y", "Yuan Renminbi" } // CHINA (CN)
+        COP { "Col$", "Colombian Peso" } // COLOMBIA (CO)
+        CRC { "C", "Costa Rican Colon" } // COSTA RICA (CR)
+        CUP { "CUP", "Cuban Peso" } // CUBA (CU)
+        CVE { "CVEsc", "Cape Verde Escudo" } // CAPE VERDE (CV)
+        CYP { "\u00A3C", "Cyprus Pound" } // CYPRUS (CY)
+        CZK { "CZK", "Czech Koruna" } // CZECH REPUBLIC (CZ)
+        DJF { "DF", "Djibouti Franc" } // DJIBOUTI (DJ)
+        DKK { "DKr", "Danish Krone" } // DENMARK (DK), FAROE ISLANDS (FO), GREENLAND (GL)
+        DOP { "RD$", "Dominican Peso" } // DOMINICAN REPUBLIC (DO)
+        DZD { "DA", "Algerian Dinar" } // ALGERIA (DZ)
+        ECS { "ECS", "Sucre" } // ECUADOR (EC)
+        ECV { "ECV", "Unidad de Valor Constante (UVC)" } // ECUADOR (EC)
+        EEK { "EEK", "Kroon" } // ESTONIA (EE)
+        EGP { "LE", "Egyptian Pound" } // EGYPT (EG)
+        ERN { "ERN", "Nakfa" } // ERITREA (ER)
+        ETB { "Br", "Ethiopian Birr" } // ETHIOPIA (ET)
+        EUR { "\u20AC", "Euro" } // ANDORRA (AD), AUSTRIA (AT), BELGIUM (BE), FINLAND (FI), FRANCE (FR), FRENCH GUIANA (GF), FRENCH SOUTHERN TERRITORIES (TF), GERMANY (DE), GREECE (GR), GUADELOUPE (GP), HOLY SEE (VATICAN CITY STATE) (VA), IRELAND (IE), ITALY (IT), LUXEMBOURG (LU), MARTINIQUE (MQ), MAYOTTE (YT), MONACO (MC), NETHERLANDS (NL), PORTUGAL (PT), REUNION (RE), SAINT PIERRE AND MIQUELON (PM), SAN MARINO (SM), SPAIN (ES)
+        FJD { "F$", "Fiji Dollar" } // FIJI (FJ)
+        FKP { "FKP", "Falkland Islands Pound" } // FALKLAND ISLANDS (MALVINAS) (FK)
+        GBP { "GBP", "Pound Sterling" } // UNITED KINGDOM (GB)
+        GEL { "lari", "Lari" } // GEORGIA (GE)
+        GHC { "GHC", "Cedi" } // GHANA (GH)
+        GIP { "GIP", "Gibraltar Pound" } // GIBRALTAR (GI)
+        GMD { "GMD", "Dalasi" } // GAMBIA (GM)
+        GNF { "GF", "Guinea Franc" } // GUINEA (GN)
+        GTQ { "Q", "Quetzal" } // GUATEMALA (GT)
+        GWP { "GWP", "Guinea-Bissau Peso" } // GUINEA-BISSAU (GW)
+        GYD { "G$", "Guyana Dollar" } // GUYANA (GY)
+        HKD { "HK$", "Hong Kong Dollar" } // HONG KONG (HK)
+        HNL { "L", "Lempira" } // HONDURAS (HN)
+        HRK { "HRK", "Croatian kuna" } // CROATIA (HR)
+        HTG { "HTG", "Gourde" } // HAITI (HT)
+        HUF { "Ft", "Forint" } // HUNGARY (HU)
+        IDR { "Rp", "Rupiah" } // INDONESIA (ID)
+        ILS { "NIS", "New Israeli Sheqel" } // ISRAEL (IL)
+        INR { "Re", "Indian Rupee" } // BHUTAN (BT), INDIA (IN)
+        IQD { "ID", "Iraqi Dinar" } // IRAQ (IQ)
+        IRR { "RI", "Iranian Rial" } // IRAN, ISLAMIC REPUBLIC OF (IR)
+        ISK { "ISK", "Iceland Krona" } // ICELAND (IS)
+        JMD { "J$", "Jamaican Dollar" } // JAMAICA (JM)
+        JOD { "JD", "Jordanian Dinar" } // JORDAN (JO)
+        JPY { "\uFFE5", "Yen" } // JAPAN (JP)
+        KES { "K Sh", "Kenyan Shilling" } // KENYA (KE)
+        KGS { "som", "Som" } // KYRGYZSTAN (KG)
+        KHR { "CR", "Riel" } // CAMBODIA (KH)
+        KMF { "CF", "Comoro Franc" } // COMOROS (KM)
+        KPW { "KPW", "North Korean Won" } // KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF (KP)
+        KRW { "\u20A9", "Won" } // KOREA, REPUBLIC OF (KR)
+        KWD { "KD", "Kuwaiti Dinar" } // KUWAIT (KW)
+        KYD { "KYD", "Cayman Islands Dollar" } // CAYMAN ISLANDS (KY)
+        KZT { "T", "Tenge" } // KAZAKHSTAN (KZ)
+        LAK { "KN", "Kip" } // LAO PEOPLE'S DEMOCRATIC REPUBLIC (LA)
+        LBP { "LL", "Lebanese Pound" } // LEBANON (LB)
+        LKR { "SL Re", "Sri Lanka Rupee" } // SRI LANKA (LK)
+        LRD { "LRD", "Liberian Dollar" } // LIBERIA (LR)
+        LSL { "M", "Loti" } // LESOTHO (LS)
+        LTL { "LTL", "Lithuanian Litas" } // LITHUANIA (LT)
+        LVL { "LVL", "Latvian Lats" } // LATVIA (LV)
+        LYD { "LD", "Lybian Dinar" } // LIBYAN ARAB JAMAHIRIYA (LY)
+        MAD { "DH", "Moroccan Dirham" } // MOROCCO (MA), WESTERN SAHARA (EH)
+        MDL { "MDL", "Moldovan Leu" } // MOLDOVA, REPUBLIC OF (MD)
+        MGF { "FMG", "Malagasy Franc" } // MADAGASCAR (MG)
+        MKD { "MDen", "Denar" } // MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF (MK)
+        MMK { "MMK", "Kyat" } // MYANMAR (MM)
+        MNT { "Tug", "Tugrik" } // MONGOLIA (MN)
+        MOP { "MOP", "Pataca" } // MACAO (MO)
+        MRO { "UM", "Ouguiya" } // MAURITANIA (MR)
+        MTL { "Lm", "Maltese Lira" } // MALTA (MT)
+        MUR { "MUR", "Mauritius Rupee" } // MAURITIUS (MU)
+        MVR { "Rf", "Rufiyaa" } // MALDIVES (MV)
+        MWK { "MK", "Kwacha" } // MALAWI (MW)
+        MXN { "MEX$", "Mexican Peso" } // MEXICO (MX)
+        MXV { "MXV", "Mexican Unidad de Inversion (UDI)" } // MEXICO (MX)
+        MYR { "RM", "Malaysian Ringgit" } // MALAYSIA (MY)
+        MZM { "Mt", "Metical" } // MOZAMBIQUE (MZ)
+        NAD { "N$", "Namibia Dollar" } // NAMIBIA (NA)
+        NGN { "\u20A6", "Naira" } // NIGERIA (NG)
+        NIO { "NIO", "Cordoba Oro" } // NICARAGUA (NI)
+        NOK { "NKr", "Norwegian Krone" } // BOUVET ISLAND (BV), NORWAY (NO), SVALBARD AND JAN MAYEN (SJ)
+        NPR { "Nrs", "Nepalese Rupee" } // NEPAL (NP)
+        NZD { "$NZ", "New Zealand Dollar" } // COOK ISLANDS (CK), NEW ZEALAND (NZ), NIUE (NU), PITCAIRN (PN), TOKELAU (TK)
+        OMR { "RO", "Rial Omani" } // OMAN (OM)
+        PAB { "PAB", "Balboa" } // PANAMA (PA)
+        PEN { "PEN", "Nuevo Sol" } // PERU (PE)
+        PGK { "PGK", "Kina" } // PAPUA NEW GUINEA (PG)
+        PHP { "PHP", "Philippine Peso" } // PHILIPPINES (PH)
+        PKR { "Pra", "Pakistan Rupee" } // PAKISTAN (PK)
+        PLN { "Zl", "Zloty" } // POLAND (PL)
+        PYG { "PYG", "Guarani" } // PARAGUAY (PY)
+        QAR { "QR", "Qatari Rial" } // QATAR (QA)
+        ROL { "leu", "Leu" } // ROMANIA (RO)
+        RUB { "RUB", "Russian Ruble" } // RUSSIAN FEDERATION (RU)
+        RUR { "RUR", "Russian Ruble" } // RUSSIAN FEDERATION (RU)
+        RWF { "RF", "Rwanda Franc" } // RWANDA (RW)
+        SAR { "SRl", "Saudi Riyal" } // SAUDI ARABIA (SA)
+        SBD { "SI$", "Solomon Islands Dollar" } // SOLOMON ISLANDS (SB)
+        SCR { "SR", "Seychelles Rupee" } // SEYCHELLES (SC)
+        SDD { "SDD", "Sudanese Dinar" } // SUDAN (SD)
+        SEK { "SKr", "Swedish Krona" } // SWEDEN (SE)
+        SGD { "S$", "Singapore Dollar" } // SINGAPORE (SG)
+        SHP { "SHP", "Saint Helena Pound" } // SAINT HELENA (SH)
+        SIT { "SIT", "Tolar" } // SLOVENIA (SI)
+        SKK { "Sk", "Slovak Koruna" } // SLOVAKIA (SK)
+        SLL { "Le", "Leone" } // SIERRA LEONE (SL)
+        SOS { "So. Sh.", "Somali Shilling" } // SOMALIA (SO)
+        SRG { "Sf", "Suriname Guilder" } // SURINAME (SR)
+        STD { "Db", "Dobra" } // SAO TOME AND PRINCIPE (ST)
+        SVC { "SVC", "El Salvador Colon" } // EL SALVADOR (SV)
+        SYP { "LS", "Syrian Pound" } // SYRIAN ARAB REPUBLIC (SY)
+        SZL { "E", "Lilangeni" } // SWAZILAND (SZ)
+        THB { "THB", "Baht" } // THAILAND (TH)
+        TJS { "TJS", "Somoni" } // TAJIKISTAN (TJ)
+        TMM { "TMM", "Manat" } // TURKMENISTAN (TM)
+        TND { "TND", "Tunisian Dinar" } // TUNISIA (TN)
+        TOP { "T$", "Pa´anga" } // TONGA (TO)
+        TRL { "TL", "Turkish Lira" } // TURKEY (TR)
+        TTD { "TT$", "Trinidad and Tobago Dollar" } // TRINIDAD AND TOBAGO (TT)
+        TWD { "NT$", "New Taiwan Dollar" } // TAIWAN, PROVINCE OF CHINA (TW)
+        TZS { "T Sh", "Tanzanian Shilling" } // TANZANIA, UNITED REPUBLIC OF (TZ)
+        UAH { "HRV", "Hryvnia" } // UKRAINE (UA)
+        UGX { "U Sh", "Uganda Shilling" } // UGANDA (UG)
+        USD { "US$", "US Dollar" } // AMERICAN SAMOA (AS), BRITISH INDIAN OCEAN TERRITORY (IO), TIMOR-LESTE (TL), EL SALVADOR (SV), GUAM (GU), HAITI (HT), MARSHALL ISLANDS (MH), MICRONESIA, FEDERATED STATES OF (FM), NORTHERN MARIANA ISLANDS (MP), PALAU (PW), PANAMA (PA), PUERTO RICO (PR), TURKS AND CAICOS ISLANDS (TC), UNITED STATES (US), UNITED STATES MINOR OUTLYING ISLANDS (UM), VIRGIN ISLANDS, BRITISH (VG), VIRGIN ISLANDS, U.S. (VI)
+        USN { "USN", "US Dollar (Next day)" } // UNITED STATES (US)
+        USS { "USS", "US Dollar (Same day)" } // UNITED STATES (US)
+        UYU { "Ur$", "Peso Uruguayo" } // URUGUAY (UY)
+        UZS { "SUM", "Uzbekistan Sum" } // UZBEKISTAN (UZ)
+        VEB { "Be", "Bolivar" } // VENEZUELA (VE)
+        VND { "VND", "Dong" } // VIET NAM (VN)
+        VUV { "VT", "Vatu" } // VANUATU (VU)
+        WST { "SAT", "Tala" } // SAMOA (WS)
+        XAF { "XAF", "CFA Franc BEAC" } // CAMEROON (CM), CENTRAL AFRICAN REPUBLIC (CF), CHAD (TD), CONGO (CG), EQUATORIAL GUINEA (GQ), GABON (GA)
+        XCD { "EC$", "East Caribbean Dollar" } // ANGUILLA (AI), ANTIGUA AND BARBUDA (AG), DOMINICA (DM), GRENADA (GD), MONTSERRAT (MS), SAINT KITTS AND NEVIS (KN), SAINT LUCIA (LC), SAINT VINCENT AND THE GRENADINES (VC)
+        XOF { "XOF", "CFA Franc BCEAO" } // BENIN (BJ), BURKINA FASO (BF), COTE D'IVOIRE (CI), GUINEA-BISSAU (GW), MALI (ML), NIGER (NE), SENEGAL (SN), TOGO (TG)
+        XPF { "CFPF", "CFP Franc" } // FRENCH POLYNESIA (PF), NEW CALEDONIA (NC), WALLIS AND FUTUNA (WF)
+        YER { "YRl", "Yemeni Rial" } // YEMEN (YE)
+        YUM { "YUD", "Yugoslavian Dinar" } // YUGOSLAVIA (YU)
+        ZAR { "R", "Rand" } // LESOTHO (LS), NAMIBIA (NA), SOUTH AFRICA (ZA)
+        ZMK { "ZMK", "Kwacha" } // ZAMBIA (ZM)
+        ZWD { "Z$", "Zimbabwe Dollar" } // ZIMBABWE (ZW)
+    }
 }

icu4c/source/data/locales/en_AU.txt

@@ -16,11 +16,6 @@ en_AU {
 //        AU { "Australia" }
 //        NZ { "New Zealand" }
 //    }
-    CurrencyElements { 
-        "$",
-        "AUD",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a",
@@ -39,4 +34,9 @@ en_AU {
     LocaleID:int { 0x0c09 }
 //    LocaleString { "en_AU" }
 //    ShortCountry { "AUS" }
+
+    // Currency display names
+    Currencies {
+        AUD { "$", "Australian Dollar" }
+    }
 }

icu4c/source/data/locales/en_BE.txt

@@ -39,13 +39,9 @@ en_BE {
         "\u2030",
         "\u221E",
         "\uFFFD",
-    }
-//    ShortCountry { "BEL" }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
         ",",
     }
+//    ShortCountry { "BEL" }
 
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/en_BE_PREEURO.txt

@@ -7,11 +7,6 @@
 
 en_BE_PREEURO {
     Version { "1.0" }
-    CurrencyElements {
-        "BF",
-        "BEF",
-        ",",
-    }
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00a4;-#,##0.00 \u00a4",

icu4c/source/data/locales/en_BW.txt

@@ -7,12 +7,6 @@
 
 en_BW {
     Version { "1.0" }
-    ///* Discarding duplicate data for tag: AmPmMarkers */
-    CurrencyElements {
-        "Pu",
-        "BWP",
-        ".",
-    }
     DateTimePatterns {
         "h:mm:ss a",
         "h:mm:ss a",

icu4c/source/data/locales/en_CA.txt

@@ -16,11 +16,6 @@ en_CA {
 //        AU { "Australia" }
 //        NZ { "New Zealand" }
 //    }
-    CurrencyElements {
-        "$",
-        "CAD",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",
@@ -182,4 +177,9 @@ en_CA {
             "NDT",
         }
     }*/
+
+    // Currency display names
+    Currencies {
+        CAD { "$", "Canadian Dollar" }
+    }
 }

icu4c/source/data/locales/en_GB.txt

@@ -16,11 +16,6 @@ en_GB {
 //        AU { "Australia" }
 //        NZ { "New Zealand" }
 //    }
-    CurrencyElements { 
-        "\u00A3",
-        "GBP",
-        ".",
-    }
     DateTimeElements:intvector {
         2,
         1,

icu4c/source/data/locales/en_GB_EURO.txt

@@ -7,11 +7,6 @@
 
 en_GB_EURO {
     Version{"1.0"}
-    CurrencyElements { 
-        "\u20ac",
-        "EUR",
-        ".",
-    }
  
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/en_HK.txt

@@ -11,11 +11,6 @@ en_HK {
 //            "AM",
 //            "PM",
 //    }
-    CurrencyElements { 
-        "HK$",
-        "HKD",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",

icu4c/source/data/locales/en_IE.txt

@@ -16,11 +16,6 @@ en_IE {
 //        AU { "Australia" }
 //        NZ { "New Zealand" }
 //    }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ".",
-    }
     DateTimeElements:intvector { 
         2,
         1,

icu4c/source/data/locales/en_IE_PREEURO.txt

@@ -7,9 +7,4 @@
 
 en_IE_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "IR\u00A3",
-        "IEP",
-        ".",
-    }
 }

icu4c/source/data/locales/en_IN.txt

@@ -11,11 +11,6 @@ en_IN {
 //        "AM",
 //        "PM",
 //    }
-    CurrencyElements { 
-        "\u20a8",
-        "INR",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",
@@ -48,4 +43,7 @@ en_IN {
         "#E0",
     }
 
+    Currencies {
+        INR { "\u00A90#Rs|1#Re|1<Rs", "\u00A90#Rupees|1#Rupee|1<Rupees" }
+    }
 }

icu4c/source/data/locales/en_MT.txt

@@ -12,11 +12,6 @@ en_MT {
 
 //    ShortCountry { MLT }
 
-    CurrencyElements {
-        "Lm",
-        MTL,
-        "."
-    }
 
     NumberPatterns {
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/en_NZ.txt

@@ -16,11 +16,6 @@ en_NZ {
 //        AU { "Australia" }
 //        NZ { "New Zealand" }
 //    }
-    CurrencyElements { 
-        "$",
-        "NZD",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a",
@@ -39,4 +34,9 @@ en_NZ {
     LocaleID:int { 0x1409 }
 //    LocaleString { "en_NZ" }
 //    ShortCountry { "NZL" }
+
+    // Currency display names
+    Currencies {
+        NZD { "$", "New Zealand Dollar" }
+    }
 }

icu4c/source/data/locales/en_PH.txt

@@ -12,11 +12,6 @@ en_PH {
 //        "PM",
 //    }
 
-    CurrencyElements { 
-        "Php",
-        "PHP",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",

icu4c/source/data/locales/en_SG.txt

@@ -5,19 +5,13 @@
 // *
 // ***************************************************************************
 //
-// $Revision: 1.4 $ 
+// $Revision: 1.5 $ 
 // $Tag: 
 // Singapore English locale: Data By Syn Wee Quek
 
 en_SG {
 
     Version { "1.0" }
-    CurrencyElements { 
-        // most commonly used currency sign
-        "S$",   // #1 symbol
-        "SGD",  // #2 int'l symbol
-        ".",    // #3 decimal sep
-    }
     DateTimePatterns {
         "a hh:mm:ss",
         "a hh:mm:ss",

icu4c/source/data/locales/en_US.txt

@@ -7,11 +7,6 @@
 
 en_US {
     Version{ "1.0" }
-    CurrencyElements { 
-        "$",
-        "USD",
-        ".",
-    }
 //    LocaleString { "en_US" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -21,4 +16,9 @@ en_US {
     }
 //    ShortCountry { "USA" }
     LocaleID:int { 0x0409 }
+
+    // Currency display names
+    Currencies {
+        USD { "$", "US Dollar" }
+    }
 }

icu4c/source/data/locales/en_US_POSIX.txt

@@ -26,8 +26,9 @@ en_US_POSIX {
         "-",
         "E",
         "0/00",
-        "INF",  // Older programs can parse infinity this way.
+        "INF",
         "\uFFFD",
+        ".",
     }
 //    LocaleString { "en_US_POSIX" }
     LocaleID:int { 0x7F }

icu4c/source/data/locales/en_VI.txt

@@ -7,11 +7,6 @@
 
 en_VI {
     Version{ "1.0" }
-    CurrencyElements { 
-        "$",
-        "USD",
-        ".",
-    }
 //    LocaleString { "en_VI" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -21,4 +16,9 @@ en_VI {
     }
 //    ShortCountry { "VIR" }
     LocaleID:int { 0x2409 }
+
+    // Currency display names
+    Currencies {
+        USD { "$", "US Dollar" }
+    }
 }

icu4c/source/data/locales/en_ZA.txt

@@ -15,11 +15,6 @@ en_ZA {
 //        IE { "Ireland" }
 //        ZA { "South Africa" }
 //    }
-    CurrencyElements { 
-        "R",
-        "ZAR",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a",
         "h:mm:ss a",

icu4c/source/data/locales/en_ZW.txt

@@ -7,12 +7,6 @@
 
 en_ZW {
     Version { "1.0" }
-    ///* Discarding duplicate data for tag: AmPmMarkers */
-    CurrencyElements {
-        "Z$",
-        "ZWD",
-        ".",
-    }
     DateTimePatterns {
         "h:mm:ss a",
         "h:mm:ss a",

icu4c/source/data/locales/eo.txt

@@ -125,7 +125,7 @@ eo {
     }
     NumberElements { 
         ",",
-        "\u00a0",
+        "\u00A0",
         ";",
         "%",
         "0",
@@ -135,6 +135,7 @@ eo {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "epo" }
     localPatternChars { "GjMtkHmslTDUSnahKzJd" }

icu4c/source/data/locales/es.txt

@@ -337,4 +337,20 @@ es {
         // overflow rule
         "1,000,000,000: =#,##0= (incomplete data);" 
      }
+
+    // Currency display names
+    Currencies {
+        BOB { "$b", "BOB" }
+        DOP { "RD$", "DOP" }
+        ECS { "S/.", "ECS" }
+        ESP { "Pts", "ESP" }
+        GTQ { "Q", "GTQ" }
+        HNL { "L.", "HNL" }
+        NIO { "C$", "NIO" }
+        PAB { "B/", "PAB" }
+        PEN { "S/", "PEN" }
+        PYG { "Gs", "PYG" }
+        UYU { "NU$", "UYU" }
+        VEB { "Bs", "VEB" }
+    }
 }

icu4c/source/data/locales/es_AR.txt

@@ -7,11 +7,6 @@
 
 es_AR {
     Version { "1.0" }
-    CurrencyElements { 
-        "$",
-        "ARS",
-        ",",
-    }
     DateTimePatterns { 
         "HH'h'''mm z",
         "H:mm:ss z",
@@ -35,8 +30,14 @@ es_AR {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     LocaleID:int { 0x2c0a }
 //    LocaleString { "es_AR" }
 //    ShortCountry { "ARG" }
+
+    // Currency display names
+    Currencies {
+        ARS { "$", "ARS" }
+    }
 }

icu4c/source/data/locales/es_BO.txt

@@ -7,11 +7,6 @@
 
 es_BO {
     Version { "1.0" }
-    CurrencyElements { 
-        "$b",
-        "BOB",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,7 @@ es_BO {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortCountry { "BOL" }
 }

icu4c/source/data/locales/es_CL.txt

@@ -7,11 +7,6 @@
 
 es_CL {
     Version { "1.0" }
-    CurrencyElements { 
-        "$",
-        "CLP",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,7 @@ es_CL {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -45,4 +41,9 @@ es_CL {
         "#E0",
     }
 //    ShortCountry { "CHL" }
+
+    // Currency display names
+    Currencies {
+        CLP { "$", "CLP" }
+    }
 }

icu4c/source/data/locales/es_CO.txt

@@ -7,11 +7,6 @@
 
 es_CO {
     Version { "1.0" }
-    CurrencyElements { 
-        "$",
-        "COP",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,12 @@ es_CO {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortCountry { "COL" }
+
+    // Currency display names
+    Currencies {
+        COP { "$", "COP" }
+    }
 }

icu4c/source/data/locales/es_CR.txt

@@ -7,11 +7,6 @@
 
 es_CR {
     Version { "1.0" }
-    CurrencyElements {
-        "\u20A1",
-        "CRC",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,12 @@ es_CR {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortCountry { "CRI" }
+
+    // Currency display names
+    Currencies {
+        CRC { "\u20A1", "CRC" }
+    }
 }

icu4c/source/data/locales/es_DO.txt

@@ -7,11 +7,6 @@
 
 es_DO {
     Version { "1.0" }
-    CurrencyElements { 
-        "RD$",
-        "DOP",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_EC.txt

@@ -7,11 +7,6 @@
 
 es_EC {
     Version { "1.0" }
-    CurrencyElements { 
-        "S/.",
-        "ECS",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,7 @@ es_EC {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/es_ES.txt

@@ -8,11 +8,6 @@
 es_ES {
     Version { "1.0" }
 //    LocaleString { "es_ES" }
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     NumberElements {
         ",",
         ".",
@@ -25,6 +20,7 @@ es_ES {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/es_ES_PREEURO.txt

@@ -7,11 +7,6 @@
 
 es_ES_PREEURO {
     Version { "1.0" }
-    CurrencyElements { 
-        "Pts",
-        "ESP",
-        ",",
-    }    
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0 \u00A4;-#,##0 \u00A4",

icu4c/source/data/locales/es_GT.txt

@@ -7,11 +7,6 @@
 
 es_GT {
     Version { "1.0" }
-    CurrencyElements { 
-        "Q",
-        "GTQ",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_HN.txt

@@ -7,11 +7,6 @@
 
 es_HN {
     Version { "1.0" }
-    CurrencyElements { 
-        "L.",
-        "HNL",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_MX.txt

@@ -7,11 +7,6 @@
 
 es_MX {
     Version { "1.1" }
-    CurrencyElements { 
-        "$",
-        "MXN",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -39,4 +34,9 @@ es_MX {
 //        "\uFFFD",
 //    }
 //    ShortCountry { "MEX" }
+
+    // Currency display names
+    Currencies {
+        MXN { "$", "MXN" }
+    }
 }

icu4c/source/data/locales/es_NI.txt

@@ -7,11 +7,6 @@
 
 es_NI {
     Version { "1.0" }
-    CurrencyElements { 
-        "C$",
-        "NIO",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_PA.txt

@@ -7,11 +7,6 @@
 
 es_PA {
     Version { "1.0" }
-    CurrencyElements { 
-        "B/",
-        "PAB",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_PE.txt

@@ -7,11 +7,6 @@
 
 es_PE {
     Version { "1.0" }
-    CurrencyElements { 
-        "S/",
-        "PEN",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",

icu4c/source/data/locales/es_PR.txt

@@ -7,11 +7,6 @@
 
 es_PR {
     Version{ "1.0" }
-    CurrencyElements { 
-        "$",
-        "USD",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -39,4 +34,9 @@ es_PR {
 //        "\uFFFD",
 //    }
 //    ShortCountry { "PRI" }
+
+    // Currency display names
+    Currencies {
+        USD { "$", "USD" }
+    }
 }

icu4c/source/data/locales/es_PY.txt

@@ -7,11 +7,6 @@
 
 es_PY {
     Version{ "1.1" }
-    CurrencyElements { 
-        "Gs",
-        "PYG",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -35,6 +30,7 @@ es_PY {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/es_SV.txt

@@ -7,11 +7,6 @@
 
 es_SV {
     Version { "1.0" }
-    CurrencyElements { 
-        "\u20A1",
-        "SVC",
-        ".",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -39,4 +34,9 @@ es_SV {
 //    }
 //    ShortCountry { "SLV" }
     LocaleID:int { 0x440a }
+
+    // Currency display names
+    Currencies {
+        SVC { "\u20A1", "SVC" }
+    }
 }

icu4c/source/data/locales/es_US.txt

@@ -7,11 +7,6 @@
 
 es_US {
     Version { "1.0" }
-    CurrencyElements {
-        "$",
-        "USD",
-        ".",
-    }
 //    NumberElements {
 //        ".",
 //        ",",
@@ -46,4 +41,9 @@ es_US {
         "#,##0%",
         "#E0",
     }
+
+    // Currency display names
+    Currencies {
+        USD { "$", "USD" }
+    }
 }

icu4c/source/data/locales/es_UY.txt

@@ -7,11 +7,6 @@
 
 es_UY {
     Version { "1.0" }
-    CurrencyElements {
-        "NU$",
-        "UYU",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,7 @@ es_UY {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/es_VE.txt

@@ -7,11 +7,6 @@
 
 es_VE {
     Version { "1.0" }
-    CurrencyElements { 
-        "Bs",
-        "VEB",
-        ",",
-    }
     DateTimePatterns { 
         "hh:mm:ss a z",
         "hh:mm:ss a z",
@@ -37,6 +32,7 @@ es_VE {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/et.txt

@@ -99,6 +99,7 @@ et {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "est" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
@@ -115,4 +116,9 @@ et {
 //        "Latn",  // ISO 15924 Name 
 //    }
     ExemplarCharacters { "[a-z \u00f5 \u00e4 \u00f6 \u00fc \u0161 \u017e]" }
+
+    // Currency display names
+    Currencies {
+        EEK { "kr", "EEK" }
+    }
 }

icu4c/source/data/locales/et_EE.txt

@@ -7,11 +7,6 @@
 
 et_EE {
     Version{ "1.0" }
-    CurrencyElements { 
-        "kr",
-        "EEK",
-        ",",
-    }
 //    LocaleString { "et_EE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",

icu4c/source/data/locales/eu.txt

@@ -58,7 +58,7 @@ eu {
     }
     NumberElements {
         ",",
-        ".", // even if not used
+        ".",
         ";",
         "%",
         "0",
@@ -66,8 +66,9 @@ eu {
         "-",
         "E",
         "\u2030",
-        "\u221e",
+        "\u221E",
-        "\ufffd",
+        "\uFFFD",
+        ",",
     }
     LocaleID:int { 0x2D }
 //    LocaleScript{  
@@ -83,4 +84,9 @@ eu {
     // ShortLanguage { }
     // localPatternChars{}
     //
+
+    // Currency display names
+    Currencies {
+        ESP { "Pts", "ESP" }
+    }
 }

icu4c/source/data/locales/eu_ES.txt

@@ -7,12 +7,6 @@
 
 eu_ES {
     Version { "1.0" }
-    // /* Discarding duplicate data for tag: AmPmMarkers */
-    CurrencyElements { 
-        "\u20AC",
-        "EUR",
-        ",",
-    }
     DateTimeElements:intvector {
         2,
         1,

icu4c/source/data/locales/eu_ES_PREEURO.txt

@@ -7,11 +7,6 @@
 
 eu_ES_PREEURO {
     Version { "1.0" }
-    CurrencyElements {
-        "Pts",
-        "ESP",
-        ",",
-    }
     NumberPatterns {
         "#,#0.##;-#,#0.##",
         "\u00a4 #,##0;-\u00a4 #,##0",

icu4c/source/data/locales/fa.txt

@@ -714,4 +714,10 @@ fa {
         YIII { "\u06cc\u06cc" }
         ZYYY { "\u0645\u0634\u062a\u0631\u06a9" }
     }
+
+    // Currency display names
+    Currencies {
+        INR { "\u20A8", "INR" }
+        IRR { "\uFDFC", "IRR" }
+    }
 }

icu4c/source/data/locales/fa_IN.txt

@@ -7,11 +7,6 @@
 
 fa_IN {
     Version{ "1.2" }
-    CurrencyElements { 
-        "\u20a8",
-        "INR",
-        ".",
-    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",

icu4c/source/data/locales/fa_IR.txt

@@ -9,11 +9,6 @@
 
 fa_IR {
     Version { "2.0" }
-    CurrencyElements {
-        "\ufdfc",
-        "IRR",
-        "\u066b",
-    }
     DateTimeElements:intvector {
         7,      // Saturday
         1,
@@ -31,17 +26,18 @@ fa_IR {
         "#E0",
     }
     NumberElements { 
-        "\u066b",
+        "\u066B",
-        "\u066c",
+        "\u066C",
         ";",
-        "\u066a",
+        "\u066A",
-        "\u06f0",
+        "\u06F0",
         "#",
         "-",
-        "\u00d7\u06f1\u06f0^",
+        "\u00D7\u06F1\u06F0^",
         "\u2030",
-        "\u221e",
+        "\u221E",
-        "\ufffd",
+        "\uFFFD",
+        "\u066B",
     }
 }
 

icu4c/source/data/locales/fi.txt

@@ -205,6 +205,7 @@ fi {
         "\u2030",
         "\u221E",
         "\uFFFD",
+        ",",
     }
 //    ShortLanguage { "fin" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
@@ -221,4 +222,9 @@ fi {
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
+
+    // Currency display names
+    Currencies {
+        FIM { "mk", "FIM" }
+    }
 }