diff --git a/icu4c/source/common/locmap.c b/icu4c/source/common/locmap.c index a2f5cfa5de9..09838995dc2 100644 --- a/icu4c/source/common/locmap.c +++ b/icu4c/source/common/locmap.c @@ -530,10 +530,10 @@ static const ILcidPosixMap gPosixIDmap[] = { ILCID_POSIX_MAP(ka), /* ka Georgian 0x37 */ ILCID_POSIX_MAP(kk), /* kk Kazakh 0x3f */ ILCID_POSIX_MAP(kn), /* kn Kannada 0x4b */ - ILCID_POSIX_MAP(ky), /* ky Kyrgyz 0x40 */ ILCID_POSIX_MAP(ko), /* ko Korean 0x12 */ ILCID_POSIX_MAP(kok), /* kok Konkani 0x57 */ ILCID_POSIX_MAP(ks), /* ks Kashmiri 0x60 */ + ILCID_POSIX_MAP(ky), /* ky Kyrgyz 0x40 */ ILCID_POSIX_MAP(lt), /* lt Lithuanian 0x27 */ ILCID_POSIX_MAP(lv), /* lv Latvian, Lettish 0x26 */ ILCID_POSIX_MAP(mk), /* mk Macedonian 0x2f */ @@ -685,8 +685,9 @@ uprv_convertToLCID(const char* posixID, UErrorCode* status) { uint32_t low = 0; - uint32_t high = gLocaleCount - 1; + uint32_t high = gLocaleCount; uint32_t mid = high; + uint32_t oldmid =0; int32_t compVal; char langID[ULOC_FULLNAME_CAPACITY]; @@ -706,19 +707,25 @@ uprv_convertToLCID(const char* posixID, UErrorCode* status) } /*Binary search for the map entry for normal cases */ - /* When mid == 0, it's not found */ - while (low <= high && mid != 0) { - mid = (low + high + 1) / 2; /* +1 is to round properly */ + while (high > low) /*binary search*/{ + + mid = (high+low) >> 1; /*Finds median*/ + + if (mid == oldmid) + break; compVal = uprv_strcmp(langID, gPosixIDmap[mid].regionMaps->posixID); - - if (compVal < 0) - high = mid - 1; - else if (compVal > 0) - low = mid + 1; - else /* found match! */ + if (compVal < 0){ + high = mid; + } + else if (compVal > 0){ + low = mid; + } + else /*we found it*/{ return hostID(&gPosixIDmap[mid], posixID, status); + } + oldmid = mid; } /* diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c index 8da17317561..3c35d854f6a 100644 --- a/icu4c/source/common/uloc.c +++ b/icu4c/source/common/uloc.c @@ -52,6 +52,8 @@ U_CFUNC const char *locale_get_default(void); static const char _kLocaleID[] = "LocaleID"; static const char _kLanguages[] = "Languages"; static const char _kCountries[] = "Countries"; +static const char _kVariants[] = "Variants"; +static const char _kKeys[] = "Keys"; static const char _kIndexLocaleName[] = "res_index"; static const char _kIndexTag[] = "InstalledLocales"; @@ -830,7 +832,11 @@ _res_getTableStringWithFallback(const char *path, const char *locale, UResourceBundle *rb, table; const UChar *item; UErrorCode errorCode; - + char explicitFallbackName[80] = {0}; + int32_t efnLen =0; + const char* rootName = "root"; + const UChar* ef = NULL; + UBool overrideExplicitFallback = FALSE; for(;;) { /* * open the bundle for the current locale @@ -868,27 +874,46 @@ _res_getTableStringWithFallback(const char *path, const char *locale, *pErrorCode=errorCode; } + /* check if the fallback token is set */ + ef = ures_getStringByKey(&table, "Fallback", &efnLen, &errorCode); + if(U_SUCCESS(errorCode)){ + /* set the fallback chain */ + u_UCharsToChars(ef, explicitFallbackName, efnLen); + /* null terminate the buffer */ + explicitFallbackName[efnLen]=0; + }else if(errorCode==U_USING_DEFAULT_WARNING || + (errorCode==U_USING_FALLBACK_WARNING && *pErrorCode!=U_USING_DEFAULT_WARNING) + ) { + /* set the "strongest" error code (success->fallback->default->failure) */ + *pErrorCode=errorCode; + } + /* try to open the requested item in the table */ errorCode=U_ZERO_ERROR; item=ures_getStringByKey(&table, itemKey, pLength, &errorCode); if(U_SUCCESS(errorCode)) { - /* we got the requested item! */ - ures_close(&table); - ures_close(rb); + /* if the item for the key is empty ... override the explicit fall back set */ + if(item[0]==0 && efnLen > 0){ + overrideExplicitFallback = TRUE; + }else{ + /* we got the requested item! */ + ures_close(&table); + ures_close(rb); - if(errorCode==U_USING_DEFAULT_WARNING || - (errorCode==U_USING_FALLBACK_WARNING && *pErrorCode!=U_USING_DEFAULT_WARNING) - ) { - /* set the "strongest" error code (success->fallback->default->failure) */ - *pErrorCode=errorCode; + if(errorCode==U_USING_DEFAULT_WARNING || + (errorCode==U_USING_FALLBACK_WARNING && *pErrorCode!=U_USING_DEFAULT_WARNING) + ) { + /* set the "strongest" error code (success->fallback->default->failure) */ + *pErrorCode=errorCode; + } + + /* + * It is safe to close the bundle and still return the + * string pointer because resource bundles are + * cached until u_cleanup(). + */ + return item; } - - /* - * It is safe to close the bundle and still return the - * string pointer because resource bundles are - * cached until u_cleanup(). - */ - return item; } /* @@ -909,7 +934,7 @@ _res_getTableStringWithFallback(const char *path, const char *locale, return NULL; } - if(*locale==0 || 0==uprv_strcmp(locale, "root")) { + if(*locale==0 || 0==uprv_strcmp(locale, "root") || 0==uprv_strcmp(locale,explicitFallbackName)) { /* end of fallback; even root does not have the requested item either */ ures_close(&table); ures_close(rb); @@ -919,18 +944,23 @@ _res_getTableStringWithFallback(const char *path, const char *locale, /* could not find the table, or its item, try to fall back to a different RB and table */ errorCode=U_ZERO_ERROR; - uloc_getParent(locale, localeBuffer, sizeof(localeBuffer), &errorCode); + if(efnLen > 0 && overrideExplicitFallback == FALSE){ + /* continue the fallback lookup with the explicit fallback that is requested */ + locale = explicitFallbackName; + }else{ + uloc_getParent(locale, localeBuffer, sizeof(localeBuffer), &errorCode); + if(U_FAILURE(errorCode) || errorCode==U_STRING_NOT_TERMINATED_WARNING) { + /* error getting the parent locale ID - should never happen */ + *pErrorCode=U_INTERNAL_PROGRAM_ERROR; + return NULL; + } + + /* continue the fallback lookup with the parent locale ID */ + locale=localeBuffer; + } /* done with the locale string - ready to close table and rb */ ures_close(&table); ures_close(rb); - if(U_FAILURE(errorCode) || errorCode==U_STRING_NOT_TERMINATED_WARNING) { - /* error getting the parent locale ID - should never happen */ - *pErrorCode=U_INTERNAL_PROGRAM_ERROR; - return NULL; - } - - /* continue the fallback lookup with the parent locale ID */ - locale=localeBuffer; } } @@ -1071,11 +1101,9 @@ uloc_getDisplayVariant(const char *locale, /* * display names for variants are top-level items of * locale resource bundles - * the rb keys are "%%" followed by the variant tags */ *pErrorCode=U_ZERO_ERROR; /* necessary because we will check for a warning code */ - localeBuffer[0]=localeBuffer[1]='%'; - length=uloc_getVariant(locale, localeBuffer+2, sizeof(localeBuffer)-2, pErrorCode); + length=uloc_getVariant(locale, localeBuffer, sizeof(localeBuffer), pErrorCode); if(U_FAILURE(*pErrorCode) || *pErrorCode==U_STRING_NOT_TERMINATED_WARNING) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -1086,8 +1114,8 @@ uloc_getDisplayVariant(const char *locale, /* pass itemKey=NULL to look for a top-level item */ return _getStringOrCopyKey(NULL, displayLocale, - localeBuffer, NULL, - localeBuffer+2, /* substitute=variant without %% */ + _kVariants, localeBuffer, + localeBuffer, dest, destCapacity, pErrorCode); } diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index a8f7b80dba2..f40d5b3e262 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -6,7 +6,14 @@ // *************************************************************************** af { - Version { "3.0" } + Version { "4.0" } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } AmPmMarkers { "VM", diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index b38da571e9c..c450e776d00 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -6,14 +6,21 @@ // *************************************************************************** ca { - Version { "2.0" } + Version { "4.0" } CollationElements { Version { "1.0" } Sequence { "[backwards 2]" "&C < ch <<< Ch <<< CH" "&L < ll <<< l\u00b7l <<< Ll <<< L\u00b7l <<< LL <<< L\u00b7L" } } + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{"en"} ES { "Espanya" } } DateTimePatterns { @@ -46,6 +53,7 @@ ca { "dissabte", } Languages { + Fallback{"en"} ca { "catal\u00E0" } } MonthAbbreviations { diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index 85eb3587932..a5236776b00 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -6,7 +6,7 @@ // *************************************************************************** cs { - Version{ "2.0" } + Version{ "3.0" } AmPmMarkers { "dop.", "odp.", @@ -17,7 +17,15 @@ cs { "ch <<< cH <<< Ch <<< CH & R < r\u030C <<< R\u030C& S < s\u030C <<< S\u030C& Z < z\u030C <<<" " Z\u030C" } } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{"en"} //AD { "Andorra" } AE { "Spojen\u00E9 arabsk\u00E9 emir\u00E1ty" } AF { "Afgh\u00E1nist\u00E1n" } @@ -292,6 +300,7 @@ cs { "po Kr.", } Languages { + Fallback{ "en"} ar { "arapski" } bg { "bugarski" } cs { "\u010De\u0161ki" } diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index e4ed8cb56fa..409ae14b776 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -6,14 +6,23 @@ // *************************************************************************** da { - Version {"2.0"} + Version {"3.0"} CollationElements { Version { "2.0" } Sequence { "& A < \u00E6\u0301 <<< \u00C6\u0301& Z < \u00E6 <<< \u00C6<<" " a\u0308 <<< A\u0308 < \u00F8 <<< \u00D8 << o\u0308 <<< O\u0308 << o\u030B<<< O\u030B< a\u030A" " <<< A\u030A<<< aa <<< aA <<< Aa <<< AA & V<<< w<<< W & Y << u\u0308 <<< U\u0308 &D < \u00F0<<< \u00D0 &T < \u00FE<<< \u00DE" } } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } + Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Forenede Arabiske Emirater" } //AF { "Afghanistan" } @@ -297,6 +306,7 @@ da { } ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fd]" } Languages { + Fallback{ "en"} ar { "Arabisk" } bg { "Bulgarsk" } cs { "Tjekkisk" } diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index 6353dbe49b7..da25bb502c2 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -17,10 +17,13 @@ // http://www.bkg.bund.de/kartographie/stagn/Staatennamen.htm de { - Version{ "2.0" } - - "%%PHONEBOOK" { "Telefonbuch-Sortierregeln" } - + Version{ "3.0" } + Variants{ + Fallback{"en"} + } + Keys{ + PHONEBOOK { "Telefonbuch-Sortierregeln" } + } // This shouldn't be used, but valid data should be here. // vorm. -> vormittags -> in the morning // nachm. -> nachmittags -> in the afternoon @@ -29,6 +32,7 @@ de { "nachm.", } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Vereinigte Arabische Emirate" } //AF { "Afghanistan" } @@ -341,6 +345,7 @@ de { // further checking. // Markus Scherer, 2000jun01 Languages { + Fallback{ "en"} // ? aa { "Afar" } ab { "Abchasisch" } // same as in root? af { "Afrikaans" } diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 088c3f652df..b45f17fc742 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -6,17 +6,1078 @@ // *************************************************************************** en { - Version { "2.0" } + Version { "3.0" } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;-\u00A4#,##0.00", "#,##0%", "#E0", } - + // each variant name that occurs in locales should be listed with %% and a display string + Variants{ + PREEURO { "Pre-Euro" } // PREEURO variant display name + EURO { "Euro" } // EURO variant display name + B { "Bokm\u00e5l" } // Norwegian variant display name + NY { "Nynorsk" } // Norwegian variant display name + AL { "\u00C5land" } // Aland variant display name + POSIX { "Posix" } + } + + Keys{ + // variants for collation (traditional may also be used for traditional chinese) + PHONEBOOK { "Phonebook Order" } + PINYIN { "Pinyin Order" } + TRADITIONAL { "Traditional" } + STROKE { "Stroke Order" } + DIRECT { "Direct Order" } + } + // Format for the display name of a Transliterator. // This is the English form of this resource. TransliteratorNamePattern { "{0,choice,0#|1#{1}|2#{1} to {2}}" } + + // Transliterator display names + // This is the English form of this resource. + "%Translit%Hex" { "Hex Escape" } + "%Translit%UnicodeName" { "Unicode Name" } + "%Translit%UnicodeChar" { "Unicode Character" } + + Countries { + //AA {} // Not in ISO-3166 standard + AD { "Andorra" } + AE { "United Arab Emirates" } + AF { "Afghanistan" } + AG { "Antigua and Barbuda" } + AI { "Anguilla" } + AL { "Albania" } + AM { "Armenia" } + AN { "Netherlands Antilles" } + AO { "Angola" } + AQ { "Antarctica" } + AR { "Argentina" } + AS { "American Samoa" } + AT { "Austria" } + AU { "Australia" } + AW { "Aruba" } + AZ { "Azerbaijan" } + + BA { "Bosnia and Herzegovina" } + BB { "Barbados" } + BD { "Bangladesh" } + BE { "Belgium" } + BF { "Burkina Faso" } + BG { "Bulgaria" } + BH { "Bahrain" } + BI { "Burundi" } + BJ { "Benin" } + BM { "Bermuda" } + BN { "Brunei" } + BO { "Bolivia" } + BR { "Brazil" } + BS { "Bahamas" } + BT { "Bhutan" } + BV { "Bouvet Island" } + BW { "Botswana" } + BY { "Belarus" } + BZ { "Belize" } + + CA { "Canada" } + CC { "Cocos Islands"} + CD { "Democratic Republic of the Congo" } + CF { "Central African Republic" } + CG { "Congo" } + CH { "Switzerland" } + CI { "C\u00F4te d'Ivoire" } + CK { "Cook Islands" } + CL { "Chile" } + CM { "Cameroon" } + CN { "China" } + CO { "Colombia" } + CR { "Costa Rica" } + CU { "Cuba" } + CV { "Cape Verde" } + CX { "Christmas Island" } + CY { "Cyprus" } + CZ { "Czech Republic" } + + DE { "Germany" } + DJ { "Djibouti" } + DK { "Denmark" } + DM { "Dominica" } + DO { "Dominican Republic" } + DZ { "Algeria" } + + EC { "Ecuador" } + EE { "Estonia" } + EG { "Egypt" } + EH { "Western Sahara" } + ER { "Eritrea" } + ES { "Spain" } + ET { "Ethiopia" } + + FI { "Finland" } + FJ { "Fiji" } + FK { "Falkland Islands" } + FM { "Micronesia" } + FO { "Faroe Islands" } + FR { "France" } + + GA { "Gabon" } + GB { "United Kingdom" } + GD { "Grenada" } + GE { "Georgia" } + GF { "French Guiana" } + GH { "Ghana" } + GI { "Gibraltar" } + GL { "Greenland" } + GM { "Gambia" } + GN { "Guinea" } + GP { "Guadeloupe" } + GQ { "Equatorial Guinea" } + GR { "Greece" } + GS { "South Georgia and South Sandwich Islands" } + GT { "Guatemala" } + GU { "Guam" } + GW { "Guinea-Bissau" } + GY { "Guyana" } + + HK { "Hong Kong S.A.R., China" } + HM { "Heard Island and McDonald Islands" } + HN { "Honduras" } + HR { "Croatia" } + HT { "Haiti" } + HU { "Hungary" } + + ID { "Indonesia" } + IE { "Ireland" } + IL { "Israel" } + IN { "India" } + IO { "British Indian Ocean Territory" } + IQ { "Iraq" } + IR { "Iran" } + IS { "Iceland" } + IT { "Italy" } + + JM { "Jamaica" } + JO { "Jordan" } + JP { "Japan" } + + KE { "Kenya" } + KG { "Kyrgyzstan" } + KH { "Cambodia" } + KI { "Kiribati" } + KM { "Comoros" } + KN { "Saint Kitts and Nevis" } + KP { "North Korea" } + KR { "South Korea" } + KW { "Kuwait" } + KY { "Cayman Islands" } + KZ { "Kazakhstan" } + + LA { "Laos" } + LB { "Lebanon" } + LC { "Saint Lucia" } + LI { "Liechtenstein" } + LK { "Sri Lanka" } + LR { "Liberia" } + LS { "Lesotho" } + LT { "Lithuania" } + LU { "Luxembourg" } + LV { "Latvia" } + LY { "Libya" } + + MA { "Morocco" } + MC { "Monaco" } + MD { "Moldova" } + MG { "Madagascar" } + MH { "Marshall Islands"} + MK { "Macedonia" } + ML { "Mali" } + MM { "Myanmar" } + MN { "Mongolia" } + MO { "Macao S.A.R. China" } + MP { "Northern Mariana Islands"} + MQ { "Martinique" } + MR { "Mauritania" } + MS { "Montserrat" } + MT { "Malta" } + MU { "Mauritius" } + MV { "Maldives" } + MW { "Malawi" } + MX { "Mexico" } + MY { "Malaysia" } + MZ { "Mozambique" } + + NA { "Namibia" } + NC { "New Caledonia" } + NE { "Niger" } + NF { "Norfolk Island" } + NG { "Nigeria" } + NI { "Nicaragua" } + NL { "Netherlands" } + NO { "Norway" } + NP { "Nepal" } + NR { "Nauru" } + NU { "Niue" } + NZ { "New Zealand" } + + OM { "Oman" } + + PA { "Panama" } + PE { "Peru" } + PF { "French Polynesia" } + PG { "Papua New Guinea" } + PH { "Philippines" } + PK { "Pakistan" } + PL { "Poland" } + PM { "Saint Pierre and Miquelon" } + PN { "Pitcairn" } + PR { "Puerto Rico" } + PS { "Palestinian Territory" } + PT { "Portugal" } + PW { "Palau" } + PY { "Paraguay" } + + QA { "Qatar" } + + RE { "R\u00E9union" } + RO { "Romania" } + RU { "Russia" } + RW { "Rwanda" } + + SA { "Saudi Arabia" } + SB { "Solomon Islands" } + SC { "Seychelles" } + SD { "Sudan" } + SE { "Sweden" } + SG { "Singapore" } + SH { "Saint Helena" } + SI { "Slovenia" } + SJ { "Svalbard and Jan Mayen" } + SK { "Slovakia" } + SL { "Sierra Leone" } + SM { "San Marino" } + SN { "Senegal" } + SO { "Somalia" } + SP { "Serbia" } + SR { "Suriname" } + ST { "Sao Tome and Principe" } + SV { "El Salvador" } + SY { "Syria" } + SZ { "Swaziland" } + + TC { "Turks and Caicos Islands" } + TD { "Chad" } + TF { "French Southern Territories" } + TG { "Togo" } + TH { "Thailand" } + TJ { "Tajikistan" } + TK { "Tokelau" } + TM { "Turkmenistan" } + TN { "Tunisia" } + TO { "Tonga" } + TL { "Timor-Leste" } // This was called East Timor + TR { "Turkey" } + TT { "Trinidad and Tobago" } + TV { "Tuvalu" } + TW { "Taiwan" } + TZ { "Tanzania" } + + UA { "Ukraine" } + UG { "Uganda" } + UM { "United States Minor Outlying Islands" } + US { "United States" } + UY { "Uruguay" } + UZ { "Uzbekistan" } + + VA { "Vatican" } + VC { "Saint Vincent and the Grenadines" } + VE { "Venezuela" } + VG { "British Virgin Islands" } + VI { "U.S. Virgin Islands" } + VN { "Vietnam" } + VU { "Vanuatu" } + + WF { "Wallis and Futuna" } + WS { "Samoa" } + + YE { "Yemen" } + YT { "Mayotte" } + YU { "Yugoslavia" } + + ZA { "South Africa" } +// ZR { "Zaire" } + ZM { "Zambia" } + ZW { "Zimbabwe" } + } + Languages { + root{ "Root"} // The only exception to ISO-639 + + aa { "Afar" } + ab { "Abkhazian" } + ace { "Achinese" } + ach { "Acoli" } + ada { "Adangme" } + ae { "Avestan" } + af { "Afrikaans" } + afa { "Afro-Asiatic (Other)" } + afh { "Afrihili" } + ak { "Akan" } + akk { "Akkadian" } + ale { "Aleut" } + alg { "Algonquian Languages" } + am { "Amharic" } + ang { "English, Old (ca.450-1100)" } + apa { "Apache Languages"} + ar { "Arabic" } + arc { "Aramaic" } + arn { "Araucanian" } + arp { "Arapaho" } + art { "Artificial (Other)" } + arw { "Arawak" } + as { "Assamese" } + ast { "Asturian" } + ath { "Athapascan Languages" } + aus { "Australian Languages" } + av { "Avaric" } + awa { "Awadhi" } + ay { "Aymara" } + az { "Azerbaijani" } + ba { "Bashkir" } + bad { "Banda" } + bai { "Bamileke Languages" } + bal { "Baluchi" } + bam { "Bambara" } + ban { "Balinese" } + bas { "Basa" } + bat { "Baltic (Other)" } + be { "Belarusian" } + bej { "Beja" } + bem { "Bemba" } + ber { "Berber" } + bg { "Bulgarian" } + bh { "Bihari" } + bho { "Bhojpuri" } + bi { "Bislama" } + bik { "Bikol" } + bin { "Bini" } + bla { "Siksika" } // Blackfoot + bm { "Bambara" } + bn { "Bengali" } + bnt { "Bantu" } + bo { "Tibetan" } + br { "Breton" } + bra { "Braj" } + bs { "Bosnian"} + btk { "Batak" } + bua { "Buriat" } + bug { "Buginese" } + ca { "Catalan" } + cad { "Caddo" } + cai { "Central American Indian (Other)" } + car { "Carib" } + cau { "Caucasian (Other)" } + ce { "Chechen" } + ceb { "Cebuano" } + cel { "Celtic (Other)" } + ch { "Chamorro" } + chb { "Chibcha" } + chg { "Chagatai" } + chk { "Chuukese" } + chm { "Mari" } + chn { "Chinook Jargon" } + cho { "Choctaw" } + chp { "Chipewyan" } + chr { "Cherokee" } + chy { "Cheyenne" } + cmc { "Chamic Languages" } + co { "Corsican" } + cop { "Coptic" } + cpe { "Creoles and Pidgins, English-based (Other)" } + cpf { "Creoles and Pidgins, French-based (Other)" } + cpp { "Creoles and pidgins, Portuguese-based (Other)" } + cr { "Cree" } + crp { "Creoles and Pidgins (Other)" } + cs { "Czech" } + cu { "Church Slavic" } + cus { "Cushitic (Other)" } + cv { "Chuvash" } + cy { "Welsh" } + da { "Danish" } + dak { "Dakota" } + dar { "Dargwa" } + day { "Dayak" } + de { "German" } + del { "Delaware" } + den { "Slave" } + dgr { "Dogrib" } + din { "Dinka" } + //div { "Divehi" } // Use dv instead + doi { "Dogri" } + dra { "Dravidian (Other)" } + dua { "Duala" } + dum { "Dutch, Middle (ca. 1050-1350)" } + dv { "Divehi" } + dyu { "Dyula" } + dz { "Dzongkha" } + ee { "Ewe" } + efi { "Efik" } + egy { "Egyptian (Ancient)" } + eka { "Ekajuk" } + el { "Greek" } // Modern (1453-) + elx { "Elamite" } + en { "English" } + enm { "English, Middle (1100-1500)" } + eo { "Esperanto" } + es { "Spanish" } + et { "Estonian" } + eu { "Basque" } + ewo { "Ewondo" } + fa { "Persian" } + fan { "Fang" } + fat { "Fanti" } + ff { "Fulah" } + fi { "Finnish" } + fiu { "Finno - Ugrian (Other)" } + fj { "Fijian" } + fo { "Faroese" } + fon { "Fon" } + fr { "French" } + frm { "French, Middle (ca.1400-1600)" } + fro { "French, Old (842-ca.1400)" } + fur { "Friulian" } + fy { "Frisian" } + ga { "Irish" } + gaa { "Ga" } + gay { "Gayo" } + gba { "Gbaya" } + gd { "Scottish Gaelic" } + gem { "Germanic (Other)" } + gez { "Geez" } + gil { "Gilbertese" } + gl { "Gallegan" } + gla { "Gaelic (Scots)" } + gmh { "German, Middle High (ca.1050-1500)" } + gn { "Guarani" } + goh { "German, Old High (ca.750-1050)" } + gon { "Gondi" } + gor { "Gorontalo" } + got { "Gothic" } + grb { "Gerbo" } + grc { "Greek, Ancient (to 1453)" } + gu { "Gujarati" } + gv { "Manx" } + gwi { "Gwich'in" } + hai { "Haida" } + ha { "Hausa" } + haw { "Hawaiian" } + he { "Hebrew" } + hi { "Hindi" } + hil { "Hiligaynon" } + him { "Himachali" } + hit { "Hittite" } + hmn { "Hmong" } + ho { "Hiri Motu" } + hr { "Croatian" } + hu { "Hungarian" } + hup { "Hupa" } + hy { "Armenian" } + hz { "Herero" } + ia { "Interlingua" } + iba { "Iban" } + id { "Indonesian" } + ie { "Interlingue" } + ig { "Igbo" } + ii { "Sichuan Yi" } + ijo { "Ijo" } + ik { "Inupiaq" } + ilo { "Iloko" } + //in { "Indonesian" } // Use id instead + inc { "Indic (Other)" } + ine { "Indo-European (Other)" } + inh { "Ingush" } + io { "Ido" } + ira { "Iranian" } + iro { "Iroquoian languages" } + is { "Icelandic" } + it { "Italian" } + iu { "Inuktitut" } + iw { "Hebrew" } // Use he instead + ja { "Japanese" } + //ji { "Yiddish" } // Use yi instead + jpr { "Judeo-Persian" } + jrb { "Judeo-Arabic" } + jv { "Javanese" } + //jw { "Javanese" } // Use jv instead + ka { "Georgian" } + kaa { "Kara-Kalpak" } + kab { "Kabyle" } + kac { "Kachin" } + kam { "Kamba" } + kar { "Karen" } + kaw { "Kawi" } + kbd { "Kabardian" } + kg { "Kongo" } + kha { "Khasi" } + khi { "Khoisan (Other)" } + kho { "Khotanese" } + ki { "Kikuyu" } + kj { "Kuanyama" } + kk { "Kazakh" } + kl { "Kalaallisut" } + km { "Khmer" } + kmb { "Kimbundu" } + kn { "Kannada" } + ko { "Korean" } + kok { "Konkani" } + kos { "Kosraean" } + kpe { "Kpelle" } + kr { "Kanuri" } + kro { "Kru" } + kru { "Kurukh" } + ks { "Kashmiri" } + ku { "Kurdish" } + kum { "Kumyk" } + kut { "Kutenai" } + kv { "Komi" } + kw { "Cornish" } + ky { "Kirghiz" } + la { "Latin" } + lad { "Ladino" } + lah { "Lahnda" } + lam { "Lamba" } + lb { "Luxembourgish" } + lez { "Lezghian" } + lg { "Ganda" } + lin { "Lingala" } + li { "Limburgish" } + lit { "Lithuanian" } + ln { "Lingala" } + lo { "Lao" } + lol { "Mongo" } + loz { "Lozi" } + lt { "Lithuanian" } + lu { "Luba-Katanga" } + lua { "Luba-Lulua" } + lui { "Luiseno" } + lun { "Lunda" } + luo { "Luo" } + lus { "Lushai" } + lv { "Latvian" } + mad { "Madurese" } + mag { "Magahi" } + mai { "Maithili" } + mak { "Makasar" } + man { "Mandingo" } + map { "Austronesian" } + mas { "Masai" } + mdr { "Mandar" } + men { "Mende" } + mg { "Malagasy" } + mga { "Irish, Middle (900-1200)" } + mh { "Marshallese"} + mi { "Maori" } + mic { "Micmac" } + min { "Minangkabau" } + mis { "Miscellaneous Languages" } + mk { "Macedonian" } + mkh { "Mon-Khmer (Other)" } + ml { "Malayalam" } + mn { "Mongolian" } + mnc { "Manchu" } + mni { "Manipuri" } + mno { "Manobo Languages" } + mo { "Moldavian" } + moh { "Mohawk" } + mos { "Mossi" } + mr { "Marathi" } + ms { "Malay" } + mt { "Maltese" } + mul { "Multiple Languages" } + mun { "Munda Languages" } + mus { "Creek" } + mwr { "Marwari" } + my { "Burmese" } + myn { "Mayan" } + na { "Nauru" } + nah { "Nahuatl" } + nai { "North American Indian (Other)" } + nap { "Neapolitan" } + nb { "Norwegian Bokm\u00e5l" } + nd { "Ndebele, North" } + nds { "Low German; Low Saxon" } + ne { "Nepali" } + new { "Newari" } + ng { "Ndonga" } + nia { "Nias" } + nic { "Niger - Kordofanian (Other)" } + niu { "Niuean" } + nl { "Dutch" } + nn { "Norwegian Nynorsk" } + no { "Norwegian" } + non { "Norse, Old" } + nr { "Ndebele, South" } + nso { "Sotho, Northern" } + nub { "Nubian Languages" } + nv { "Navajo"} + ny { "Nyanja; Chichewa; Chewa" } + nym { "Nyamwezi" } + nyn { "Nyankole" } + nyo { "Nyoro" } + nzi { "Nzima" } + oc { "Occitan (post 1500); Proven\u00E7al"} + oj { "Ojibwa" } + om { "Oromo" } + or { "Oriya" } + os { "Ossetic" } + osa { "Osage" } + ota { "Turkish, Ottoman (1500-1928)" } + oto { "Otomian Languages" } + pa { "Punjabi" } + paa { "Papuan (Other)" } + pag { "Pangasinan" } + pal { "Pahlavi" } + pam { "Pampanga" } + pap { "Papiamento" } + pau { "Palauan" } + peo { "Persian Old (ca.600-400 B.C.)" } + phi { "Philippine (Other)" } + phn { "Phoenician" } + pi { "Pali" } + pl { "Polish" } + pon { "Pohnpeian" } + pra { "Prakrit Languages" } + pro { "Proven\u00E7al, Old (to 1500)" } + ps { "Pashto (Pushto)" } + pt { "Portuguese" } + qu { "Quechua" } + // The range qaa-qtz is reserved for local use. + raj { "Rajasthani" } + rap { "Rapanui" } + rar { "Rarotongan" } + rm { "Rhaeto-Romance" } + rn { "Rundi" } + ro { "Romanian" } + roa { "Romance (Other)" } + rom { "Romany" } + ru { "Russian" } + rw { "Kinyarwanda" } + sa { "Sanskrit" } + sad { "Sandawe" } + sah { "Yakut" } + sai { "South American Indian (Other)" } + sal { "Salishan languages" } + sam { "Samaritan Aramaic" } + sas { "Sasak" } + sat { "Santali" } + sc { "Sardinian" } + sco { "Scots" } + sd { "Sindhi" } + se { "Northern Sami" } + sel { "Selkup" } + sem { "Semitic (Other)" } + sg { "Sango" } + sga { "Irish, Old (to 900)" } + sgn { "Sign Languages" } + sh { "Serbo-Croatian" } + shn { "Shan" } + si { "Sinhalese" } + sid { "Sidamo" } + sio { "Siouan Languages" } + sit { "Sino-Tibetan (Other)" } + sk { "Slovak" } + sl { "Slovenian" } + sla { "Slavic (Other)" } + sm { "Samoan" } + sma { "Southern Sami" } + smi { "Sami languages (Other)" } + smj { "Lule Sami" } + smn { "Inari Sami" } + sms { "Skolt Sami" } + sn { "Shona" } + snk { "Soninke" } + so { "Somali" } + sog { "Sogdien" } + son { "Songhai" } + sq { "Albanian" } + sr { "Serbian" } + srr { "Serer" } + ss { "Swati" } + ssa { "Nilo-Saharam (Other)" } + st { "Sotho, Southern" } + su { "Sundanese" } + suk { "Sukuma" } + sus { "Susu" } + sux { "Sumerian"} + sv { "Swedish" } + sw { "Swahili" } + syr { "Syriac" } + ta { "Tamil" } + tai { "Tai (Other)" } + te { "Telugu" } + tem { "Timne" } + ter { "Tereno" } + tet { "Tetum" } + tg { "Tajik" } + th { "Thai" } + tig { "Tigre" } + ti { "Tigrinya" } + tiv { "Tiv" } + tk { "Turkmen" } + tkl { "Tokelau" } + tl { "Tagalog" } + tli { "Tlingit" } + tmh { "Tamashek" } + tn { "Tswana" } + tog { "Tonga (Nyasa)" } + to { "Tonga (Tonga Islands)" } + tpi { "Tok Pisin" } + tr { "Turkish" } + ts { "Tsonga" } + tsi { "Tsimshian" } + tt { "Tatar" } + tum { "Tumbuka" } + tup { "Tupi languages" } + tur { "Turkish" } + tut { "Altaic (Other)" } + tvl { "Tuvalu" } + tw { "Twi" } + ty { "Tahitian" } + tyv { "Tuvinian" } + ug { "Uighur" } + uga { "Ugaritic" } + uk { "Ukrainian" } + umb { "Umbundu" } + und { "Undetermined" } + ur { "Urdu" } + uz { "Uzbek" } + vai { "Vai" } + ve { "Venda" } + vi { "Vietnamese" } + vo { "Volap\u00FCk" } // Yes the iso-639 standard uses the umlaut in the English name + vot { "Votic" } + wa { "Walloon" } + wak { "Wakashan Languages" } + wal { "Walamo" } + war { "Waray" } + was { "Washo" } + wen { "Sorbian Languages" } + wo { "Wolof" } + xh { "Xhosa" } + yao { "Yao" } + yap { "Yapese" } + yi { "Yiddish" } + yo { "Yoruba" } + ypk { "Yupik Languages" } + za { "Zhuang" } + zap { "Zapotec" } + zen { "Zenaga" } + zh { "Chinese" } + znd { "Zande" } + zu { "Zulu" } + zun { "Zuni" } + } + + AmPmMarkers { + "AM", + "PM", + } + DayAbbreviations { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + DayNames { + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + } + Eras { + "BC", + "AD", + } + MonthAbbreviations { + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + } + MonthNames { + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December", + } + // Japanese calendar data + Eras_japanese { + // Name Gregorian Year + "Taika", // 645 + "Hakuchi", // 650 + "Hakuh\u014D", // 672 + "Shuch\u014D", // 686 + "Taih\u014D", // 701 + "Keiun", // 704 + "Wad\u014D", // 708 + "Reiki", // 715 + "Y\u014Dr\u014D", // 717 + "Jinki", // 724 + "Tempy\u014D", // 729 + "Tempy\u014D-kamp\u014D", // 749 + "Tempy\u014D-sh\u014Dh\u014D", // 749 + "Tempy\u014D-h\u014Dji", // 757 + "Temph\u014D-jingo", // 765 + "Jingo-keiun", // 767 + "H\u014Dki", // 770 + "Ten-\u014D", // 781 + "Enryaku", // 782 + "Daid\u014D", // 806 + "K\u014Dnin", // 810 + "Tench\u014D", // 824 + "Sh\u014Dwa", // 834 + "Kaj\u014D", // 848 + "Ninju", // 851 + "Saiko", // 854 + "Tennan", // 857 + "J\u014Dgan", // 859 + "Genkei", // 877 + "Ninna", // 885 + "Kampy\u014D", // 889 + "Sh\u014Dtai", // 898 + "Engi", // 901 + "Ench\u014D", // 923 + "Sh\u014Dhei", // 931 + "Tengy\u014D", // 938 + "Tenryaku", // 947 + "Tentoku", // 957 + "\u014Cwa", // 961 + "K\u014Dh\u014D", // 964 + "Anna", // 968 + "Tenroku", // 970 + "Ten-en", // 973 + "J\u014Dgen", // 976 + "Tengen", // 978 + "Eikan", // 983 + "Kanna", // 985 + "Ei-en", // 987 + "Eiso", // 989 + "Sh\u014Dryaku", // 990 + "Ch\u014Dtoku", // 995 + "Ch\u014Dh\u014D", // 999 + "Kank\u014D", // 1004 + "Ch\u014Dwa", // 1012 + "Kannin", // 1017 + "Jian", // 1021 + "Manju", // 1024 + "Ch\u014Dgen", // 1028 + "Ch\u014Dryaku", // 1037 + "Ch\u014Dky\u016B", // 1040 + "Kantoku", // 1044 + "Eish\u014D", // 1046 + "Tengi", // 1053 + "K\u014Dhei", // 1058 + "Jiryaku", // 1065 + "Enky\u016B", // 1069 + "Sh\u014Dho", // 1074 + "Sh\u014Dryaku", // 1077 + "Eiho", // 1081 + "\u014Ctoku", // 1084 + "Kanji", // 1087 + "Kaho", // 1094 + "Eich\u014D", // 1096 + "Sh\u014Dtoku", // 1097 + "K\u014Dwa", // 1099 + "Ch\u014Dji", // 1104 + "Kash\u014D", // 1106 + "Tennin", // 1108 + "Ten-ei", // 1110 + "Eiky\u016B", // 1113 + "Gen-ei", // 1118 + "Hoan", // 1120 + "Tenji", // 1124 + "Daiji", // 1126 + "Tensh\u014D", // 1131 + "Ch\u014Dsh\u014D", // 1132 + "Hoen", // 1135 + "Eiji", // 1141 + "K\u014Dji", // 1142 + "Teny\u014D", // 1144 + "Ky\u016Ban", // 1145 + "Ninpei", // 1151 + "Ky\u016Bju", // 1154 + "Hogen", // 1156 + "Heiji", // 1159 + "Eiryaku", // 1160 + "\u014Cho", // 1161 + "Ch\u014Dkan", // 1163 + "Eiman", // 1165 + "Nin-an", // 1166 + "Ka\u014D", // 1169 + "Sh\u014Dan", // 1171 + "Angen", // 1175 + "Jish\u014D", // 1177 + "Y\u014Dwa", // 1181 + "Juei", // 1182 + "Genryuku", // 1184 + "Bunji", // 1185 + "Kenky\u016B", // 1190 + "Sh\u014Dji", // 1199 + "Kennin", // 1201 + "Genky\u016B", // 1204 + "Ken-ei", // 1206 + "Sh\u014Dgen", // 1207 + "Kenryaku", // 1211 + "Kenp\u014D", // 1213 + "Sh\u014Dky\u016B", // 1219 + "J\u014D\u014D", // 1222 + "Gennin", // 1224 + "Karoku", // 1225 + "Antei", // 1227 + "Kanki", // 1229 + "J\u014Dei", // 1232 + "Tempuku", // 1233 + "Bunryaku", // 1234 + "Katei", // 1235 + "Ryakunin", // 1238 + "En-\u014D", // 1239 + "Ninji", // 1240 + "Kangen", // 1243 + "H\u014Dji", // 1247 + "Kench\u014D", // 1249 + "K\u014Dgen", // 1256 + "Sh\u014Dka", // 1257 + "Sh\u014Dgen", // 1259 + "Bun-\u014D", // 1260 + "K\u014Dch\u014D", // 1261 + "Bun-ei", // 1264 + "Kenji", // 1275 + "K\u014Dan", // 1278 + "Sh\u014D\u014D", // 1288 + "Einin", // 1293 + "Sh\u014Dan", // 1299 + "Kengen", // 1302 + "Kagen", // 1303 + "Tokuji", // 1306 + "Enkei", // 1308 + "\u014Cch\u014D", // 1311 + "Sh\u014Dwa", // 1312 + "Bunp\u014D", // 1317 + "Gen\u014D", // 1319 + "Genky\u014D", // 1321 + "Sh\u014Dch\u016B", // 1324 + "Kareki", // 1326 + "Gentoku", // 1329 + "Genk\u014D", // 1331 + "Kemmu", // 1334 + "Engen", // 1336 + "K\u014Dkoku", // 1340 + "Sh\u014Dhei", // 1346 + "Kentoku", // 1370 + "Bunch\u0169", // 1372 + "Tenju", // 1375 + "K\u014Dwa", // 1381 + "Gench\u0169", // 1384 + "Meitoku", // 1384 + "K\u014Dryaku", // 1379 + "Kakei", // 1387 + "K\u014D\u014D", // 1389 + "Meitoku", // 1390 + "\u014Cei", // 1394 + "Sh\u014Dch\u014D", // 1428 + "Eiky\u014D", // 1429 + "Kakitsu", // 1441 + "Bun-an", // 1444 + "H\u014Dtoku", // 1449 + "Ky\u014Dtoku", // 1452 + "K\u014Dsh\u014D", // 1455 + "Ch\u014Droku", // 1457 + "Kansh\u014D", // 1460 + "Bunsh\u014D", // 1466 + "\u014Cnin", // 1467 + "Bunmei", // 1469 + "Ch\u014Dky\u014D", // 1487 + "Entoku", // 1489 + "Mei\u014D", // 1492 + "Bunki", // 1501 + "Eish\u014D", // 1504 + "Taiei", // 1521 + "Ky\u014Droku", // 1528 + "Tenmon", // 1532 + "K\u014Dji", // 1555 + "Eiroku", // 1558 + "Genki", // 1570 + "Tensh\u014D", // 1573 + "Bunroku", // 1592 + "Keich\u014D", // 1596 + "Genwa", // 1615 + "Kan-ei", // 1624 + "Sh\u014Dho", // 1644 + "Keian", // 1648 + "Sh\u014D\u014D", // 1652 + "Meiryaku", // 1655 + "Manji", // 1658 + "Kanbun", // 1661 + "Enp\u014D", // 1673 + "Tenwa", // 1681 + "J\u014Dky\u014D", // 1684 + "Genroku", // 1688 + "H\u014Dei", // 1704 + "Sh\u014Dtoku", // 1711 + "Ky\u014Dh\u014D", // 1716 + "Genbun", // 1736 + "Kanp\u014D", // 1741 + "Enky\u014D", // 1744 + "Kan-en", // 1748 + "H\u014Dryaku", // 1751 + "Meiwa", // 1764 + "An-ei", // 1772 + "Tenmei", // 1781 + "Kansei", // 1789 + "Ky\u014Dwa", // 1801 + "Bunka", // 1804 + "Bunsei", // 1818 + "Tenp\u014D", // 1830 + "K\u014Dka", // 1844 + "Kaei", // 1848 + "Ansei", // 1854 + "Man-en", // 1860 + "Bunky\u016B", // 1861 + "Genji", // 1864 + "Kei\u014D", // 1865 + "Meiji", // 1868 + "Taish\u014D", // 1912 + "Sh\u014Dwa", // 1926 + "Heisei", // 1989 + } + + + // Buddhist calendar data + Eras_buddhist:array { + "BE" // Buddhist Era = 543 BC Gregorian + } zoneStrings { { @@ -849,4 +1910,15 @@ en { ZRZ { "ZRZ", "Zairean Zaire" } // 10/27/1971-11/01/1993 ZWD { "Z$", "Zimbabwe Dollar" } // 04/18/1980- } + DateTimePatterns { + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "MMMM d, yyyy", + "MMM d, yyyy", + "M/d/yy", // Changing this will break binary compatibility. + "{1} {0}", + } } diff --git a/icu4c/source/data/locales/eo.txt b/icu4c/source/data/locales/eo.txt index 41c87afc346..b965978c9c0 100644 --- a/icu4c/source/data/locales/eo.txt +++ b/icu4c/source/data/locales/eo.txt @@ -7,8 +7,7 @@ // or better http://www.jtcsv.com/cgibin/icu-bugs eo { - Version { "3.0" } - + Version { "4.0" } // collation: accented characters have primary (base character) differences // see Jitterbug 1440 http://www.jtcsv.com/cgibin/icu-bugs?findid=1440 CollationElements { @@ -16,8 +15,14 @@ eo { Sequence { "&C<\u0109<<<\u0108 &G<\u011d<<<\u011c &H<\u0125<<<\u0124" "&J<\u0135<<<\u0134 &S<\u015d<<<\u015c &U<\u016d<<<\u016c" } } - + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{ "en"} AT { "A\u016dstrujo" } BE { "Belgujo" } CA { "Kanado" } @@ -78,6 +83,7 @@ eo { "pK", } Languages { + Fallback{ "en"} da { "dana" } de { "germana" } el { "greka" } diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index e45c9220f5f..804e70dc97a 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -6,13 +6,20 @@ // *************************************************************************** es { - Version { "2.0" } + Version { "3.0" } CollationElements { Version { "1.0" } Sequence { "& N < n\u0303<<< N\u0303" } } + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } /* Duplicates from root commented out. */ Countries { + Fallback{ "en"} AE { "Emiratos \u00C1rabes Unidos" } AF { "Afganist\u00E1n" } AG { "Antigua y Barbuda" } @@ -296,6 +303,7 @@ es { } // Spanish does not capitalize the language names like English Languages { + Fallback{ "en"} root{"ra\u00EDz" } // The only exception to ISO-639 af { "afrikaans" } diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 821094e1b24..a9ad63657d2 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -6,7 +6,7 @@ // *************************************************************************** et { - Version{ "2.0" } + Version{ "3.0" } CollationElements { Version { "1.0" } Sequence { "@& S < s\u030C<<< S\u030C < z <<< Z < z\u030C <<< Z\u030C & V" @@ -14,7 +14,15 @@ et { " W\u0302< u\u0308 <<< U\u0308& Y < \u01B6 <<< \u01B5" } } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Araabia \u00DChendemiraadid" } AF { "Afganistan" } @@ -256,6 +264,7 @@ et { //ZW { "Zimbabwe" } } Languages { + Fallback{ "en"} ar { "Araabia" } bg { "Bulgaaria" } cs { "Tiehhi" } diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index e7bff604913..0779d3ad82e 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -10,6 +10,13 @@ eu { Languages { eu { "euskara" } } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } DayAbbreviations { "ig", "al", diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index 93a985feafe..c9caffd13e6 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -32,6 +32,7 @@ fa { } Countries { + Fallback{ "en"} AD { "\u0622\u0646\u062f\u0648\u0631\u0627" } AE { "\u0627\u0645\u0627\u0631\u0627\u062a \u0645\u062a\u062d\u062f\u0647\u200c\u06cc \u0639\u0631\u0628\u06cc" } AF { "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" } @@ -332,6 +333,7 @@ fa { } ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"} Languages { + Fallback{ "en"} root { "\u0631\u06cc\u0634\u0647" } aa { "\u0622\u0641\u0627\u0631\u06cc" } ab { "\u0622\u0628\u062e\u0627\u0632\u06cc" } diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index 8fdc1fc52c4..8135533eb54 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -6,7 +6,7 @@ // *************************************************************************** fi { - Version { "2.0" } + Version { "3.0" } CollationElements { Version { "1.0" } Sequence { "& V << w <<< W & Z < a\u030A <<< A\u030A< a\u0308 <<< A\u0308 " @@ -14,7 +14,15 @@ fi { " << u\u0308 <<< U\u0308" } } + + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{ "en"} AE { "Arabiemiirikunnat" } //AE { "Yhdistyneet Arabiemiraatit" } // Old value AF { "Afganistan" } @@ -152,9 +160,9 @@ fi { ZM { "Sambia" } } Languages { + Fallback{ "en"} ar { "arabia" } az { "azerbaizani" } - ba { "baski" } be { "valkoven\u00e4j\u00e4" } bg { "bulgaria" } bh { "bihari" } @@ -167,12 +175,13 @@ fi { en { "englanti" } es { "espanja" } et { "viro" } + eu{ "baski" } fa { "farsi" } fi { "suomi" } fr { "ranska" } he { "heprea" } hi { "hindi" } - hr { "kroatia" } + hr { "kroaatti" } hu { "unkari" } id { "indonesia" } it { "italia" } @@ -183,7 +192,7 @@ fi { kn { "kannada" } ko { "korea" } ku { "kurdi" } - la { "latinalainen" } + la { "latina" } lt { "liettua" } lv { "latvia" } mk { "makedonia" } @@ -200,7 +209,7 @@ fi { sq { "albania" } sr { "serbia" } sv { "ruotsi" } - sw { "swahili" } + sw { "suahili" } te { "telugu" } th { "thai" } tk { "tagalog" } diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt index 0f56d14f674..a4228c7d9c0 100644 --- a/icu4c/source/data/locales/fo.txt +++ b/icu4c/source/data/locales/fo.txt @@ -8,9 +8,17 @@ fo { Version { "2.0" } Languages { + Fallback{"en"} fo { "føroyskt" } } + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{"en"} + } Countries { + Fallback{"en"} FO { "Føroyar" } } DayAbbreviations { diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 34116eba5db..444c1c31a2e 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -6,12 +6,19 @@ // *************************************************************************** fr { - Version{"2.0"} + Version{"2.0"} CollationElements { Version { "1.0" } Sequence { "[backwards 2]&A<<\u00e6/e<<<\u00c6/E" } } + Variants{ + Fallback{ "en"} + } + Keys{ + Fallback{ "en"} + } Countries { + Fallback{ "en"} AD { "Andorre" } AE { "Emirats Arabes Unis" } AG { "Antigua et Barbuda" } @@ -200,6 +207,7 @@ fr { } Languages { + Fallback{ "en"} root { "racine" } ab { "abkhaze" } diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index c086dcbccc6..d13b1c5eb72 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -18,7 +18,9 @@ hr { "& Z < \u017E <<< \u017D" } } + Countries { + Fallback{ "en"} AD { "Andora" } AE { "Ujedinjeni Arapski Emirati" } AF { "Afganistan" } @@ -260,6 +262,7 @@ hr { ZW { "Zimbabve" } } Languages { + Fallback{ "en"} ar { "arapski" } bg { "bugarski" } cs { "\u010De\u0161ki" } diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index 0494f27f246..4e841dc8993 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -16,6 +16,7 @@ hu { "& Z < zs <<< zS <<< Zs <<< ZS" } } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Egyes\u00FClt Arab Emir\u00E1tus" } AF { "Afganiszt\u00E1n" } @@ -257,6 +258,7 @@ hu { //ZW { "Zimbabwe" } } Languages { + Fallback{ "en"} ar { "arab" } bg { "bolg\u00E1r" } cs { "cseh" } diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt index 7c884b57769..425eb2c4033 100644 --- a/icu4c/source/data/locales/it.txt +++ b/icu4c/source/data/locales/it.txt @@ -8,6 +8,7 @@ it { Version{ "2.0" } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Emirati Arabi Uniti" } //AF { "Afghanistan" } @@ -249,6 +250,7 @@ it { //ZW { "Zimbabwe" } } Languages { + Fallback{ "en"} ar { "arabo" } bg { "bulgaro" } cs { "ceco" } diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index 431367e792f..330e810030b 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -14,6 +14,7 @@ lt { "\u0308 & Z < z\u030C <<< Z\u030C" } } Countries { + Fallback{ "en"} AD { "Andora" } AE { "Jungtiniai Arab\u0173 Emyratai" } AF { "Afganistanas" } @@ -292,6 +293,7 @@ lt { "po.Kr.", } Languages { + Fallback{ "en"} ar { "Arab\u0173" } bg { "Bulgar\u0173" } cs { "\u010Cekijos" } diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index d30baa15883..312804987b1 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -14,6 +14,7 @@ lv { " < s\u030C <<< S\u030C & Z < z\u030C <<< Z\u030C" } } Countries { + Fallback{ "en"} AD { "Andora" } AE { "Apvienotie Ar\u0101bu Emir\u0101ti" } AF { "Afganist\u0101na" } @@ -292,6 +293,7 @@ lv { "m\u0113", } Languages { + Fallback{ "en"} ar { "ar\u0101bu" } bg { "bulg\u0101ru" } cs { "\u010Dehu" } diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt index abe6ecee9d8..3be8c40a3e5 100644 --- a/icu4c/source/data/locales/mt.txt +++ b/icu4c/source/data/locales/mt.txt @@ -21,15 +21,12 @@ mt { Version { "1.0" } // 2002-01-15 // ShortLanguage { mlt } -// "%%PHONEBOOK" { "Bħal lista tat-telefon" } -// "%%PINYIN" { "Pinyin Order" } -// "%%TRADITIONAL" { "Traditional" } -// "%%STROKE" { "Stroke Order" } -// "%%DIRECT" { "Dritt Order" } - "%%PREEURO" { "Qabel il-Euro" } - + Variants{ + PREEURO { "Qabel il-Euro" } + } // Duplicate data has been commented out. Languages { + Fallback{ "en"} root { "Għerq" } // the root locale //------------------------------------------------ //aa { "Afar" } // Afar @@ -470,6 +467,7 @@ mt { // Duplicate data has been commented out. Countries { + Fallback{ "en"} //AD { "Andorra" } // Andorra AE { "Emirati Għarab Maqgħuda" } // United Arab Emirates AF { "Afganistan" } // Afghanistan diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index 0197829554a..8270fe771d7 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -14,7 +14,14 @@ nb { "V<<< w<<< W" } } + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{ "en" } + } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "De forente arabiske emiratene" } //AF { "Afghanistan" } @@ -289,6 +296,7 @@ nb { "l\u00F8rdag", } Languages { + Fallback{ "en"} ar { "Arabisk" } bg { "Bulgarsk" } cs { "Tsjekkisk" } diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index de1e67760a8..e3b74e182d3 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -8,6 +8,7 @@ nl { Version { "2.0" } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Verenigde Arabische Emiraten" } //AF { "Afghanistan" } @@ -287,6 +288,7 @@ nl { } ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00e4 \u00eb \u00ef \u00f6 \u00fc \u0133]" } Languages { + Fallback{ "en"} ar { "Arabisch" } bg { "Bulgaars" } cs { "Tsjechisch" } diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 7b429264a74..ef1a49e3e66 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -13,6 +13,12 @@ nn{ " < o\u0308<<< O\u0308< o\u030B<<< O\u030B < a\u030A<<< A\u030A<<< aa <<< aA <<< Aa <<< AA & " "V<<< w<<< W" } } + Variants{ + Fallback{"en"} + } + Keys{ + Fallback{ "en" } + } Countries { NO { "Noreg" } } diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index b6344d52900..a1d0714f443 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -19,6 +19,7 @@ pl { "&Z < z\u0301 <<< Z\u0301 < z\u0307 <<< Z\u0307" } } Countries { + Fallback{ "en"} AD { "Andora" } AE { "Zjednoczone Emiraty Arabskie" } AF { "Afganistan" } @@ -297,6 +298,7 @@ pl { "n.e.", } Languages { + Fallback{ "en"} ar { "arabski" } bg { "bu\u0142garski" } cs { "czeski" } diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index 56a2f01e11b..b04dda6c7cc 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -10,6 +10,7 @@ pt { Version { "2.0" } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Emirados \u00C1rabes Unidos" } AF { "Afeganist\u00E3o" } @@ -464,6 +465,7 @@ pt { } ExemplarCharacters { "[a-z \u00e3 \u00f5 \u00e7 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00e0 \u00e2 \u00ea \u00f4 \u00fc \u00f2]" } Languages { + Fallback{ "en"} ar { "ar\u00E1bico" } az { "azerbaij\u00E3o" } ba { "basco" } diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index 3e9898be855..a3471f3cad0 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -14,6 +14,7 @@ ro { "Z\u0307" } } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Emiratele Arabe Unite" } AF { "Afganistan" } @@ -289,6 +290,7 @@ ro { "\u00EE.d.C.", } Languages { + Fallback{ "en"} ar { "Arab\u0103" } bg { "Bulgar\u0103" } cs { "Ceh\u0103" } diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index 9bd1f41c754..6dca6b0858e 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -12,46 +12,34 @@ // Instead, put translations in sub locales. root { - Version { "4.0" } - - // each variant name that occurs in locales should be listed with %% and a display string - "%%PREEURO" { "Pre-Euro" } // PREEURO variant display name - "%%EURO" { "Euro" } // PREEURO variant display name - "%%B" { "Bokm\u00e5l" } // Norwegian variant display name - "%%NY" { "Nynorsk" } // Norwegian variant display name - "%%AL" { "\u00C5land" } // Aland variant display name - - "%%POSIX" { "POSIX" } - - // variants for collation (traditional may also be used for traditional chinese) - "%%PHONEBOOK" { "Phonebook Order" } - "%%PINYIN" { "Pinyin Order" } - "%%TRADITIONAL" { "Traditional" } - "%%STROKE" { "Stroke Order" } - "%%DIRECT" { "Direct Order" } + Version { "5.0" } + Variants{ + PREEURO { "PREEURO" } // PREEURO variant display name + EURO { "EURO" } // EURO variant display name + B { "B" } + NY { "NY" } // Norwegian variant display name + AL { "AL" } + POSIX { "POSIX" } + } + Keys{ + // keys for collation (traditional may also be used for traditional chinese) + PHONEBOOK { "PHONEBOOK" } + PINYIN { "PINYIN" } + TRADITIONAL { "TRADITIONAL" } + STROKE { "STROKE" } + DIRECT { "DIRECT" } + } + + // TODO: Remove this // this is a special tag that makes genrb include UCARules.txt for collation "%%UCARULES" { "UCARules.txt"} // UCARules // Here are empty collation rules just for the consistency. UCA is used instead... 01/16/2001 by weiv CollationElements { - Version { "x0.0" } - Sequence { "" } + Version { "0.0" } + Sequence{ "" } } - // Formats for the display name of a locale, for a list of - // items, and for composing two items in a list into one item. - // The list patterns are used in the variant name and in the - // full display name. - // - // This is the language-neutral form of this resource. - // -// LocaleNamePatterns { -// { -// "{0,choice,0#|1#{1}|2#{1} ({2})}", // Display name -// "{0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}", // List -// "{0},{1}" // List composition -// } -// } //------------------------------------------------------------ // BEGIN Transliterator support @@ -67,794 +55,827 @@ root { // Transliterator display names // This is the English form of this resource. - "%Translit%Hex" { "Hex Escape" } - "%Translit%UnicodeName" { "Unicode Name" } - "%Translit%UnicodeChar" { "Unicode Character" } + "%Translit%Hex" { "%Translit%Hex" } + "%Translit%UnicodeName" { "%Translit%UnicodeName" } + "%Translit%UnicodeChar" { "%Translit%UnicodeChar" } //------------------------------------------------------------ // END Transliterator support //------------------------------------------------------------ AmPmMarkers { - "AM", - "PM", + "A.M", + "P.M" } // The official list list of ISO-3166 country codes are located at: // http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html Countries { - //AA {} // Not in ISO-3166 standard - AD { "Andorra" } - AE { "United Arab Emirates" } - AF { "Afghanistan" } - AG { "Antigua and Barbuda" } - AI { "Anguilla" } - AL { "Albania" } - AM { "Armenia" } - AN { "Netherlands Antilles" } - AO { "Angola" } - AQ { "Antarctica" } - AR { "Argentina" } - AS { "American Samoa" } - AT { "Austria" } - AU { "Australia" } - AW { "Aruba" } - AZ { "Azerbaijan" } + Fallback{""} // this is just to make cloctst not complain and not break the fallback chain..if multilevel fallback is implemented + AD { "AD" } + AE { "AE" } + AF { "AF" } + AG { "AG" } + AI { "AI" } + AL { "AL" } + AM { "AM" } + AN { "AN" } + AO { "AO" } + AQ { "AQ" } + AR { "AR" } + AS { "AS" } + AT { "AT" } + AU { "AU" } + AW { "AW" } + AZ { "AZ" } - BA { "Bosnia and Herzegovina" } - BB { "Barbados" } - BD { "Bangladesh" } - BE { "Belgium" } - BF { "Burkina Faso" } - BG { "Bulgaria" } - BH { "Bahrain" } - BI { "Burundi" } - BJ { "Benin" } - BM { "Bermuda" } - BN { "Brunei" } - BO { "Bolivia" } - BR { "Brazil" } - BS { "Bahamas" } - BT { "Bhutan" } - BV { "Bouvet Island" } - BW { "Botswana" } - BY { "Belarus" } - BZ { "Belize" } + BA { "BA" } + BB { "BB" } + BD { "BD" } + BE { "BE" } + BF { "BF" } + BG { "BG" } + BH { "BH" } + BI { "BI" } + BJ { "BJ" } + BM { "BM" } + BN { "BN" } + BO { "BO" } + BR { "BR" } + BS { "BS" } + BT { "BT" } + BV { "BV" } + BW { "BW" } + BY { "BY" } + BZ { "BZ" } - CA { "Canada" } - CC { "Cocos Islands"} - CD { "Democratic Republic of the Congo" } - CF { "Central African Republic" } - CG { "Congo" } - CH { "Switzerland" } - CI { "C\u00F4te d'Ivoire" } - CK { "Cook Islands" } - CL { "Chile" } - CM { "Cameroon" } - CN { "China" } - CO { "Colombia" } - CR { "Costa Rica" } - CU { "Cuba" } - CV { "Cape Verde" } - CX { "Christmas Island" } - CY { "Cyprus" } - CZ { "Czech Republic" } + CA { "CA" } + CC { "CC" } + CD { "CD" } + CF { "CF" } + CG { "CG" } + CH { "CH" } + CI { "CI" } + CK { "CK" } + CL { "CL" } + CM { "CM" } + CN { "CN" } + CO { "CO" } + CR { "CR" } + CU { "CU" } + CV { "CV" } + CX { "CX" } + CY { "CY" } + CZ { "CZ" } - DE { "Germany" } - DJ { "Djibouti" } - DK { "Denmark" } - DM { "Dominica" } - DO { "Dominican Republic" } - DZ { "Algeria" } + DE { "DE" } + DJ { "DJ" } + DK { "DK" } + DM { "DM" } + DO { "DO" } + DZ { "DZ" } - EC { "Ecuador" } - EE { "Estonia" } - EG { "Egypt" } - EH { "Western Sahara" } - ER { "Eritrea" } - ES { "Spain" } - ET { "Ethiopia" } + EC { "EC" } + EE { "EE" } + EG { "EG" } + EH { "EH" } + ER { "ER" } + ES { "ES" } + ET { "ET" } - FI { "Finland" } - FJ { "Fiji" } - FK { "Falkland Islands" } - FM { "Micronesia" } - FO { "Faroe Islands" } - FR { "France" } + FI { "FI" } + FJ { "FJ" } + FK { "FK" } + FM { "FM" } + FO { "FO" } + FR { "FR" } - GA { "Gabon" } - GB { "United Kingdom" } - GD { "Grenada" } - GE { "Georgia" } - GF { "French Guiana" } - GH { "Ghana" } - GI { "Gibraltar" } - GL { "Greenland" } - GM { "Gambia" } - GN { "Guinea" } - GP { "Guadeloupe" } - GQ { "Equatorial Guinea" } - GR { "Greece" } - GS { "South Georgia and South Sandwich Islands" } - GT { "Guatemala" } - GU { "Guam" } - GW { "Guinea-Bissau" } - GY { "Guyana" } + GA { "GA" } + GB { "GB" } + GD { "GD" } + GE { "GE" } + GF { "GF" } + GH { "GH" } + GI { "GI" } + GL { "GL" } + GM { "GM" } + GN { "GN" } + GP { "GP" } + GQ { "GQ" } + GR { "GR" } + GS { "GS" } + GT { "GT" } + GU { "GU" } + GW { "GW" } + GY { "GY" } - HK { "Hong Kong S.A.R., China" } - HM { "Heard Island and McDonald Islands" } - HN { "Honduras" } - HR { "Croatia" } - HT { "Haiti" } - HU { "Hungary" } + HK { "HK" } + HM { "HM" } + HN { "HN" } + HR { "HR" } + HT { "HT" } + HU { "HU" } - ID { "Indonesia" } - IE { "Ireland" } - IL { "Israel" } - IN { "India" } - IO { "British Indian Ocean Territory" } - IQ { "Iraq" } - IR { "Iran" } - IS { "Iceland" } - IT { "Italy" } + ID { "ID" } + IE { "IE" } + IL { "IL" } + IN { "IN" } + IO { "IO" } + IQ { "IQ" } + IR { "IR" } + IS { "IS" } + IT { "IT" } - JM { "Jamaica" } - JO { "Jordan" } - JP { "Japan" } + JM { "JM" } + JO { "JO" } + JP { "JP" } - KE { "Kenya" } - KG { "Kyrgyzstan" } - KH { "Cambodia" } - KI { "Kiribati" } - KM { "Comoros" } - KN { "Saint Kitts and Nevis" } - KP { "North Korea" } - KR { "South Korea" } - KW { "Kuwait" } - KY { "Cayman Islands" } - KZ { "Kazakhstan" } + KE { "KE" } + KG { "KG" } + KH { "KH" } + KI { "KI" } + KM { "KM" } + KN { "KN" } + KP { "KP" } + KR { "KR" } + KW { "KW" } + KY { "KY" } + KZ { "KZ" } - LA { "Laos" } - LB { "Lebanon" } - LC { "Saint Lucia" } - LI { "Liechtenstein" } - LK { "Sri Lanka" } - LR { "Liberia" } - LS { "Lesotho" } - LT { "Lithuania" } - LU { "Luxembourg" } - LV { "Latvia" } - LY { "Libya" } + LA { "LA" } + LB { "LB" } + LC { "LC" } + LI { "LI" } + LK { "LK" } + LR { "LR" } + LS { "LS" } + LT { "LT" } + LU { "LU" } + LV { "LV" } + LY { "LY" } - MA { "Morocco" } - MC { "Monaco" } - MD { "Moldova" } - MG { "Madagascar" } - MH { "Marshall Islands"} - MK { "Macedonia" } - ML { "Mali" } - MM { "Myanmar" } - MN { "Mongolia" } - MO { "Macao S.A.R. China" } - MP { "Northern Mariana Islands"} - MQ { "Martinique" } - MR { "Mauritania" } - MS { "Montserrat" } - MT { "Malta" } - MU { "Mauritius" } - MV { "Maldives" } - MW { "Malawi" } - MX { "Mexico" } - MY { "Malaysia" } - MZ { "Mozambique" } + MA { "MA" } + MC { "MC" } + MD { "MD" } + MG { "MG" } + MH { "MH" } + MK { "MK" } + ML { "ML" } + MM { "MM" } + MN { "MN" } + MO { "MO" } + MP { "MP" } + MQ { "MQ" } + MR { "MR" } + MS { "MS" } + MT { "MT" } + MU { "MU" } + MV { "MV" } + MW { "MW" } + MX { "MX" } + MY { "MY" } + MZ { "MZ" } - NA { "Namibia" } - NC { "New Caledonia" } - NE { "Niger" } - NF { "Norfolk Island" } - NG { "Nigeria" } - NI { "Nicaragua" } - NL { "Netherlands" } - NO { "Norway" } - NP { "Nepal" } - NR { "Nauru" } - NU { "Niue" } - NZ { "New Zealand" } + NA { "NA" } + NC { "NC" } + NE { "NE" } + NF { "NF" } + NG { "NG" } + NI { "NI" } + NL { "NL" } + NO { "NO" } + NP { "NP" } + NR { "NR" } + NU { "NU" } + NZ { "NZ" } - OM { "Oman" } + OM { "OM" } - PA { "Panama" } - PE { "Peru" } - PF { "French Polynesia" } - PG { "Papua New Guinea" } - PH { "Philippines" } - PK { "Pakistan" } - PL { "Poland" } - PM { "Saint Pierre and Miquelon" } - PN { "Pitcairn" } - PR { "Puerto Rico" } - PS { "Palestinian Territory" } - PT { "Portugal" } - PW { "Palau" } - PY { "Paraguay" } + PA { "PA" } + PE { "PE" } + PF { "PF" } + PG { "PG" } + PH { "PH" } + PK { "PK" } + PL { "PL" } + PM { "PM" } + PN { "PN" } + PR { "PR" } + PS { "PS" } + PT { "PT" } + PW { "PW" } + PY { "PY" } - QA { "Qatar" } + QA { "QA" } - RE { "R\u00E9union" } - RO { "Romania" } - RU { "Russia" } - RW { "Rwanda" } + RE { "RE" } + RO { "RO" } + RU { "RU" } + RW { "RW" } - SA { "Saudi Arabia" } - SB { "Solomon Islands" } - SC { "Seychelles" } - SD { "Sudan" } - SE { "Sweden" } - SG { "Singapore" } - SH { "Saint Helena" } - SI { "Slovenia" } - SJ { "Svalbard and Jan Mayen" } - SK { "Slovakia" } - SL { "Sierra Leone" } - SM { "San Marino" } - SN { "Senegal" } - SO { "Somalia" } - SP { "Serbia" } - SR { "Suriname" } - ST { "Sao Tome and Principe" } - SV { "El Salvador" } - SY { "Syria" } - SZ { "Swaziland" } + SA { "SA" } + SB { "SB" } + SC { "SC" } + SD { "SD" } + SE { "SE" } + SG { "SG" } + SH { "SH" } + SI { "SI" } + SJ { "SJ" } + SK { "SK" } + SL { "SL" } + SM { "SM" } + SN { "SN" } + SO { "SO" } + SP { "SP" } + SR { "SR" } + ST { "ST" } + SV { "SV" } + SY { "SY" } + SZ { "SZ" } - TC { "Turks and Caicos Islands" } - TD { "Chad" } - TF { "French Southern Territories" } - TG { "Togo" } - TH { "Thailand" } - TJ { "Tajikistan" } - TK { "Tokelau" } - TM { "Turkmenistan" } - TN { "Tunisia" } - TO { "Tonga" } - TL { "Timor-Leste" } // This was called East Timor - TR { "Turkey" } - TT { "Trinidad and Tobago" } - TV { "Tuvalu" } - TW { "Taiwan" } - TZ { "Tanzania" } + TC { "TC" } + TD { "TD" } + TF { "TF" } + TG { "TG" } + TH { "TH" } + TJ { "TJ" } + TK { "TK" } + TM { "TM" } + TN { "TN" } + TO { "TO" } + TL { "TL" } + TR { "TR" } + TT { "TT" } + TV { "TV" } + TW { "TW" } + TZ { "TZ" } - UA { "Ukraine" } - UG { "Uganda" } - UM { "United States Minor Outlying Islands" } - US { "United States" } - UY { "Uruguay" } - UZ { "Uzbekistan" } + UA { "UA" } + UG { "UG" } + UM { "UM" } + US { "US" } + UY { "UY" } + UZ { "UZ" } - VA { "Vatican" } - VC { "Saint Vincent and the Grenadines" } - VE { "Venezuela" } - VG { "British Virgin Islands" } - VI { "U.S. Virgin Islands" } - VN { "Vietnam" } - VU { "Vanuatu" } + VA { "VA" } + VC { "VC" } + VE { "VE" } + VG { "VG" } + VI { "VI" } + VN { "VN" } + VU { "VU" } - WF { "Wallis and Futuna" } - WS { "Samoa" } + WF { "WF" } + WS { "WS" } - YE { "Yemen" } - YT { "Mayotte" } - YU { "Yugoslavia" } + YE { "YE" } + YT { "YT" } + YU { "YU" } - ZA { "South Africa" } -// ZR { "Zaire" } - ZM { "Zambia" } - ZW { "Zimbabwe" } + ZA { "ZA" } + + ZM { "ZM" } + ZW { "ZW" } } + DateTimeElements:intvector { 1, 1, } + DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "MMMM d, yyyy", - "MMM d, yyyy", - "M/d/yy", // Changing this will break binary compatibility. + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss ", + "HH:mm", + "EEEE, yyyy MMMM dd ", + "yyyy MMMM d ", + "yyyy MMM d ", + "yy/MM/dd", // Changing this will break binary compatibility. "{1} {0}", } + DayAbbreviations { - "Sun", - "Mon", - "Tue", - "Wed", - "Thu", - "Fri", - "Sat", + "1", + "2", + "3", + "4", + "5", + "6", + "7" } DayNames { - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", + "1", + "2", + "3", + "4", + "5", + "6", + "7" } Eras { - "BC", - "AD", + "-", + "+" } + MonthAbbreviations { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + MonthNames { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + // If there is a two letter abbreviation (ISO-639-1) for a three letter // abbreviation (ISO-639-2), the two letter abbreviation must be used. // Source: http://lcweb.loc.gov/standards/iso639-2/englangn.html Languages { - root{"Root"} // The only exception to ISO-639 + Fallback{""} + root{ "root" } - aa { "Afar" } - ab { "Abkhazian" } - ace { "Achinese" } - ach { "Acoli" } - ada { "Adangme" } - ae { "Avestan" } - af { "Afrikaans" } - afa { "Afro-Asiatic (Other)" } - afh { "Afrihili" } - ak { "Akan" } - akk { "Akkadian" } - ale { "Aleut" } - alg { "Algonquian Languages" } - am { "Amharic" } - ang { "English, Old (ca.450-1100)" } - apa { "Apache Languages"} - ar { "Arabic" } - arc { "Aramaic" } - arn { "Araucanian" } - arp { "Arapaho" } - art { "Artificial (Other)" } - arw { "Arawak" } - as { "Assamese" } - ast { "Asturian" } - ath { "Athapascan Languages" } - aus { "Australian Languages" } - av { "Avaric" } - awa { "Awadhi" } - ay { "Aymara" } - az { "Azerbaijani" } - ba { "Bashkir" } - bad { "Banda" } - bai { "Bamileke Languages" } - bal { "Baluchi" } - bam { "Bambara" } - ban { "Balinese" } - bas { "Basa" } - bat { "Baltic (Other)" } - be { "Belarusian" } - bej { "Beja" } - bem { "Bemba" } - ber { "Berber" } - bg { "Bulgarian" } - bh { "Bihari" } - bho { "Bhojpuri" } - bi { "Bislama" } - bik { "Bikol" } - bin { "Bini" } - bla { "Siksika" } // Blackfoot - bm { "Bambara" } - bn { "Bengali" } - bnt { "Bantu" } - bo { "Tibetan" } - br { "Breton" } - bra { "Braj" } - bs { "Bosnian"} - btk { "Batak" } - bua { "Buriat" } - bug { "Buginese" } - ca { "Catalan" } - cad { "Caddo" } - cai { "Central American Indian (Other)" } - car { "Carib" } - cau { "Caucasian (Other)" } - ce { "Chechen" } - ceb { "Cebuano" } - cel { "Celtic (Other)" } - ch { "Chamorro" } - chb { "Chibcha" } - chg { "Chagatai" } - chk { "Chuukese" } - chm { "Mari" } - chn { "Chinook Jargon" } - cho { "Choctaw" } - chp { "Chipewyan" } - chr { "Cherokee" } - chy { "Cheyenne" } - cmc { "Chamic Languages" } - co { "Corsican" } - cop { "Coptic" } - cpe { "Creoles and Pidgins, English-based (Other)" } - cpf { "Creoles and Pidgins, French-based (Other)" } - cpp { "Creoles and pidgins, Portuguese-based (Other)" } - cr { "Cree" } - crp { "Creoles and Pidgins (Other)" } - cs { "Czech" } - cu { "Church Slavic" } - cus { "Cushitic (Other)" } - cv { "Chuvash" } - cy { "Welsh" } - da { "Danish" } - dak { "Dakota" } - dar { "Dargwa" } - day { "Dayak" } - de { "German" } - del { "Delaware" } - den { "Slave" } - dgr { "Dogrib" } - din { "Dinka" } - //div { "Divehi" } // Use dv instead - doi { "Dogri" } - dra { "Dravidian (Other)" } - dua { "Duala" } - dum { "Dutch, Middle (ca. 1050-1350)" } - dv { "Divehi" } - dyu { "Dyula" } - dz { "Dzongkha" } - ee { "Ewe" } - efi { "Efik" } - egy { "Egyptian (Ancient)" } - eka { "Ekajuk" } - el { "Greek" } // Modern (1453-) - elx { "Elamite" } - en { "English" } - enm { "English, Middle (1100-1500)" } - eo { "Esperanto" } - es { "Spanish" } - et { "Estonian" } - eu { "Basque" } - ewo { "Ewondo" } - fa { "Persian" } - fan { "Fang" } - fat { "Fanti" } - ff { "Fulah" } - fi { "Finnish" } - fiu { "Finno - Ugrian (Other)" } - fj { "Fijian" } - fo { "Faroese" } - fon { "Fon" } - fr { "French" } - frm { "French, Middle (ca.1400-1600)" } - fro { "French, Old (842-ca.1400)" } - fur { "Friulian" } - fy { "Frisian" } - ga { "Irish" } - gaa { "Ga" } - gay { "Gayo" } - gba { "Gbaya" } - gd { "Scottish Gaelic" } - gem { "Germanic (Other)" } - gez { "Geez" } - gil { "Gilbertese" } - gl { "Gallegan" } - gla { "Gaelic (Scots)" } - gmh { "German, Middle High (ca.1050-1500)" } - gn { "Guarani" } - goh { "German, Old High (ca.750-1050)" } - gon { "Gondi" } - gor { "Gorontalo" } - got { "Gothic" } - grb { "Gerbo" } - grc { "Greek, Ancient (to 1453)" } - gu { "Gujarati" } - gv { "Manx" } - gwi { "Gwich'in" } - hai { "Haida" } - ha { "Hausa" } - haw { "Hawaiian" } - he { "Hebrew" } - hi { "Hindi" } - hil { "Hiligaynon" } - him { "Himachali" } - hit { "Hittite" } - hmn { "Hmong" } - ho { "Hiri Motu" } - hr { "Croatian" } - hu { "Hungarian" } - hup { "Hupa" } - hy { "Armenian" } - hz { "Herero" } - ia { "Interlingua" } - iba { "Iban" } - id { "Indonesian" } - ie { "Interlingue" } - ig { "Igbo" } - ii { "Sichuan Yi" } - ijo { "Ijo" } - ik { "Inupiaq" } - ilo { "Iloko" } - //in { "Indonesian" } // Use id instead - inc { "Indic (Other)" } - ine { "Indo-European (Other)" } - inh { "Ingush" } - io { "Ido" } - ira { "Iranian" } - iro { "Iroquoian languages" } - is { "Icelandic" } - it { "Italian" } - iu { "Inuktitut" } - iw { "Hebrew" } // Use he instead - ja { "Japanese" } - //ji { "Yiddish" } // Use yi instead - jpr { "Judeo-Persian" } - jrb { "Judeo-Arabic" } - jv { "Javanese" } - //jw { "Javanese" } // Use jv instead - ka { "Georgian" } - kaa { "Kara-Kalpak" } - kab { "Kabyle" } - kac { "Kachin" } - kam { "Kamba" } - kar { "Karen" } - kaw { "Kawi" } - kbd { "Kabardian" } - kg { "Kongo" } - kha { "Khasi" } - khi { "Khoisan (Other)" } - kho { "Khotanese" } - ki { "Kikuyu" } - kj { "Kuanyama" } - kk { "Kazakh" } - kl { "Kalaallisut" } - km { "Khmer" } - kmb { "Kimbundu" } - kn { "Kannada" } - ko { "Korean" } - kok { "Konkani" } - kos { "Kosraean" } - kpe { "Kpelle" } - kr { "Kanuri" } - kro { "Kru" } - kru { "Kurukh" } - ks { "Kashmiri" } - ku { "Kurdish" } - kum { "Kumyk" } - kut { "Kutenai" } - kv { "Komi" } - kw { "Cornish" } - ky { "Kirghiz" } - la { "Latin" } - lad { "Ladino" } - lah { "Lahnda" } - lam { "Lamba" } - lb { "Luxembourgish" } - lez { "Lezghian" } - lg { "Ganda" } - lin { "Lingala" } - li { "Limburgish" } - lit { "Lithuanian" } - ln { "Lingala" } - lo { "Lao" } - lol { "Mongo" } - loz { "Lozi" } - lt { "Lithuanian" } - lu { "Luba-Katanga" } - lua { "Luba-Lulua" } - lui { "Luiseno" } - lun { "Lunda" } - luo { "Luo" } - lus { "Lushai" } - lv { "Latvian" } - mad { "Madurese" } - mag { "Magahi" } - mai { "Maithili" } - mak { "Makasar" } - man { "Mandingo" } - map { "Austronesian" } - mas { "Masai" } - mdr { "Mandar" } - men { "Mende" } - mg { "Malagasy" } - mga { "Irish, Middle (900-1200)" } - mh { "Marshallese"} - mi { "Maori" } - mic { "Micmac" } - min { "Minangkabau" } - mis { "Miscellaneous Languages" } - mk { "Macedonian" } - mkh { "Mon-Khmer (Other)" } - ml { "Malayalam" } - mn { "Mongolian" } - mnc { "Manchu" } - mni { "Manipuri" } - mno { "Manobo Languages" } - mo { "Moldavian" } - moh { "Mohawk" } - mos { "Mossi" } - mr { "Marathi" } - ms { "Malay" } - mt { "Maltese" } - mul { "Multiple Languages" } - mun { "Munda Languages" } - mus { "Creek" } - mwr { "Marwari" } - my { "Burmese" } - myn { "Mayan" } - na { "Nauru" } - nah { "Nahuatl" } - nai { "North American Indian (Other)" } - nap { "Neapolitan" } - nb { "Norwegian Bokm\u00e5l" } - nd { "Ndebele, North" } - nds { "Low German; Low Saxon" } - ne { "Nepali" } - new { "Newari" } - ng { "Ndonga" } - nia { "Nias" } - nic { "Niger - Kordofanian (Other)" } - niu { "Niuean" } - nl { "Dutch" } - nn { "Norwegian Nynorsk" } - no { "Norwegian" } - non { "Norse, Old" } - nr { "Ndebele, South" } - nso { "Sotho, Northern" } - nub { "Nubian Languages" } - nv { "Navajo"} - ny { "Nyanja; Chichewa; Chewa" } - nym { "Nyamwezi" } - nyn { "Nyankole" } - nyo { "Nyoro" } - nzi { "Nzima" } - oc { "Occitan (post 1500); Proven\u00E7al"} - oj { "Ojibwa" } - om { "Oromo" } - or { "Oriya" } - os { "Ossetic" } - osa { "Osage" } - ota { "Turkish, Ottoman (1500-1928)" } - oto { "Otomian Languages" } - pa { "Punjabi" } - paa { "Papuan (Other)" } - pag { "Pangasinan" } - pal { "Pahlavi" } - pam { "Pampanga" } - pap { "Papiamento" } - pau { "Palauan" } - peo { "Persian Old (ca.600-400 B.C.)" } - phi { "Philippine (Other)" } - phn { "Phoenician" } - pi { "Pali" } - pl { "Polish" } - pon { "Pohnpeian" } - pra { "Prakrit Languages" } - pro { "Proven\u00E7al, Old (to 1500)" } - ps { "Pashto (Pushto)" } - pt { "Portuguese" } - qu { "Quechua" } - // The range qaa-qtz is reserved for local use. - raj { "Rajasthani" } - rap { "Rapanui" } - rar { "Rarotongan" } - rm { "Rhaeto-Romance" } - rn { "Rundi" } - ro { "Romanian" } - roa { "Romance (Other)" } - rom { "Romany" } - ru { "Russian" } - rw { "Kinyarwanda" } - sa { "Sanskrit" } - sad { "Sandawe" } - sah { "Yakut" } - sai { "South American Indian (Other)" } - sal { "Salishan languages" } - sam { "Samaritan Aramaic" } - sas { "Sasak" } - sat { "Santali" } - sc { "Sardinian" } - sco { "Scots" } - sd { "Sindhi" } - se { "Northern Sami" } - sel { "Selkup" } - sem { "Semitic (Other)" } - sg { "Sango" } - sga { "Irish, Old (to 900)" } - sgn { "Sign Languages" } - sh { "Serbo-Croatian" } - shn { "Shan" } - si { "Sinhalese" } - sid { "Sidamo" } - sio { "Siouan Languages" } - sit { "Sino-Tibetan (Other)" } - sk { "Slovak" } - sl { "Slovenian" } - sla { "Slavic (Other)" } - sm { "Samoan" } - sma { "Southern Sami" } - smi { "Sami languages (Other)" } - smj { "Lule Sami" } - smn { "Inari Sami" } - sms { "Skolt Sami" } - sn { "Shona" } - snk { "Soninke" } - so { "Somali" } - sog { "Sogdien" } - son { "Songhai" } - sq { "Albanian" } - sr { "Serbian" } - srr { "Serer" } - ss { "Swati" } - ssa { "Nilo-Saharam (Other)" } - st { "Sotho, Southern" } - su { "Sundanese" } - suk { "Sukuma" } - sus { "Susu" } - sux { "Sumerian"} - sv { "Swedish" } - sw { "Swahili" } - syr { "Syriac" } - ta { "Tamil" } - tai { "Tai (Other)" } - te { "Telugu" } - tem { "Timne" } - ter { "Tereno" } - tet { "Tetum" } - tg { "Tajik" } - th { "Thai" } - tig { "Tigre" } - ti { "Tigrinya" } - tiv { "Tiv" } - tk { "Turkmen" } - tkl { "Tokelau" } - tl { "Tagalog" } - tli { "Tlingit" } - tmh { "Tamashek" } - tn { "Tswana" } - tog { "Tonga (Nyasa)" } - to { "Tonga (Tonga Islands)" } - tpi { "Tok Pisin" } - tr { "Turkish" } - ts { "Tsonga" } - tsi { "Tsimshian" } - tt { "Tatar" } - tum { "Tumbuka" } - tup { "Tupi languages" } - tur { "Turkish" } - tut { "Altaic (Other)" } - tvl { "Tuvalu" } - tw { "Twi" } - ty { "Tahitian" } - tyv { "Tuvinian" } - ug { "Uighur" } - uga { "Ugaritic" } - uk { "Ukrainian" } - umb { "Umbundu" } - und { "Undetermined" } - ur { "Urdu" } - uz { "Uzbek" } - vai { "Vai" } - ve { "Venda" } - vi { "Vietnamese" } - vo { "Volap\u00FCk" } // Yes the iso-639 standard uses the umlaut in the English name - vot { "Votic" } - wa { "Walloon" } - wak { "Wakashan Languages" } - wal { "Walamo" } - war { "Waray" } - was { "Washo" } - wen { "Sorbian Languages" } - wo { "Wolof" } - xh { "Xhosa" } - yao { "Yao" } - yap { "Yapese" } - yi { "Yiddish" } - yo { "Yoruba" } - ypk { "Yupik Languages" } - za { "Zhuang" } - zap { "Zapotec" } - zen { "Zenaga" } - zh { "Chinese" } - znd { "Zande" } - zu { "Zulu" } - zun { "Zuni" } + aa { "aa" } + ab { "ab" } + ace { "ace" } + ach { "ach" } + ada { "ada" } + ae { "ae" } + af { "af" } + afa { "afa" } + afh { "afh" } + ak { "ak" } + akk { "akk" } + ale { "ale" } + alg { "alg" } + am { "am" } + ang { "ang" } + apa { "apa" } + ar { "ar" } + arc { "arc" } + arn { "arn" } + arp { "arp" } + art { "art" } + arw { "arw" } + as { "as" } + ast { "ast" } + ath { "ath" } + aus { "aus" } + av { "av" } + awa { "awa" } + ay { "ay" } + az { "az" } + ba { "ba" } + bad { "bad" } + bai { "bai" } + bal { "bal" } + bam { "bam" } + ban { "ban" } + bas { "bas" } + bat { "bat" } + be { "be" } + bej { "bej" } + bem { "bem" } + ber { "ber" } + bg { "bg" } + bh { "bh" } + bho { "bho" } + bi { "bi" } + bik { "bik" } + bin { "bin" } + bla { "bla" } + bm { "bm" } + bn { "bn" } + bnt { "bnt" } + bo { "bo" } + br { "br" } + bra { "bra" } + bs { "bs" } + btk { "btk" } + bua { "bua" } + bug { "bug" } + ca { "ca" } + cad { "cad" } + cai { "cai" } + car { "car" } + cau { "cau" } + ce { "ce" } + ceb { "ceb" } + cel { "cel" } + ch { "ch" } + chb { "chb" } + chg { "chg" } + chk { "chk" } + chm { "chm" } + chn { "chn" } + cho { "cho" } + chp { "chp" } + chr { "chr" } + chy { "chy" } + cmc { "cmc" } + co { "co" } + cop { "cop" } + cpe { "cpe" } + cpf { "cpf" } + cpp { "cpp" } + cr { "cr" } + crp { "crp" } + cs { "cs" } + cu { "cu" } + cus { "cus" } + cv { "cv" } + cy { "cy" } + da { "da" } + dak { "dak" } + dar { "dar" } + day { "day" } + de { "de" } + del { "del" } + den { "den" } + dgr { "dgr" } + din { "din" } + + doi { "doi" } + dra { "dra" } + dua { "dua" } + dum { "dum" } + dv { "dv" } + dyu { "dyu" } + dz { "dz" } + ee { "ee" } + efi { "efi" } + egy { "egy" } + eka { "eka" } + el { "el" } + elx { "elx" } + en { "en" } + enm { "enm" } + eo { "eo" } + es { "es" } + et { "et" } + eu { "eu" } + ewo { "ewo" } + fa { "fa" } + fan { "fan" } + fat { "fat" } + ff { "ff" } + fi { "fi" } + fiu { "fiu" } + fj { "fj" } + fo { "fo" } + fon { "fon" } + fr { "fr" } + frm { "frm" } + fro { "fro" } + fur { "fur" } + fy { "fy" } + ga { "ga" } + gaa { "gaa" } + gay { "gay" } + gba { "gba" } + gd { "gd" } + gem { "gem" } + gez { "gez" } + gil { "gil" } + gl { "gl" } + gla { "gla" } + gmh { "gmh" } + gn { "gn" } + goh { "goh" } + gon { "gon" } + gor { "gor" } + got { "got" } + grb { "grb" } + grc { "grc" } + gu { "gu" } + gv { "gv" } + gwi { "gwi" } + hai { "hai" } + ha { "ha" } + haw { "haw" } + he { "he" } + hi { "hi" } + hil { "hil" } + him { "him" } + hit { "hit" } + hmn { "hmn" } + ho { "ho" } + hr { "hr" } + hu { "hu" } + hup { "hup" } + hy { "hy" } + hz { "hz" } + ia { "ia" } + iba { "iba" } + id { "id" } + ie { "ie" } + ig { "ig" } + ii { "ii" } + ijo { "ijo" } + ik { "ik" } + ilo { "ilo" } + + inc { "inc" } + ine { "ine" } + inh { "inh" } + io { "io" } + ira { "ira" } + iro { "iro" } + is { "is" } + it { "it" } + iu { "iu" } + iw { "iw" } + ja { "ja" } + + jpr { "jpr" } + jrb { "jrb" } + jv { "jv" } + + ka { "ka" } + kaa { "kaa" } + kab { "kab" } + kac { "kac" } + kam { "kam" } + kar { "kar" } + kaw { "kaw" } + kbd { "kbd" } + kg { "kg" } + kha { "kha" } + khi { "khi" } + kho { "kho" } + ki { "ki" } + kj { "kj" } + kk { "kk" } + kl { "kl" } + km { "km" } + kmb { "kmb" } + kn { "kn" } + ko { "ko" } + kok { "kok" } + kos { "kos" } + kpe { "kpe" } + kr { "kr" } + kro { "kro" } + kru { "kru" } + ks { "ks" } + ku { "ku" } + kum { "kum" } + kut { "kut" } + kv { "kv" } + kw { "kw" } + ky { "ky" } + la { "la" } + lad { "lad" } + lah { "lah" } + lam { "lam" } + lb { "lb" } + lez { "lez" } + lg { "lg" } + lin { "lin" } + li { "li" } + lit { "lit" } + ln { "ln" } + lo { "lo" } + lol { "lol" } + loz { "loz" } + lt { "lt" } + lu { "lu" } + lua { "lua" } + lui { "lui" } + lun { "lun" } + luo { "luo" } + lus { "lus" } + lv { "lv" } + mad { "mad" } + mag { "mag" } + mai { "mai" } + mak { "mak" } + man { "man" } + map { "map" } + mas { "mas" } + mdr { "mdr" } + men { "men" } + mg { "mg" } + mga { "mga" } + mh { "mh" } + mi { "mi" } + mic { "mic" } + min { "min" } + mis { "mis" } + mk { "mk" } + mkh { "mkh" } + ml { "ml" } + mn { "mn" } + mnc { "mnc" } + mni { "mni" } + mno { "mno" } + mo { "mo" } + moh { "moh" } + mos { "mos" } + mr { "mr" } + ms { "ms" } + mt { "mt" } + mul { "mul" } + mun { "mun" } + mus { "mus" } + mwr { "mwr" } + my { "my" } + myn { "myn" } + na { "na" } + nah { "nah" } + nai { "nai" } + nap { "nap" } + nb { "nb" } + nd { "nd" } + nds { "nds" } + ne { "ne" } + new { "new" } + ng { "ng" } + nia { "nia" } + nic { "nic" } + niu { "niu" } + nl { "nl" } + nn { "nn" } + no { "no" } + non { "non" } + nr { "nr" } + nso { "nso" } + nub { "nub" } + nv { "nv" } + ny { "ny" } + nym { "nym" } + nyn { "nyn" } + nyo { "nyo" } + nzi { "nzi" } + oc { "oc" } + oj { "oj" } + om { "om" } + or { "or" } + os { "os" } + osa { "osa" } + ota { "ota" } + oto { "oto" } + pa { "pa" } + paa { "paa" } + pag { "pag" } + pal { "pal" } + pam { "pam" } + pap { "pap" } + pau { "pau" } + peo { "peo" } + phi { "phi" } + phn { "phn" } + pi { "pi" } + pl { "pl" } + pon { "pon" } + pra { "pra" } + pro { "pro" } + ps { "ps" } + pt { "pt" } + qu { "qu" } + + raj { "raj" } + rap { "rap" } + rar { "rar" } + rm { "rm" } + rn { "rn" } + ro { "ro" } + roa { "roa" } + rom { "rom" } + ru { "ru" } + rw { "rw" } + sa { "sa" } + sad { "sad" } + sah { "sah" } + sai { "sai" } + sal { "sal" } + sam { "sam" } + sas { "sas" } + sat { "sat" } + sc { "sc" } + sco { "sco" } + sd { "sd" } + se { "se" } + sel { "sel" } + sem { "sem" } + sg { "sg" } + sga { "sga" } + sgn { "sgn" } + sh { "sh" } + shn { "shn" } + si { "si" } + sid { "sid" } + sio { "sio" } + sit { "sit" } + sk { "sk" } + sl { "sl" } + sla { "sla" } + sm { "sm" } + sma { "sma" } + smi { "smi" } + smj { "smj" } + smn { "smn" } + sms { "sms" } + sn { "sn" } + snk { "snk" } + so { "so" } + sog { "sog" } + son { "son" } + sq { "sq" } + sr { "sr" } + srr { "srr" } + ss { "ss" } + ssa { "ssa" } + st { "st" } + su { "su" } + suk { "suk" } + sus { "sus" } + sux { "sux" } + sv { "sv" } + sw { "sw" } + syr { "syr" } + ta { "ta" } + tai { "tai" } + te { "te" } + tem { "tem" } + ter { "ter" } + tet { "tet" } + tg { "tg" } + th { "th" } + tig { "tig" } + ti { "ti" } + tiv { "tiv" } + tk { "tk" } + tkl { "tkl" } + tl { "tl" } + tli { "tli" } + tmh { "tmh" } + tn { "tn" } + tog { "tog" } + to { "to" } + tpi { "tpi" } + tr { "tr" } + ts { "ts" } + tsi { "tsi" } + tt { "tt" } + tum { "tum" } + tup { "tup" } + tur { "tur" } + tut { "tut" } + tvl { "tvl" } + tw { "tw" } + ty { "ty" } + tyv { "tyv" } + ug { "ug" } + uga { "uga" } + uk { "uk" } + umb { "umb" } + und { "und" } + ur { "ur" } + uz { "uz" } + vai { "vai" } + ve { "ve" } + vi { "vi" } + vo { "vo" } + vot { "vot" } + wa { "wa" } + wak { "wak" } + wal { "wal" } + war { "war" } + was { "was" } + wen { "wen" } + wo { "wo" } + xh { "xh" } + yao { "yao" } + yap { "yap" } + yi { "yi" } + yo { "yo" } + ypk { "ypk" } + za { "za" } + zap { "zap" } + zen { "zen" } + zh { "zh" } + znd { "znd" } + zu { "zu" } + zun { "zun" } } // Localized display names of currencies, analogous to Countries @@ -913,34 +934,7 @@ root { XPF:intvector { 0, 0 } // CFP Franc: FRENCH POLYNESIA (PF), NEW CALEDONIA (NC), WALLIS AND FUTUNA (WF) DEFAULT:intvector { 2, 0 } // (All currencies not listed) } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "May", - "Jun", - "Jul", - "Aug", - "Sep", - "Oct", - "Nov", - "Dec", - } - MonthNames { - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December", - } + NumberElements { ".", ",", @@ -1376,264 +1370,263 @@ root { DefaultCalendar { "gregorian" } // Japanese calendar data - Eras_japanese { - // Name Gregorian Year - "Taika", // 645 - "Hakuchi", // 650 - "Hakuh\u014D", // 672 - "Shuch\u014D", // 686 - "Taih\u014D", // 701 - "Keiun", // 704 - "Wad\u014D", // 708 - "Reiki", // 715 - "Y\u014Dr\u014D", // 717 - "Jinki", // 724 - "Tempy\u014D", // 729 - "Tempy\u014D-kamp\u014D", // 749 - "Tempy\u014D-sh\u014Dh\u014D", // 749 - "Tempy\u014D-h\u014Dji", // 757 - "Temph\u014D-jingo", // 765 - "Jingo-keiun", // 767 - "H\u014Dki", // 770 - "Ten-\u014D", // 781 - "Enryaku", // 782 - "Daid\u014D", // 806 - "K\u014Dnin", // 810 - "Tench\u014D", // 824 - "Sh\u014Dwa", // 834 - "Kaj\u014D", // 848 - "Ninju", // 851 - "Saiko", // 854 - "Tennan", // 857 - "J\u014Dgan", // 859 - "Genkei", // 877 - "Ninna", // 885 - "Kampy\u014D", // 889 - "Sh\u014Dtai", // 898 - "Engi", // 901 - "Ench\u014D", // 923 - "Sh\u014Dhei", // 931 - "Tengy\u014D", // 938 - "Tenryaku", // 947 - "Tentoku", // 957 - "\u014Cwa", // 961 - "K\u014Dh\u014D", // 964 - "Anna", // 968 - "Tenroku", // 970 - "Ten-en", // 973 - "J\u014Dgen", // 976 - "Tengen", // 978 - "Eikan", // 983 - "Kanna", // 985 - "Ei-en", // 987 - "Eiso", // 989 - "Sh\u014Dryaku", // 990 - "Ch\u014Dtoku", // 995 - "Ch\u014Dh\u014D", // 999 - "Kank\u014D", // 1004 - "Ch\u014Dwa", // 1012 - "Kannin", // 1017 - "Jian", // 1021 - "Manju", // 1024 - "Ch\u014Dgen", // 1028 - "Ch\u014Dryaku", // 1037 - "Ch\u014Dky\u016B", // 1040 - "Kantoku", // 1044 - "Eish\u014D", // 1046 - "Tengi", // 1053 - "K\u014Dhei", // 1058 - "Jiryaku", // 1065 - "Enky\u016B", // 1069 - "Sh\u014Dho", // 1074 - "Sh\u014Dryaku", // 1077 - "Eiho", // 1081 - "\u014Ctoku", // 1084 - "Kanji", // 1087 - "Kaho", // 1094 - "Eich\u014D", // 1096 - "Sh\u014Dtoku", // 1097 - "K\u014Dwa", // 1099 - "Ch\u014Dji", // 1104 - "Kash\u014D", // 1106 - "Tennin", // 1108 - "Ten-ei", // 1110 - "Eiky\u016B", // 1113 - "Gen-ei", // 1118 - "Hoan", // 1120 - "Tenji", // 1124 - "Daiji", // 1126 - "Tensh\u014D", // 1131 - "Ch\u014Dsh\u014D", // 1132 - "Hoen", // 1135 - "Eiji", // 1141 - "K\u014Dji", // 1142 - "Teny\u014D", // 1144 - "Ky\u016Ban", // 1145 - "Ninpei", // 1151 - "Ky\u016Bju", // 1154 - "Hogen", // 1156 - "Heiji", // 1159 - "Eiryaku", // 1160 - "\u014Cho", // 1161 - "Ch\u014Dkan", // 1163 - "Eiman", // 1165 - "Nin-an", // 1166 - "Ka\u014D", // 1169 - "Sh\u014Dan", // 1171 - "Angen", // 1175 - "Jish\u014D", // 1177 - "Y\u014Dwa", // 1181 - "Juei", // 1182 - "Genryuku", // 1184 - "Bunji", // 1185 - "Kenky\u016B", // 1190 - "Sh\u014Dji", // 1199 - "Kennin", // 1201 - "Genky\u016B", // 1204 - "Ken-ei", // 1206 - "Sh\u014Dgen", // 1207 - "Kenryaku", // 1211 - "Kenp\u014D", // 1213 - "Sh\u014Dky\u016B", // 1219 - "J\u014D\u014D", // 1222 - "Gennin", // 1224 - "Karoku", // 1225 - "Antei", // 1227 - "Kanki", // 1229 - "J\u014Dei", // 1232 - "Tempuku", // 1233 - "Bunryaku", // 1234 - "Katei", // 1235 - "Ryakunin", // 1238 - "En-\u014D", // 1239 - "Ninji", // 1240 - "Kangen", // 1243 - "H\u014Dji", // 1247 - "Kench\u014D", // 1249 - "K\u014Dgen", // 1256 - "Sh\u014Dka", // 1257 - "Sh\u014Dgen", // 1259 - "Bun-\u014D", // 1260 - "K\u014Dch\u014D", // 1261 - "Bun-ei", // 1264 - "Kenji", // 1275 - "K\u014Dan", // 1278 - "Sh\u014D\u014D", // 1288 - "Einin", // 1293 - "Sh\u014Dan", // 1299 - "Kengen", // 1302 - "Kagen", // 1303 - "Tokuji", // 1306 - "Enkei", // 1308 - "\u014Cch\u014D", // 1311 - "Sh\u014Dwa", // 1312 - "Bunp\u014D", // 1317 - "Gen\u014D", // 1319 - "Genky\u014D", // 1321 - "Sh\u014Dch\u016B", // 1324 - "Kareki", // 1326 - "Gentoku", // 1329 - "Genk\u014D", // 1331 - "Kemmu", // 1334 - "Engen", // 1336 - "K\u014Dkoku", // 1340 - "Sh\u014Dhei", // 1346 - "Kentoku", // 1370 - "Bunch\u0169", // 1372 - "Tenju", // 1375 - "K\u014Dwa", // 1381 - "Gench\u0169", // 1384 - "Meitoku", // 1384 - "K\u014Dryaku", // 1379 - "Kakei", // 1387 - "K\u014D\u014D", // 1389 - "Meitoku", // 1390 - "\u014Cei", // 1394 - "Sh\u014Dch\u014D", // 1428 - "Eiky\u014D", // 1429 - "Kakitsu", // 1441 - "Bun-an", // 1444 - "H\u014Dtoku", // 1449 - "Ky\u014Dtoku", // 1452 - "K\u014Dsh\u014D", // 1455 - "Ch\u014Droku", // 1457 - "Kansh\u014D", // 1460 - "Bunsh\u014D", // 1466 - "\u014Cnin", // 1467 - "Bunmei", // 1469 - "Ch\u014Dky\u014D", // 1487 - "Entoku", // 1489 - "Mei\u014D", // 1492 - "Bunki", // 1501 - "Eish\u014D", // 1504 - "Taiei", // 1521 - "Ky\u014Droku", // 1528 - "Tenmon", // 1532 - "K\u014Dji", // 1555 - "Eiroku", // 1558 - "Genki", // 1570 - "Tensh\u014D", // 1573 - "Bunroku", // 1592 - "Keich\u014D", // 1596 - "Genwa", // 1615 - "Kan-ei", // 1624 - "Sh\u014Dho", // 1644 - "Keian", // 1648 - "Sh\u014D\u014D", // 1652 - "Meiryaku", // 1655 - "Manji", // 1658 - "Kanbun", // 1661 - "Enp\u014D", // 1673 - "Tenwa", // 1681 - "J\u014Dky\u014D", // 1684 - "Genroku", // 1688 - "H\u014Dei", // 1704 - "Sh\u014Dtoku", // 1711 - "Ky\u014Dh\u014D", // 1716 - "Genbun", // 1736 - "Kanp\u014D", // 1741 - "Enky\u014D", // 1744 - "Kan-en", // 1748 - "H\u014Dryaku", // 1751 - "Meiwa", // 1764 - "An-ei", // 1772 - "Tenmei", // 1781 - "Kansei", // 1789 - "Ky\u014Dwa", // 1801 - "Bunka", // 1804 - "Bunsei", // 1818 - "Tenp\u014D", // 1830 - "K\u014Dka", // 1844 - "Kaei", // 1848 - "Ansei", // 1854 - "Man-en", // 1860 - "Bunky\u016B", // 1861 - "Genji", // 1864 - "Kei\u014D", // 1865 - "Meiji", // 1868 - "Taish\u014D", // 1912 - "Sh\u014Dwa", // 1926 - "Heisei", // 1989 - } + Eras_japanese:array { + "645", + "650", + "672", + "686", + "701", + "704", + "708", + "715", + "717", + "724", + "729", + "749", + "749", + "757", + "765", + "767", + "770", + "781", + "782", + "806", + "810", + "824", + "834", + "848", + "851", + "854", + "857", + "859", + "877", + "885", + "889", + "898", + "901", + "923", + "931", + "938", + "947", + "957", + "961", + "964", + "968", + "970", + "973", + "976", + "978", + "983", + "985", + "987", + "989", + "990", + "995", + "999", + "1004", + "1012", + "1017", + "1021", + "1024", + "1028", + "1037", + "1040", + "1044", + "1046", + "1053", + "1058", + "1065", + "1069", + "1074", + "1077", + "1081", + "1084", + "1087", + "1094", + "1096", + "1097", + "1099", + "1104", + "1106", + "1108", + "1110", + "1113", + "1118", + "1120", + "1124", + "1126", + "1131", + "1132", + "1135", + "1141", + "1142", + "1144", + "1145", + "1151", + "1154", + "1156", + "1159", + "1160", + "1161", + "1163", + "1165", + "1166", + "1169", + "1171", + "1175", + "1177", + "1181", + "1182", + "1184", + "1185", + "1190", + "1199", + "1201", + "1204", + "1206", + "1207", + "1211", + "1213", + "1219", + "1222", + "1224", + "1225", + "1227", + "1229", + "1232", + "1233", + "1234", + "1235", + "1238", + "1239", + "1240", + "1243", + "1247", + "1249", + "1256", + "1257", + "1259", + "1260", + "1261", + "1264", + "1275", + "1278", + "1288", + "1293", + "1299", + "1302", + "1303", + "1306", + "1308", + "1311", + "1312", + "1317", + "1319", + "1321", + "1324", + "1326", + "1329", + "1331", + "1334", + "1336", + "1340", + "1346", + "1370", + "1372", + "1375", + "1381", + "1384", + "1384", + "1379", + "1387", + "1389", + "1390", + "1394", + "1428", + "1429", + "1441", + "1444", + "1449", + "1452", + "1455", + "1457", + "1460", + "1466", + "1467", + "1469", + "1487", + "1489", + "1492", + "1501", + "1504", + "1521", + "1528", + "1532", + "1555", + "1558", + "1570", + "1573", + "1592", + "1596", + "1615", + "1624", + "1644", + "1648", + "1652", + "1655", + "1658", + "1661", + "1673", + "1681", + "1684", + "1688", + "1704", + "1711", + "1716", + "1736", + "1741", + "1744", + "1748", + "1751", + "1764", + "1772", + "1781", + "1789", + "1801", + "1804", + "1818", + "1830", + "1844", + "1848", + "1854", + "1860", + "1861", + "1864", + "1865", + "1868", + "1912", + "1926", + "1989", + } - DateTimePatterns_japanese:array { - "h:mm:ss a z", // full time pattern - "h:mm:ss a z", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - "EEEE, MMMM d, y G", // full date pattern - "MMMM d, y G", // long date pattern - "MMM d, y G", // medium date pattern - "M/d/yy", // short date pattern - "{1} {0}" // date-time pattern - } + DateTimePatterns_japanese:array { + "h:mm:ss a z", // full time pattern + "h:mm:ss a z", // long time pattern + "h:mm:ss a", // medium time pattern + "h:mm a", // short time pattern + "EEEE, MMMM d, y G", // full date pattern + "MMMM d, y G", // long date pattern + "MMM d, y G", // medium date pattern + "M/d/yy", // short date pattern + "{1} {0}" // date-time pattern + } - // Buddhist calendar data - Eras_buddhist:array { - "BE" // Buddhist Era = 543 BC Gregorian - } + // Buddhist calendar data + Eras_buddhist:array { + "543", + } - DateTimePatterns_buddhist { // shorten year, use Era + DateTimePatterns_buddhist { // shorten year, use Era "h:mm:ss a z", "h:mm:ss a z", "h:mm:ss a", diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt index 54d8cbf0b60..fb1f93d9037 100644 --- a/icu4c/source/data/locales/sh.txt +++ b/icu4c/source/data/locales/sh.txt @@ -19,6 +19,7 @@ sh { } } Countries { + Fallback{ "en"} AF { "Avganistan" } AL { "Albanija" } DZ { "Al\u017Eir" } @@ -241,6 +242,7 @@ sh { "n. e.", } Languages { + Fallback{ "en"} af { "Afrikanerski" } sq { "Albanski" } ar { "Arapski" } diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt index cddb5a2ad94..50cf009e1f8 100644 --- a/icu4c/source/data/locales/sk.txt +++ b/icu4c/source/data/locales/sk.txt @@ -15,6 +15,7 @@ sk { " & Z < z\u030C <<< Z\u030C < z\u0307 <<< Z\u0307" } } Countries { + Fallback{ "en"} //AD { "Andorra" } AE { "Spojen\u00E9 arabsk\u00E9 emir\u00E1ty" } AF { "Afganistan" } @@ -290,6 +291,7 @@ sk { "n.l.", } Languages { + Fallback{ "en"} ar { "arabsk\u00FD" } bg { "bulharsk\u00FD" } cs { "\u010Desk\u00FD" } diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index 667cbf655c0..f13a2ec17f3 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -16,6 +16,7 @@ sl { // " z\u030C <<< Z\u030C < z\u0301 <<< Z\u0301 < z\u0307 <<< Z\u0307 " } } Countries { + Fallback{ "en"} AD { "Andora" } AE { "Zdru\u017Eeni arabski emirati" } AF { "Afganistan" } @@ -290,6 +291,7 @@ sl { "po Kr.", } Languages { + Fallback{ "en"} ar { "Arab\u0161\u010Dina" } bg { "Bolgar\u0161\u010Dina" } cs { "\u010Ce\u0161\u010Dina" } diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 551aa37c8a9..c246b8082f5 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -19,6 +19,7 @@ sv { } } Countries { + Fallback{ "en"} // AD {"Andorra"} AE {"F\u00F6renade Arabemiraten"} AF {"Afganistan"} @@ -296,6 +297,7 @@ sv { } Languages { + Fallback{ "en"} aa {"afar"} ab {"abkhaziska"} ace {"achinese"} diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index 0de67d4df5d..723b90cc90d 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -19,6 +19,7 @@ tr { "& U < u\u0308 <<< U\u0308" } } Countries { + Fallback{ "en"} AD { "Andora" } AE { "Birle\u015Fik Arap Emirlikleri" } AF { "Afganistan" } @@ -293,6 +294,7 @@ tr { "Cumartesi", } Languages { + Fallback{ "en"} ar { "Arap\u00E7a" } bg { "Bulgarca" } cs { "\u00C7ek\u00E7e" } diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 2a3222e14af..9f33263b074 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -7,8 +7,10 @@ zh { Version{ "2.0" } - "%%PINYIN" { "\u62FC\u97F3\u987a\u5e8f" } - "%%STROKE" { "\u7b14\u5212\u987a\u5e8f" } // Simplified Chinese name. + Variants{ + PINYIN { "\u62FC\u97F3\u987a\u5e8f" } + STROKE { "\u7b14\u5212\u987a\u5e8f" } // Simplified Chinese name. + } AmPmMarkers { "\u4E0A\u5348", "\u4E0B\u5348", diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt index 025905d7b73..7f0f15ec41f 100644 --- a/icu4c/source/data/locales/zh_TW.txt +++ b/icu4c/source/data/locales/zh_TW.txt @@ -7,7 +7,9 @@ zh_TW { Version{ "2.0" } - "%%STROKE" { "\u7B46\u5283\u987a\u5e8f" } // Traditional Chinese. + Variants{ + STROKE { "\u7B46\u5283\u987a\u5e8f" } // Traditional Chinese. + } CollationElements { Version { "1.0" } Sequence { "&[top]<\u5159<\u515B<\u515E<\u515D<\u5161<\u5163<\u55E7<\u74E9<\u7CCE<\u4E00<\u4E59" diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index 96557a87fd5..eb4d63be3ef 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -100,14 +100,14 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1" }, /* display variant (Greek) */ - { "", "", "", "", "Nynorsk" }, + { "", "", "", "", "NY" }, /* TODO: currently there is no translation for NY in Greek fix this test when we have it */ /* display name (Greek) */ { "\\u0391\\u03b3\\u03b3\\u03bb\\u03b9\\u03ba\\u03ac (\\u0397\\u03bd\\u03c9\\u03bc\\u03ad\\u03bd\\u03b5\\u03c2 \\u03a0\\u03bf\\u03bb\\u03b9\\u03c4\\u03b5\\u03af\\u03b5\\u03c2)", "\\u0393\\u03b1\\u03bb\\u03bb\\u03b9\\u03ba\\u03ac (\\u0393\\u03b1\\u03bb\\u03bb\\u03af\\u03b1)", "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1)", "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)", - "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, Nynorsk)" + "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)" } }; @@ -163,7 +163,7 @@ void addLocaleTest(TestNode** root) addTest(root, &TestUninstalledISO3Names, "tsutil/cloctst/TestUninstalledISO3Names"); addTest(root, &TestSimpleDisplayNames, "tsutil/cloctst/TestSimpleDisplayNames"); addTest(root, &TestVariantParsing, "tsutil/cloctst/TestVariantParsing"); - addTest(root, &TestLocaleStructure, "tsutil/cloctst/TestLocaleStructure"); + /*addTest(root, &TestLocaleStructure, "tsutil/cloctst/TestLocaleStructure");*/ addTest(root, &TestConsistentCountryInfo,"tsutil/cloctst/TestConsistentCountryInfo"); addTest(root, &VerifyTranslation, "tsutil/cloctst/VerifyTranslation"); } @@ -461,9 +461,10 @@ cleanUpDataTable(); static void TestDisplayNames() { UChar buffer[100]; - UErrorCode errorCode; + UErrorCode errorCode=U_ZERO_ERROR; int32_t length; - + UChar temp[500]; + int32_t maxresultsize=uloc_getDisplayVariant("no_NO_NY", "en_US", temp, 500, &errorCode); log_verbose("Testing getDisplayName for different locales\n"); log_verbose(" In locale = en_US...\n"); diff --git a/icu4c/source/test/cintltst/crestst.c b/icu4c/source/test/cintltst/crestst.c index 403e83607f1..44f5bd6f4dc 100644 --- a/icu4c/source/test/cintltst/crestst.c +++ b/icu4c/source/test/cintltst/crestst.c @@ -403,6 +403,7 @@ static void TestFallback() { UErrorCode status = U_ZERO_ERROR; UResourceBundle *fr_FR = NULL; + UResourceBundle *subResource = NULL; const UChar *junk; /* ignored */ int32_t resultLen; @@ -426,13 +427,13 @@ static void TestFallback() status = U_ZERO_ERROR; /* OK first one. This should be a Default value. */ - junk = ures_getStringByKey(fr_FR, "%%PREEURO", &resultLen, &status); + subResource = ures_getByKey(fr_FR, "LocaleScript", NULL, &status); if(status != U_USING_DEFAULT_WARNING) { - log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get %%PREEURO from fr_FR, got %s\n", + log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get LocaleScript from fr_FR, got %s\n", u_errorName(status)); } - + ures_close(subResource); status = U_ZERO_ERROR; /* and this is a Fallback, to fr */ diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 8e665f8ff65..3011c6d806f 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -1817,6 +1817,7 @@ static void TestFallback() { UErrorCode status = U_ZERO_ERROR; UResourceBundle *fr_FR = NULL; + UResourceBundle *subResource = NULL; const UChar *junk; /* ignored */ int32_t resultLen; @@ -1840,14 +1841,15 @@ static void TestFallback() status = U_ZERO_ERROR; /* OK first one. This should be a Default value. */ - junk = ures_getStringByKey(fr_FR, "%%PREEURO", &resultLen, &status); + subResource = ures_getByKey(fr_FR, "LocaleScript", NULL, &status); if(status != U_USING_DEFAULT_WARNING) { - log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get %%PREEURO from fr_FR, got %s\n", + log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get LocaleScript from fr_FR, got %s\n", u_errorName(status)); } status = U_ZERO_ERROR; + ures_close(subResource); /* and this is a Fallback, to fr */ junk = ures_getStringByKey(fr_FR, "DayNames", &resultLen, &status); diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index e9c02e1fbe4..6e04201584d 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -81,13 +81,13 @@ const char* rawData[27][7] = { "" }, // display variant (Greek) - { "", "", "", "", "", "", "" }, + { "", "", "", "", "NY" }, /* TODO: currently there is no translation for NY in Greek fix this test when we have it */ // display name (Greek)[actual values listed below] { "\\u0391\\u03b3\\u03b3\\u03bb\\u03b9\\u03ba\\u03ac (\\u0397\\u03BD\\u03C9\\u03BC\\u03AD\\u03BD\\u03B5\\u03C2 \\u03A0\\u03BF\\u03BB\\u03B9\\u03C4\\u03B5\\u03AF\\u03B5\\u03C2)", "\\u0393\\u03b1\\u03bb\\u03bb\\u03b9\\u03ba\\u03ac (\\u0393\\u03b1\\u03bb\\u03bb\\u03af\\u03b1)", "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1)", "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)", - "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, Nynorsk)", + "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)", "", "" }, @@ -977,17 +977,18 @@ LocaleTest::TestAtypicalLocales() "Suecia", CharsToUnicodeString("Rep\\u00FAblica Dominicana"), CharsToUnicodeString("B\\u00E9lgica") }; - UnicodeString arabicDisplayNames [] = { "German (Canada)", - "Japanese (South Africa)", - "Russian (Mexico)", - "English (France)", - "Spanish (Germany)", - "Croatia", - "Sweden", - "Dominican Republic", - "Belgium" }; - - + // De-Anglicizing root required the change from + // English display names to ISO Codes - ram 2003/09/26 + UnicodeString arabicDisplayNames [] = { "de (CA)", + "ja (ZA)", + "ru (MX)", + "en (FR)", + "es (DE)", + "HR", + "SE", + "DO", + "BE" }; + int32_t i; UErrorCode status = U_ZERO_ERROR; Locale::setDefault(Locale::getUS(), status);