From 7579ce2d0a0500e92e4c7b4e28b4557bb666bf2c Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Thu, 26 Jul 2001 22:04:49 +0000 Subject: [PATCH] ICU-639 Misc locale data fixes X-SVN-Rev: 5354 --- icu4c/data/af_ZA.txt | 1 + icu4c/data/ar_IN.txt | 20 ++++++++++---------- icu4c/data/de.txt | 6 +++--- icu4c/data/es_BO.txt | 2 +- icu4c/data/hi.txt | 2 +- icu4c/data/root.txt | 8 +++++++- icu4c/data/sh.txt | 2 +- icu4c/data/sh_YU.txt | 1 - icu4c/data/sr.txt | 11 ++++++----- icu4c/data/ta_IN.txt | 2 +- icu4c/data/te_IN.txt | 16 ++++++++-------- icu4c/data/zh.txt | 2 +- icu4c/data/zh_CN.txt | 4 ++-- icu4c/data/zh_TW.txt | 6 +++--- icu4c/source/data/locales/af_ZA.txt | 1 + icu4c/source/data/locales/ar_IN.txt | 20 ++++++++++---------- icu4c/source/data/locales/de.txt | 6 +++--- icu4c/source/data/locales/es_BO.txt | 2 +- icu4c/source/data/locales/hi.txt | 2 +- icu4c/source/data/locales/root.txt | 8 +++++++- icu4c/source/data/locales/sh.txt | 2 +- icu4c/source/data/locales/sh_YU.txt | 1 - icu4c/source/data/locales/sr.txt | 11 ++++++----- icu4c/source/data/locales/ta_IN.txt | 2 +- icu4c/source/data/locales/te_IN.txt | 16 ++++++++-------- icu4c/source/data/locales/zh.txt | 2 +- icu4c/source/data/locales/zh_CN.txt | 4 ++-- icu4c/source/data/locales/zh_TW.txt | 6 +++--- 28 files changed, 90 insertions(+), 76 deletions(-) diff --git a/icu4c/data/af_ZA.txt b/icu4c/data/af_ZA.txt index 12e7035fd8d..789d1905f87 100644 --- a/icu4c/data/af_ZA.txt +++ b/icu4c/data/af_ZA.txt @@ -32,4 +32,5 @@ af_ZA { } LocaleID {"0436"} LocaleString { "af_ZA" } + ShortCountry{ "ZAK" } } diff --git a/icu4c/data/ar_IN.txt b/icu4c/data/ar_IN.txt index 8a85d873251..c97b8ec9ce5 100644 --- a/icu4c/data/ar_IN.txt +++ b/icu4c/data/ar_IN.txt @@ -13,16 +13,16 @@ ar_IN { "INR ", ".", } - DateTimePatterns { - "hh:mm:ss aa z", - "hh:mm:ss z", - "hh:mm:ss z", - "hh:mm:ss z", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "{1} {0}", + DateTimePatterns { + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd/mm/yyyy", + "d/m/yy", + "{1} {0}" } NumberElements { ".", diff --git a/icu4c/data/de.txt b/icu4c/data/de.txt index 8458534e063..dbdb2428d3e 100644 --- a/icu4c/data/de.txt +++ b/icu4c/data/de.txt @@ -240,7 +240,7 @@ de { HM { "Heard und McDonaldinseln" } KY { "Kaimaninseln" } CC { "Kokosinseln" } - MO { "Macau" } + MO { "Macau S.A.R.,China" } MQ { "Martinique" } YT { "Mayotte" } MS { "Montserrat" } @@ -262,7 +262,7 @@ de { // some entries that are not in the official list: EH { "West Sahara" } - // same as in root: HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } SP { "Serbien" } // Zaire is now the Democratic Republic of Congo (CD) // same as in root: ZR { "Zaire" } @@ -272,7 +272,7 @@ de { "4", } DateTimePatterns { - "H.mm' Uhr 'z", + "H:mm' Uhr 'z", "HH:mm:ss z", "HH:mm:ss", "HH:mm", diff --git a/icu4c/data/es_BO.txt b/icu4c/data/es_BO.txt index 35a460fb9e2..5b95421ca79 100644 --- a/icu4c/data/es_BO.txt +++ b/icu4c/data/es_BO.txt @@ -9,7 +9,7 @@ es_BO { CurrencyElements { "B$", "BOB", - ".", + ",", } DateTimePatterns { "hh:mm:ss a z", diff --git a/icu4c/data/hi.txt b/icu4c/data/hi.txt index 834a4b8eb4f..bf150e9bec5 100644 --- a/icu4c/data/hi.txt +++ b/icu4c/data/hi.txt @@ -175,7 +175,7 @@ hi { "\u0935\u0930\u094d\u091c\u0940\u0928 " "\u0906\u0908\u0932\u0948\u0902\u0921\u0938\u094d" } TP { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" } - HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" } + //HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" } VU { "\u0938\u093e\u0928\u0941\u0905\u0924\u0941" } // CHECK - #12 HN { "\u0939\u093e\u0945\u0928\u0921\u0941\u0930\u093e\u0938" } HR { "\u0915\u094d\u0930\u094b\u0936\u0940\u092f\u093e" } diff --git a/icu4c/data/root.txt b/icu4c/data/root.txt index c9753c22ae9..96a8959f51a 100644 --- a/icu4c/data/root.txt +++ b/icu4c/data/root.txt @@ -433,7 +433,7 @@ root { GY { "Guyana" } HT { "Haiti" } HN { "Honduras" } - HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } HU { "Hungary" } IS { "Iceland" } IN { "India" } @@ -1166,5 +1166,11 @@ root { "Anchorage", } } + LocaleScript{ + "Latin", + "Latn", + "Latf", + "Latg" + } } diff --git a/icu4c/data/sh.txt b/icu4c/data/sh.txt index 0102d34cfc3..c19d0ab3f60 100644 --- a/icu4c/data/sh.txt +++ b/icu4c/data/sh.txt @@ -93,7 +93,7 @@ sh { GY { "Gvajana" } HT { "Haiti" } HN { "Honduras" } - HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } HU { "Ma\u0111arska" } IS { "Island" } IN { "Indija" } diff --git a/icu4c/data/sh_YU.txt b/icu4c/data/sh_YU.txt index 0bd28b23a3d..f9908488f2d 100644 --- a/icu4c/data/sh_YU.txt +++ b/icu4c/data/sh_YU.txt @@ -12,7 +12,6 @@ sh_YU { ",", } LocaleString { "sh_YU" } - /* Discarding duplicate data for tag: NumberPatterns */ ShortCountry { "YUG" } LocaleID { "081a" } } diff --git a/icu4c/data/sr.txt b/icu4c/data/sr.txt index ea76c28bf27..768aa976057 100644 --- a/icu4c/data/sr.txt +++ b/icu4c/data/sr.txt @@ -117,7 +117,7 @@ sr { GY { "\u0413\u0432\u0430\u0458\u0430\u043D\u0430" } HT { "\u0425\u0430\u0438\u0442\u0438" } HN { "\u0425\u043E\u043D\u0434\u0443\u0440\u0430\u0441" } - HK { "\u0425\u043E\u043D\u0433 \u041A\u043E\u043D\u0433" } + //HK { "\u0425\u043E\u043D\u0433 \u041A\u043E\u043D\u0433" } HU { "\u041C\u0430\u0452\u0430\u0440\u0441\u043A\u0430" } IS { "\u0418\u0441\u043B\u0430\u043D\u0434" } IN { "\u0418\u043D\u0434\u0438\u0458\u0430" } @@ -236,10 +236,11 @@ sr { "HH.mm.ss z", "H.mm.ss", "H.mm", - "EEEE, yyyy, MMMM d", - "EEEE, yyyy, MMMM d", - "yyyy.M.d", - "yy.M.d", + "EEEE, dd.MMMM.yyyy.", + "EEEE, d.MM.yyyy.", + "EEEE, d.MM.yyyy.", + "dd.MM.yyyy.", + "d.M.yy.", "{1} {0}", } DayAbbreviations { diff --git a/icu4c/data/ta_IN.txt b/icu4c/data/ta_IN.txt index 9123a526d93..b61a28036f3 100644 --- a/icu4c/data/ta_IN.txt +++ b/icu4c/data/ta_IN.txt @@ -8,7 +8,7 @@ ta_IN { ShortCountry { IND } CurrencyElements { - "$", + "\u0bb0\u0bc2.", "INR", // Rs. ? No. "." } diff --git a/icu4c/data/te_IN.txt b/icu4c/data/te_IN.txt index 380774f8808..546d0583267 100644 --- a/icu4c/data/te_IN.txt +++ b/icu4c/data/te_IN.txt @@ -1,7 +1,7 @@ // -*- Coding:US-ASCII-*- // * Copyright (C) 1997-2001, International Business Machines // * Corporation and others. All Rights Reserved. -// $Revision: 1.5 $ +// $Revision: 1.6 $ // // Telugu Locale. Data by Ram [ram@jtcsv.com] @@ -28,19 +28,19 @@ te_IN { "{1} {0}", } - LanguageLibraryUse { "Te" } - Measurement { "Metric" } + // LanguageLibraryUse { "Te" } + // Measurement { "Metric" } NumberPatterns { "#,#0.##;-#,#0.##", "\u00A4 #,#0.00;-\u00A4 #,#0.00", "#,#0%", } ShortLanguage { "tel" } - PaperSize { - Hieght { "297" } - Width { "210" } - Units { "mm" } - } + //PaperSize { + // Hieght { "297" } + // Width { "210" } + // Units { "mm" } + //} LocaleID {"44a"} // /**************** Info Below is needed ****************/ // CollationElements{} diff --git a/icu4c/data/zh.txt b/icu4c/data/zh.txt index 6efeb03c617..47cc95a024a 100644 --- a/icu4c/data/zh.txt +++ b/icu4c/data/zh.txt @@ -772,7 +772,7 @@ Sequence{"&\u0304<<\u0301<<\u030C<<\u0300<<\u0308" Countries { CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" } TW { "\u53F0\u6E7E" } - HK { "\u9999\u6E2F" } + //HK { "\u9999\u6E2F" } SG { "\u65B0\u52A0\u5761"} // from zh_SG.txt } DayAbbreviations { diff --git a/icu4c/data/zh_CN.txt b/icu4c/data/zh_CN.txt index e7761567031..6ccfae06ba8 100644 --- a/icu4c/data/zh_CN.txt +++ b/icu4c/data/zh_CN.txt @@ -15,13 +15,13 @@ zh_CN { LocaleString { "zh_CN" } NumberPatterns { "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;-\u00A4#,##0.00", + "\u4EBA\u6C11\u5E63\u00A4#,##0.00\u5143;-\u4EBA\u6C11\u5E63\u00A4#,##0.00\u5143", "#,##0%", } ShortCountry { "CHN" } Countries { CN { "\u4E2D\u534E\u4EBA\u6C11\u5171\u548C\u56FD" } - TW { "\u53F0\u6E7E" } + //TW { "\u53F0\u6E7E" } HK { "\u9999\u6E2F" } } LocaleID { "0804" } diff --git a/icu4c/data/zh_TW.txt b/icu4c/data/zh_TW.txt index 682021fe487..748a4149fe2 100644 --- a/icu4c/data/zh_TW.txt +++ b/icu4c/data/zh_TW.txt @@ -1102,8 +1102,8 @@ zh_TW { } Countries { CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" } - TW { "\u4E2D\u83EF\u6C11\u570B" } - HK { "\u9999\u6E2F" } + //TW { "\u4E2D\u83EF\u6C11\u570B" } + //HK { "\u9999\u6E2F" } } CurrencyElements { "NT$", @@ -1129,7 +1129,7 @@ zh_TW { LocaleString { "zh_TW" } NumberPatterns { "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;-\u00A4#,##0.00", + "\u81FA\u5E63\u00A4#,##0.00\u5143;-\u81FA\u5E63\u00A4#,##0.00\u5143", "#,##0%", } ShortCountry { "TWN" } diff --git a/icu4c/source/data/locales/af_ZA.txt b/icu4c/source/data/locales/af_ZA.txt index 12e7035fd8d..789d1905f87 100644 --- a/icu4c/source/data/locales/af_ZA.txt +++ b/icu4c/source/data/locales/af_ZA.txt @@ -32,4 +32,5 @@ af_ZA { } LocaleID {"0436"} LocaleString { "af_ZA" } + ShortCountry{ "ZAK" } } diff --git a/icu4c/source/data/locales/ar_IN.txt b/icu4c/source/data/locales/ar_IN.txt index 8a85d873251..c97b8ec9ce5 100644 --- a/icu4c/source/data/locales/ar_IN.txt +++ b/icu4c/source/data/locales/ar_IN.txt @@ -13,16 +13,16 @@ ar_IN { "INR ", ".", } - DateTimePatterns { - "hh:mm:ss aa z", - "hh:mm:ss z", - "hh:mm:ss z", - "hh:mm:ss z", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "EEEE dd MMMM yyyy", - "{1} {0}", + DateTimePatterns { + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd/mm/yyyy", + "d/m/yy", + "{1} {0}" } NumberElements { ".", diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index 8458534e063..dbdb2428d3e 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -240,7 +240,7 @@ de { HM { "Heard und McDonaldinseln" } KY { "Kaimaninseln" } CC { "Kokosinseln" } - MO { "Macau" } + MO { "Macau S.A.R.,China" } MQ { "Martinique" } YT { "Mayotte" } MS { "Montserrat" } @@ -262,7 +262,7 @@ de { // some entries that are not in the official list: EH { "West Sahara" } - // same as in root: HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } SP { "Serbien" } // Zaire is now the Democratic Republic of Congo (CD) // same as in root: ZR { "Zaire" } @@ -272,7 +272,7 @@ de { "4", } DateTimePatterns { - "H.mm' Uhr 'z", + "H:mm' Uhr 'z", "HH:mm:ss z", "HH:mm:ss", "HH:mm", diff --git a/icu4c/source/data/locales/es_BO.txt b/icu4c/source/data/locales/es_BO.txt index 35a460fb9e2..5b95421ca79 100644 --- a/icu4c/source/data/locales/es_BO.txt +++ b/icu4c/source/data/locales/es_BO.txt @@ -9,7 +9,7 @@ es_BO { CurrencyElements { "B$", "BOB", - ".", + ",", } DateTimePatterns { "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 834a4b8eb4f..bf150e9bec5 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -175,7 +175,7 @@ hi { "\u0935\u0930\u094d\u091c\u0940\u0928 " "\u0906\u0908\u0932\u0948\u0902\u0921\u0938\u094d" } TP { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" } - HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" } + //HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" } VU { "\u0938\u093e\u0928\u0941\u0905\u0924\u0941" } // CHECK - #12 HN { "\u0939\u093e\u0945\u0928\u0921\u0941\u0930\u093e\u0938" } HR { "\u0915\u094d\u0930\u094b\u0936\u0940\u092f\u093e" } diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index c9753c22ae9..96a8959f51a 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -433,7 +433,7 @@ root { GY { "Guyana" } HT { "Haiti" } HN { "Honduras" } - HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } HU { "Hungary" } IS { "Iceland" } IN { "India" } @@ -1166,5 +1166,11 @@ root { "Anchorage", } } + LocaleScript{ + "Latin", + "Latn", + "Latf", + "Latg" + } } diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt index 0102d34cfc3..c19d0ab3f60 100644 --- a/icu4c/source/data/locales/sh.txt +++ b/icu4c/source/data/locales/sh.txt @@ -93,7 +93,7 @@ sh { GY { "Gvajana" } HT { "Haiti" } HN { "Honduras" } - HK { "Hong Kong" } + HK { "Hong Kong S.A.R., China" } HU { "Ma\u0111arska" } IS { "Island" } IN { "Indija" } diff --git a/icu4c/source/data/locales/sh_YU.txt b/icu4c/source/data/locales/sh_YU.txt index 0bd28b23a3d..f9908488f2d 100644 --- a/icu4c/source/data/locales/sh_YU.txt +++ b/icu4c/source/data/locales/sh_YU.txt @@ -12,7 +12,6 @@ sh_YU { ",", } LocaleString { "sh_YU" } - /* Discarding duplicate data for tag: NumberPatterns */ ShortCountry { "YUG" } LocaleID { "081a" } } diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index ea76c28bf27..768aa976057 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -117,7 +117,7 @@ sr { GY { "\u0413\u0432\u0430\u0458\u0430\u043D\u0430" } HT { "\u0425\u0430\u0438\u0442\u0438" } HN { "\u0425\u043E\u043D\u0434\u0443\u0440\u0430\u0441" } - HK { "\u0425\u043E\u043D\u0433 \u041A\u043E\u043D\u0433" } + //HK { "\u0425\u043E\u043D\u0433 \u041A\u043E\u043D\u0433" } HU { "\u041C\u0430\u0452\u0430\u0440\u0441\u043A\u0430" } IS { "\u0418\u0441\u043B\u0430\u043D\u0434" } IN { "\u0418\u043D\u0434\u0438\u0458\u0430" } @@ -236,10 +236,11 @@ sr { "HH.mm.ss z", "H.mm.ss", "H.mm", - "EEEE, yyyy, MMMM d", - "EEEE, yyyy, MMMM d", - "yyyy.M.d", - "yy.M.d", + "EEEE, dd.MMMM.yyyy.", + "EEEE, d.MM.yyyy.", + "EEEE, d.MM.yyyy.", + "dd.MM.yyyy.", + "d.M.yy.", "{1} {0}", } DayAbbreviations { diff --git a/icu4c/source/data/locales/ta_IN.txt b/icu4c/source/data/locales/ta_IN.txt index 9123a526d93..b61a28036f3 100644 --- a/icu4c/source/data/locales/ta_IN.txt +++ b/icu4c/source/data/locales/ta_IN.txt @@ -8,7 +8,7 @@ ta_IN { ShortCountry { IND } CurrencyElements { - "$", + "\u0bb0\u0bc2.", "INR", // Rs. ? No. "." } diff --git a/icu4c/source/data/locales/te_IN.txt b/icu4c/source/data/locales/te_IN.txt index 380774f8808..546d0583267 100644 --- a/icu4c/source/data/locales/te_IN.txt +++ b/icu4c/source/data/locales/te_IN.txt @@ -1,7 +1,7 @@ // -*- Coding:US-ASCII-*- // * Copyright (C) 1997-2001, International Business Machines // * Corporation and others. All Rights Reserved. -// $Revision: 1.5 $ +// $Revision: 1.6 $ // // Telugu Locale. Data by Ram [ram@jtcsv.com] @@ -28,19 +28,19 @@ te_IN { "{1} {0}", } - LanguageLibraryUse { "Te" } - Measurement { "Metric" } + // LanguageLibraryUse { "Te" } + // Measurement { "Metric" } NumberPatterns { "#,#0.##;-#,#0.##", "\u00A4 #,#0.00;-\u00A4 #,#0.00", "#,#0%", } ShortLanguage { "tel" } - PaperSize { - Hieght { "297" } - Width { "210" } - Units { "mm" } - } + //PaperSize { + // Hieght { "297" } + // Width { "210" } + // Units { "mm" } + //} LocaleID {"44a"} // /**************** Info Below is needed ****************/ // CollationElements{} diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 6efeb03c617..47cc95a024a 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -772,7 +772,7 @@ Sequence{"&\u0304<<\u0301<<\u030C<<\u0300<<\u0308" Countries { CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" } TW { "\u53F0\u6E7E" } - HK { "\u9999\u6E2F" } + //HK { "\u9999\u6E2F" } SG { "\u65B0\u52A0\u5761"} // from zh_SG.txt } DayAbbreviations { diff --git a/icu4c/source/data/locales/zh_CN.txt b/icu4c/source/data/locales/zh_CN.txt index e7761567031..6ccfae06ba8 100644 --- a/icu4c/source/data/locales/zh_CN.txt +++ b/icu4c/source/data/locales/zh_CN.txt @@ -15,13 +15,13 @@ zh_CN { LocaleString { "zh_CN" } NumberPatterns { "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;-\u00A4#,##0.00", + "\u4EBA\u6C11\u5E63\u00A4#,##0.00\u5143;-\u4EBA\u6C11\u5E63\u00A4#,##0.00\u5143", "#,##0%", } ShortCountry { "CHN" } Countries { CN { "\u4E2D\u534E\u4EBA\u6C11\u5171\u548C\u56FD" } - TW { "\u53F0\u6E7E" } + //TW { "\u53F0\u6E7E" } HK { "\u9999\u6E2F" } } LocaleID { "0804" } diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt index 682021fe487..748a4149fe2 100644 --- a/icu4c/source/data/locales/zh_TW.txt +++ b/icu4c/source/data/locales/zh_TW.txt @@ -1102,8 +1102,8 @@ zh_TW { } Countries { CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" } - TW { "\u4E2D\u83EF\u6C11\u570B" } - HK { "\u9999\u6E2F" } + //TW { "\u4E2D\u83EF\u6C11\u570B" } + //HK { "\u9999\u6E2F" } } CurrencyElements { "NT$", @@ -1129,7 +1129,7 @@ zh_TW { LocaleString { "zh_TW" } NumberPatterns { "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;-\u00A4#,##0.00", + "\u81FA\u5E63\u00A4#,##0.00\u5143;-\u81FA\u5E63\u00A4#,##0.00\u5143", "#,##0%", } ShortCountry { "TWN" }