1.1 --- a/src/share/classes/sun/text/resources/FormatData_be.java Fri Jan 15 09:06:57 2010 -0800
1.2 +++ b/src/share/classes/sun/text/resources/FormatData_be.java Wed Jan 20 17:11:52 2010 -0800
1.3 @@ -63,7 +63,7 @@
1.4 "\u0436\u043d\u0456\u045e\u043d\u044f", // august
1.5 "\u0432\u0435\u0440\u0430\u0441\u043d\u044f", // september
1.6 "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430", // october
1.7 - "\u043b\u0438\u0441\u0442\u0430\u043f\u0430\u0434\u0430", // november
1.8 + "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430", // november
1.9 "\u0441\u043d\u0435\u0436\u043d\u044f", // december
1.10 "" // month 13 if applicable
1.11 }
1.12 @@ -80,7 +80,7 @@
1.13 "\u0436\u043d\u0432", // abb august
1.14 "\u0432\u0440\u0441", // abb september
1.15 "\u043a\u0441\u0442", // abb october
1.16 - "\u043b\u0441\u0442", // abb november
1.17 + "\u043b\u0456\u0441", // abb november
1.18 "\u0441\u043d\u0436", // abb december
1.19 "" // abb month 13 if applicable
1.20 }
2.1 --- a/src/share/classes/sun/text/resources/FormatData_de.java Fri Jan 15 09:06:57 2010 -0800
2.2 +++ b/src/share/classes/sun/text/resources/FormatData_de.java Wed Jan 20 17:11:52 2010 -0800
2.3 @@ -130,7 +130,7 @@
2.4 },
2.5 { "DateTimePatterns",
2.6 new String[] {
2.7 - "H.mm' Uhr 'z", // full time pattern
2.8 + "HH:mm' Uhr 'z", // full time pattern
2.9 "HH:mm:ss z", // long time pattern
2.10 "HH:mm:ss", // medium time pattern
2.11 "HH:mm", // short time pattern
3.1 --- a/src/share/classes/sun/text/resources/FormatData_et.java Fri Jan 15 09:06:57 2010 -0800
3.2 +++ b/src/share/classes/sun/text/resources/FormatData_et.java Wed Jan 20 17:11:52 2010 -0800
3.3 @@ -50,35 +50,35 @@
3.4 return new Object[][] {
3.5 { "MonthNames",
3.6 new String[] {
3.7 - "Jaanuar", // january
3.8 - "Veebruar", // february
3.9 - "M\u00e4rts", // march
3.10 - "Aprill", // april
3.11 - "Mai", // may
3.12 - "Juuni", // june
3.13 - "Juuli", // july
3.14 - "August", // august
3.15 - "September", // september
3.16 - "Oktoober", // october
3.17 - "November", // november
3.18 - "Detsember", // december
3.19 + "jaanuar", // january
3.20 + "veebruar", // february
3.21 + "m\u00e4rts", // march
3.22 + "aprill", // april
3.23 + "mai", // may
3.24 + "juuni", // june
3.25 + "juuli", // july
3.26 + "august", // august
3.27 + "september", // september
3.28 + "oktoober", // october
3.29 + "november", // november
3.30 + "detsember", // december
3.31 "" // month 13 if applicable
3.32 }
3.33 },
3.34 { "MonthAbbreviations",
3.35 new String[] {
3.36 - "Jaan", // abb january
3.37 - "Veebr", // abb february
3.38 - "M\u00e4rts", // abb march
3.39 - "Apr", // abb april
3.40 - "Mai", // abb may
3.41 - "Juuni", // abb june
3.42 - "Juuli", // abb july
3.43 - "Aug", // abb august
3.44 - "Sept", // abb september
3.45 - "Okt", // abb october
3.46 - "Nov", // abb november
3.47 - "Dets", // abb december
3.48 + "jaan", // abb january
3.49 + "veebr", // abb february
3.50 + "m\u00e4rts", // abb march
3.51 + "apr", // abb april
3.52 + "mai", // abb may
3.53 + "juuni", // abb june
3.54 + "juuli", // abb july
3.55 + "aug", // abb august
3.56 + "sept", // abb september
3.57 + "okt", // abb october
3.58 + "nov", // abb november
3.59 + "dets", // abb december
3.60 "" // abb month 13 if applicable
3.61 }
3.62 },
4.1 --- a/src/share/classes/sun/text/resources/FormatData_fi.java Fri Jan 15 09:06:57 2010 -0800
4.2 +++ b/src/share/classes/sun/text/resources/FormatData_fi.java Wed Jan 20 17:11:52 2010 -0800
4.3 @@ -133,6 +133,12 @@
4.4 }
4.5 },
4.6 { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
4.7 + { "AmPmMarkers",
4.8 + new String[] {
4.9 + "ap.", // am marker
4.10 + "ip." // pm marker
4.11 + }
4.12 + },
4.13 };
4.14 }
4.15 }
5.1 --- a/src/share/classes/sun/text/resources/FormatData_hr_HR.java Fri Jan 15 09:06:57 2010 -0800
5.2 +++ b/src/share/classes/sun/text/resources/FormatData_hr_HR.java Wed Jan 20 17:11:52 2010 -0800
5.3 @@ -55,6 +55,19 @@
5.4 "#,##0%" // percent pattern
5.5 }
5.6 },
5.7 + { "DateTimePatterns",
5.8 + new String[] {
5.9 + "HH:mm:ss z", // full time pattern
5.10 + "HH:mm:ss z", // long time pattern
5.11 + "HH:mm:ss", // medium time pattern
5.12 + "HH:mm", // short time pattern
5.13 + "yyyy. MMMM dd", // full date pattern
5.14 + "yyyy. MMMM dd", // long date pattern
5.15 + "dd.MM.yyyy.", // medium date pattern
5.16 + "dd.MM.yy.", // short date pattern
5.17 + "{1} {0}" // date-time pattern
5.18 + }
5.19 + }
5.20 };
5.21 }
5.22 }
6.1 --- a/src/share/classes/sun/text/resources/FormatData_hu_HU.java Fri Jan 15 09:06:57 2010 -0800
6.2 +++ b/src/share/classes/sun/text/resources/FormatData_hu_HU.java Wed Jan 20 17:11:52 2010 -0800
6.3 @@ -51,7 +51,7 @@
6.4 { "NumberPatterns",
6.5 new String[] {
6.6 "#,##0.###;-#,##0.###", // decimal pattern
6.7 - "\u00A4#,##0.##;-\u00A4#,##0.##", // currency pattern
6.8 + "#,##0.## \u00A4;-#,##0.## \u00A4", // currency pattern
6.9 "#,##0%" // percent pattern
6.10 }
6.11 },
7.1 --- a/src/share/classes/sun/text/resources/FormatData_lt.java Fri Jan 15 09:06:57 2010 -0800
7.2 +++ b/src/share/classes/sun/text/resources/FormatData_lt.java Wed Jan 20 17:11:52 2010 -0800
7.3 @@ -113,7 +113,7 @@
7.4 { "NumberElements",
7.5 new String[] {
7.6 ",", // decimal separator
7.7 - ".", // group (thousands) separator
7.8 + "\u00a0", // group (thousands) separator
7.9 ";", // list separator
7.10 "%", // percent sign
7.11 "0", // native 0 digit
7.12 @@ -133,7 +133,7 @@
7.13 "HH.mm", // short time pattern
7.14 "EEEE, yyyy, MMMM d", // full date pattern
7.15 "EEEE, yyyy, MMMM d", // long date pattern
7.16 - "yyyy.M.d", // medium date pattern
7.17 + "yyyy-MM-dd", // medium date pattern
7.18 "yy.M.d", // short date pattern
7.19 "{1} {0}" // date-time pattern
7.20 }
8.1 --- a/src/share/classes/sun/text/resources/FormatData_ro.java Fri Jan 15 09:06:57 2010 -0800
8.2 +++ b/src/share/classes/sun/text/resources/FormatData_ro.java Wed Jan 20 17:11:52 2010 -0800
8.3 @@ -90,7 +90,7 @@
8.4 "miercuri", // Wednesday
8.5 "joi", // Thursday
8.6 "vineri", // Friday
8.7 - "s\u00eemb\u0103t\u0103" // Saturday
8.8 + "s\u00e2mb\u0103t\u0103" // Saturday
8.9 }
8.10 },
8.11 { "DayAbbreviations",
9.1 --- a/src/share/classes/sun/text/resources/FormatData_uk.java Fri Jan 15 09:06:57 2010 -0800
9.2 +++ b/src/share/classes/sun/text/resources/FormatData_uk.java Wed Jan 20 17:11:52 2010 -0800
9.3 @@ -113,7 +113,7 @@
9.4 { "NumberElements",
9.5 new String[] {
9.6 ",", // decimal separator
9.7 - ".", // group (thousands) separator
9.8 + "\u00a0", // group (thousands) separator
9.9 ";", // list separator
9.10 "%", // percent sign
9.11 "0", // native 0 digit
10.1 --- a/src/share/classes/sun/util/resources/CalendarData_ro.properties Fri Jan 15 09:06:57 2010 -0800
10.2 +++ b/src/share/classes/sun/util/resources/CalendarData_ro.properties Wed Jan 20 17:11:52 2010 -0800
10.3 @@ -35,9 +35,5 @@
10.4 # This notice and attribution to Taligent may not be removed.
10.5 # Taligent is a registered trademark of Taligent, Inc.
10.6
10.7 -
10.8 -# This bundle is empty because the data of the base bundle
10.9 -# is adequate for this locale.
10.10 -# The bundle is necessary to prevent the resource
10.11 -# bundle lookup from falling back to the default
10.12 -# locale.
10.13 +firstDayOfWeek=2
10.14 +minimalDaysInFirstWeek=1
11.1 --- a/src/share/classes/sun/util/resources/CalendarData_sl.properties Fri Jan 15 09:06:57 2010 -0800
11.2 +++ b/src/share/classes/sun/util/resources/CalendarData_sl.properties Wed Jan 20 17:11:52 2010 -0800
11.3 @@ -36,8 +36,4 @@
11.4 # Taligent is a registered trademark of Taligent, Inc.
11.5
11.6
11.7 -# This bundle is empty because the data of the base bundle
11.8 -# is adequate for this locale.
11.9 -# The bundle is necessary to prevent the resource
11.10 -# bundle lookup from falling back to the default
11.11 -# locale.
11.12 +firstDayOfWeek=2
12.1 --- a/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties Fri Jan 15 09:06:57 2010 -0800
12.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties Wed Jan 20 17:11:52 2010 -0800
12.3 @@ -36,3 +36,4 @@
12.4 # Taligent is a registered trademark of Taligent, Inc.
12.5
12.6 CAD=$
12.7 +USD=US$
13.1 --- a/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties Fri Jan 15 09:06:57 2010 -0800
13.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties Wed Jan 20 17:11:52 2010 -0800
13.3 @@ -36,4 +36,4 @@
13.4 # Taligent is a registered trademark of Taligent, Inc.
13.5
13.6 TRL=TL
13.7 -TRY=YTL
13.8 +TRY=TL
14.1 --- a/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties Fri Jan 15 09:06:57 2010 -0800
14.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties Wed Jan 20 17:11:52 2010 -0800
14.3 @@ -35,4 +35,4 @@
14.4 # This notice and attribution to Taligent may not be removed.
14.5 # Taligent is a registered trademark of Taligent, Inc.
14.6
14.7 -UAH=\u0433\u0440\u0432.
14.8 +UAH=\u0433\u0440\u043b.
15.1 --- a/src/share/classes/sun/util/resources/LocaleNames_es.properties Fri Jan 15 09:06:57 2010 -0800
15.2 +++ b/src/share/classes/sun/util/resources/LocaleNames_es.properties Wed Jan 20 17:11:52 2010 -0800
15.3 @@ -38,7 +38,7 @@
15.4 # language names
15.5 # key is ISO 639 language code
15.6
15.7 -aa=afarense
15.8 +aa=afar
15.9 ab=abjasio
15.10 ae=av\u00e9stico
15.11 af=afrikaans
15.12 @@ -47,16 +47,16 @@
15.13 an=aragon\u00e9s
15.14 ar=\u00e1rabe
15.15 as=asam\u00e9s
15.16 -av=avaro
15.17 +av=avar
15.18 ay=aimara
15.19 -az=azerbaiyano
15.20 -ba=bashkiro
15.21 +az=azer\u00ed
15.22 +ba=bashkir
15.23 be=bielorruso
15.24 bg=b\u00falgaro
15.25 -bh=bihar\u00ed
15.26 +bh=bihari
15.27 bi=bislama
15.28 bm=bambara
15.29 -bn=bengal\u00e9s
15.30 +bn=bengal\u00ed
15.31 bo=tibetano
15.32 br=bret\u00f3n
15.33 bs=bosnio
15.34 @@ -66,37 +66,37 @@
15.35 co=corso
15.36 cr=cree
15.37 cs=checo
15.38 -cu=glagol\u00edtico
15.39 +cu=eslavo eclesi\u00e1stico
15.40 cv=chuvash
15.41 cy=gal\u00e9s
15.42 da=dan\u00e9s
15.43 de=alem\u00e1n
15.44 dv=divehi
15.45 -dz=butan\u00e9s
15.46 +dz=dzongkha
15.47 ee=ewe
15.48 el=griego
15.49 en=ingl\u00e9s
15.50 eo=esperanto
15.51 es=espa\u00f1ol
15.52 et=estonio
15.53 -eu=vascuence
15.54 -fa=farsi
15.55 -ff=fulb\u00e9
15.56 +eu=vasco
15.57 +fa=persa
15.58 +ff=fula
15.59 fi=fin\u00e9s
15.60 -fj=fijiano
15.61 -fo=faro\u00e9s
15.62 +fj=fidjiano
15.63 +fo=fero\u00e9s
15.64 fr=franc\u00e9s
15.65 -fy=frisio
15.66 +fy=fris\u00f3n
15.67 ga=irland\u00e9s
15.68 gd=ga\u00e9lico escoc\u00e9s
15.69 gl=gallego
15.70 gn=guaran\u00ed
15.71 -gu=gujarat\u00ed
15.72 -gv=manx
15.73 +gu=gujarati
15.74 +gv=ga\u00e9lico man\u00e9s
15.75 ha=hausa
15.76 he=hebreo
15.77 -hi=hind\u00fa
15.78 -ho=hiri Motu
15.79 +hi=hindi
15.80 +ho=hiri motu
15.81 hr=croata
15.82 ht=haitiano
15.83 hu=h\u00fangaro
15.84 @@ -104,10 +104,10 @@
15.85 hz=herero
15.86 ia=interlingua
15.87 id=indonesio
15.88 -ie=interlingua
15.89 -ig=ibo
15.90 -ii=yi de sichuan
15.91 -ik=inupiak
15.92 +ie=interlingue
15.93 +ig=igbo
15.94 +ii=sichuan yi
15.95 +ik=inupiaq
15.96 in=indonesio
15.97 io=ido
15.98 is=island\u00e9s
15.99 @@ -118,20 +118,20 @@
15.100 ji=y\u00eddish
15.101 jv=javan\u00e9s
15.102 ka=georgiano
15.103 -kg=kikongo
15.104 -ki=gikuyu
15.105 -kj=kwanyama
15.106 -kk=kazajio
15.107 +kg=kongo
15.108 +ki=kikuyu
15.109 +kj=kuanyama
15.110 +kk=kazajo
15.111 kl=groenland\u00e9s
15.112 -km=camboyano
15.113 -kn=kanada
15.114 +km=jemer
15.115 +kn=canar\u00e9s
15.116 ko=coreano
15.117 kr=kanuri
15.118 -ks=cachemir\u00ed
15.119 -ku=curdo
15.120 +ks=cachemiro
15.121 +ku=kurdo
15.122 kv=komi
15.123 kw=c\u00f3rnico
15.124 -ky=kirgu\u00eds
15.125 +ky=kirghiz
15.126 la=lat\u00edn
15.127 lb=luxemburgu\u00e9s
15.128 lg=ganda
15.129 @@ -139,7 +139,7 @@
15.130 ln=lingala
15.131 lo=laosiano
15.132 lt=lituano
15.133 -lu=tshiluba
15.134 +lu=luba-katanga
15.135 lv=let\u00f3n
15.136 mg=malgache
15.137 mh=marshal\u00e9s
15.138 @@ -148,82 +148,82 @@
15.139 ml=malayalam
15.140 mn=mongol
15.141 mo=moldavo
15.142 -mr=m\u00e1rata
15.143 +mr=marathi
15.144 ms=malayo
15.145 mt=malt\u00e9s
15.146 my=birmano
15.147 na=nauruano
15.148 -nb=noruego (bokm\u00e5l)
15.149 -nd=ndebele (norte)
15.150 +nb=bokmal noruego
15.151 +nd=ndebele septentrional
15.152 ne=nepal\u00ed
15.153 ng=ndonga
15.154 nl=neerland\u00e9s
15.155 -nn=noruego (nynorsk)
15.156 +nn=nynorsk noruego
15.157 no=noruego
15.158 -nr=ndebele (sur)
15.159 +nr=ndebele meridional
15.160 nv=navajo
15.161 ny=nyanja
15.162 oc=occitano
15.163 oj=ojibwa
15.164 om=oromo
15.165 or=oriya
15.166 -os=osetio
15.167 +os=os\u00e9tico
15.168 pa=punjab\u00ed
15.169 pi=pali
15.170 pl=polaco
15.171 ps=pashto
15.172 pt=portugu\u00e9s
15.173 qu=quechua
15.174 -rm=retorromano
15.175 -rn=rund\u00ed
15.176 +rm=retorrom\u00e1nico
15.177 +rn=kiroundi
15.178 ro=rumano
15.179 ru=ruso
15.180 -rw=ruand\u00e9s
15.181 +rw=kinyarwanda
15.182 sa=s\u00e1nscrito
15.183 sc=sardo
15.184 -sd=sindino
15.185 -se=sami del norte
15.186 +sd=sindhi
15.187 +se=sami septentrional
15.188 sg=sango
15.189 si=cingal\u00e9s
15.190 sk=eslovaco
15.191 -sl=eslovenio
15.192 +sl=esloveno
15.193 sm=samoano
15.194 -sn=son\u00e9s
15.195 +sn=shona
15.196 so=somal\u00ed
15.197 sq=alban\u00e9s
15.198 sr=serbio
15.199 -ss=suaziland\u00e9s
15.200 -st=sesot\u00e9s
15.201 -su=sudan\u00e9s
15.202 +ss=siswati
15.203 +st=sesotho
15.204 +su=sundan\u00e9s
15.205 sv=sueco
15.206 -sw=suajili
15.207 +sw=swahili
15.208 ta=tamil
15.209 te=telugu
15.210 -tg=tajik
15.211 +tg=tayiko
15.212 th=tailand\u00e9s
15.213 -ti=tigri\u00f1es
15.214 +ti=tigri\u00f1a
15.215 tk=turcomano
15.216 tl=tagalo
15.217 -tn=sechuan\u00e9s
15.218 -to=tongu\u00e9s
15.219 +tn=setchwana
15.220 +to=tongano
15.221 tr=turco
15.222 ts=tsonga
15.223 tt=t\u00e1rtaro
15.224 -tw=tui
15.225 -ty=taitiano
15.226 -ug=uighur
15.227 -uk=ucranio
15.228 +tw=twi
15.229 +ty=tahitiano
15.230 +ug=uigur
15.231 +uk=ucraniano
15.232 ur=urdu
15.233 -uz=uzbeco
15.234 +uz=uzbeko
15.235 ve=venda
15.236 vi=vietnamita
15.237 -vo=volapuk
15.238 +vo=volap\u00fck
15.239 wa=val\u00f3n
15.240 wo=uolof
15.241 xh=xhosa
15.242 yi=y\u00eddish
15.243 yo=yoruba
15.244 -za=chuang
15.245 +za=zhuang
15.246 zh=chino
15.247 zu=zul\u00fa
15.248
16.1 --- a/src/share/classes/sun/util/resources/LocaleNames_fi.properties Fri Jan 15 09:06:57 2010 -0800
16.2 +++ b/src/share/classes/sun/util/resources/LocaleNames_fi.properties Wed Jan 20 17:11:52 2010 -0800
16.3 @@ -49,7 +49,7 @@
16.4 en=englanti
16.5 es=espanja
16.6 fi=suomi
16.7 -fr=franska
16.8 +fr=ranska
16.9 he=heprea
16.10 iw=heprea
16.11 hi=hindi
16.12 @@ -80,7 +80,7 @@
16.13 DK=Tanska
16.14 ES=Espanja
16.15 FI=Suomi
16.16 -FR=Franska
16.17 +FR=Ranska
16.18 GB=Iso-Britannia
16.19 GR=Kreikka
16.20 IE=Irlanti
17.1 --- a/src/share/classes/sun/util/resources/LocaleNames_nl.properties Fri Jan 15 09:06:57 2010 -0800
17.2 +++ b/src/share/classes/sun/util/resources/LocaleNames_nl.properties Wed Jan 20 17:11:52 2010 -0800
17.3 @@ -34,14 +34,436 @@
17.4 # This notice and attribution to Taligent may not be removed.
17.5 # Taligent is a registered trademark of Taligent, Inc.
17.6
17.7 -
17.8 # language names
17.9 # key is ISO 639 language code
17.10
17.11 +aa=Afar
17.12 +ab=Abchazisch
17.13 +ae=Avestisch
17.14 +af=Afrikaans
17.15 +ak=Akan
17.16 +am=Amhaars
17.17 +an=Aragonees
17.18 +ar=Arabisch
17.19 +as=Assamees
17.20 +av=Avarisch
17.21 +ay=Aymara
17.22 +az=Azerbeidzjaans
17.23 +ba=Basjkiers
17.24 +be=Wit-Russisch
17.25 +bg=Bulgaars
17.26 +bh=Bihari
17.27 +bi=Bislama
17.28 +bm=Bambara
17.29 +bn=Bengalees
17.30 +bo=Tibetaans
17.31 +br=Bretons
17.32 +bs=Bosnisch
17.33 +ca=Catalaans
17.34 +ce=Chechen
17.35 +ch=Chamorro
17.36 +co=Corsicaans
17.37 +cr=Cree
17.38 +cs=Tsjechisch
17.39 +cu=Kerkslavisch
17.40 +cv=Tsjoevasjisch
17.41 +cy=Welsh
17.42 +da=Deens
17.43 +de=Duits
17.44 +dv=Divehi
17.45 +dz=Dzongkha
17.46 +ee=Ewe
17.47 +el=Grieks
17.48 +en=Engels
17.49 +eo=Esperanto
17.50 +es=Spaans
17.51 +et=Estlands
17.52 +eu=Baskisch
17.53 +fa=Perzisch
17.54 +ff=Fulah
17.55 +fi=Fins
17.56 +fj=Fijisch
17.57 +fo=Faer\u00f6ers
17.58 +fr=Frans
17.59 +fy=Fries
17.60 +ga=Iers
17.61 +gd=Schots Gaelic
17.62 +gl=Galicisch
17.63 +gn=Guarani
17.64 +gu=Gujarati
17.65 +gv=Manx
17.66 +ha=Hausa
17.67 +he=Hebreeuws
17.68 +hi=Hindi
17.69 +ho=Hiri Motu
17.70 +hr=Kroatisch
17.71 +ht=Ha\u00eftiaans
17.72 +hu=Hongaars
17.73 +hy=Armeens
17.74 +hz=Herero
17.75 +ia=Interlingua
17.76 +id=Indonesisch
17.77 +ie=Interlingue
17.78 +ig=Igbo
17.79 +ii=Sichuan Yi
17.80 +ik=Inupiaq
17.81 +io=Ido
17.82 +is=IJslands
17.83 +it=Italiaans
17.84 +iu=Inuktitut
17.85 +ja=Japans
17.86 +jv=Javaans
17.87 +ka=Georgisch
17.88 +kg=Kongo
17.89 +ki=Kikuyu
17.90 +kj=Kuanyama
17.91 +kk=Kazachs
17.92 +kl=Kalaallisut
17.93 +km=Khmer
17.94 +kn=Kannada
17.95 +ko=Koreaans
17.96 +kr=Kanuri
17.97 +ks=Kashmiri
17.98 +ku=Koerdisch
17.99 +kv=Komi
17.100 +kw=Cornish
17.101 +ky=Kirgizisch
17.102 +la=Latijn
17.103 +lb=Luxemburgs
17.104 +lg=Ganda
17.105 +li=Limburgs
17.106 +ln=Lingala
17.107 +lo=Lao
17.108 +lt=Litouws
17.109 +lu=Luba-Katanga
17.110 +lv=Letlands
17.111 +mg=Malagasisch
17.112 +mh=Marshallees
17.113 +mi=Maori
17.114 +mk=Macedonisch
17.115 +ml=Malayalam
17.116 +mn=Mongools
17.117 +mo=Moldavisch
17.118 +mr=Marathi
17.119 +ms=Maleis
17.120 +mt=Maltees
17.121 +my=Birmees
17.122 +na=Nauru
17.123 +nb=Noors - Bokm\u00e5l
17.124 +nd=Noord-Ndbele
17.125 +ne=Nepalees
17.126 +ng=Ndonga
17.127 nl=Nederlands
17.128 +nn=Noors - Nynorsk
17.129 +no=Noors
17.130 +nr=Zuid-Ndbele
17.131 +nv=Navajo
17.132 +ny=Nyanja
17.133 +oc=Occitaans
17.134 +oj=Ojibwa
17.135 +om=Oromo
17.136 +or=Oriya
17.137 +os=Ossetisch
17.138 +pa=Punjabi
17.139 +pi=Pali
17.140 +pl=Pools
17.141 +ps=Pasjtoe
17.142 +pt=Portugees
17.143 +qu=Quechua
17.144 +rm=Reto-Romaans
17.145 +rn=Rundi
17.146 +ro=Roemeens
17.147 +ru=Russisch
17.148 +rw=Kinyarwanda
17.149 +sa=Sanskriet
17.150 +sc=Sardinisch
17.151 +sd=Sindhi
17.152 +se=Noord-Samisch
17.153 +sg=Sango
17.154 +si=Singalees
17.155 +sk=Slowaaks
17.156 +sl=Sloveens
17.157 +sm=Samoaans
17.158 +sn=Shona
17.159 +so=Somalisch
17.160 +sq=Albanees
17.161 +sr=Servisch
17.162 +ss=Swati
17.163 +st=Zuid-Sotho
17.164 +su=Soendanees
17.165 +sv=Zweeds
17.166 +sw=Swahili
17.167 +ta=Tamil
17.168 +te=Teloegoe
17.169 +tg=Tadzjieks
17.170 +th=Thais
17.171 +ti=Tigrinya
17.172 +tk=Turkmeens
17.173 +tl=Tagalog
17.174 +tn=Tswana
17.175 +to=Tonga
17.176 +tr=Turks
17.177 +ts=Tsonga
17.178 +tt=Tataars
17.179 +tw=Twi
17.180 +ty=Tahitisch
17.181 +ug=Oeigoers
17.182 +uk=Oekra\u00efens
17.183 +ur=Urdu
17.184 +uz=Oezbeeks
17.185 +ve=Venda
17.186 +vi=Vietnamees
17.187 +vo=Volap\u00fck
17.188 +wa=Wallonisch
17.189 +wo=Wolof
17.190 +xh=Xhosa
17.191 +yi=Jiddisch
17.192 +yo=Yoruba
17.193 +za=Zhuang
17.194 +zh=Chinees
17.195 +zu=Zulu
17.196
17.197 # country names
17.198 # key is ISO 3166 country code
17.199
17.200 +AD=Andorra
17.201 +AE=Verenigde Arabische Emiraten
17.202 +AF=Afghanistan
17.203 +AG=Antigua en Barbuda
17.204 +AI=Anguilla
17.205 +AL=Albani\u00eb
17.206 +AM=Armeni\u00eb
17.207 +AN=Nederlandse Antillen
17.208 +AO=Angola
17.209 +AQ=Antarctica
17.210 +AR=Argentini\u00eb
17.211 +AS=Amerikaans Samoa
17.212 +AT=Oostenrijk
17.213 +AU=Australi\u00eb
17.214 +AW=Aruba
17.215 +AX=Alandeilanden
17.216 +AZ=Azerbeidzjan
17.217 +BA=Bosni\u00eb en Herzegovina
17.218 +BB=Barbados
17.219 +BD=Bangladesh
17.220 +BE=Belgi\u00eb
17.221 +BF=Burkina Faso
17.222 +BG=Bulgarije
17.223 +BH=Bahrein
17.224 +BI=Burundi
17.225 +BJ=Benin
17.226 +BM=Bermuda
17.227 +BN=Brunei
17.228 +BO=Bolivia
17.229 +BR=Brazili\u00eb
17.230 +BS=Bahama\u2019s
17.231 +BT=Bhutan
17.232 +BV=Bouveteiland
17.233 +BW=Botswana
17.234 +BY=Wit-Rusland
17.235 +BZ=Belize
17.236 +CA=Canada
17.237 +CC=Cocoseilanden
17.238 +CD=Congo-Kinshasa
17.239 +CF=Centraal-Afrikaanse Republiek
17.240 +CG=Congo
17.241 +CH=Zwitserland
17.242 +CI=Ivoorkust
17.243 +CK=Cookeilanden
17.244 +CL=Chili
17.245 +CM=Kameroen
17.246 +CN=China
17.247 +CO=Colombia
17.248 +CR=Costa Rica
17.249 +CS=Servi\u00eb en Montenegro
17.250 +CU=Cuba
17.251 +CV=Kaapverdi\u00eb
17.252 +CX=Christmaseiland
17.253 +CY=Cyprus
17.254 +CZ=Tsjechi\u00eb
17.255 +DE=Duitsland
17.256 +DJ=Djibouti
17.257 +DK=Denemarken
17.258 +DM=Dominica
17.259 +DO=Dominicaanse Republiek
17.260 +DZ=Algerije
17.261 +EC=Ecuador
17.262 +EE=Estland
17.263 +EG=Egypte
17.264 +EH=Westelijke Sahara
17.265 +ER=Eritrea
17.266 +ES=Spanje
17.267 +ET=Ethiopi\u00eb
17.268 +FI=Finland
17.269 +FJ=Fiji
17.270 +FK=Falklandeilanden
17.271 +FM=Micronesi\u00eb
17.272 +FO=Faer\u00f6er
17.273 +FR=Frankrijk
17.274 +GA=Gabon
17.275 +GB=Verenigd Koninkrijk
17.276 +GD=Grenada
17.277 +GE=Georgi\u00eb
17.278 +GF=Frans-Guyana
17.279 +GH=Ghana
17.280 +GI=Gibraltar
17.281 +GL=Groenland
17.282 +GM=Gambia
17.283 +GN=Guinee
17.284 +GP=Guadeloupe
17.285 +GQ=Equatoriaal-Guinea
17.286 +GR=Griekenland
17.287 +GS=Zuid-Georgi\u00eb en Zuidelijke Sandwicheilanden
17.288 +GT=Guatemala
17.289 +GU=Guam
17.290 +GW=Guinee-Bissau
17.291 +GY=Guyana
17.292 +HK=Hongkong SAR van China
17.293 +HM=Heard- en McDonaldeilanden
17.294 +HN=Honduras
17.295 +HR=Kroati\u00eb
17.296 +HT=Ha\u00efti
17.297 +HU=Hongarije
17.298 +ID=Indonesi\u00eb
17.299 +IE=Ierland
17.300 +IL=Isra\u00ebl
17.301 +IN=India
17.302 +IO=Britse Gebieden in de Indische Oceaan
17.303 +IQ=Irak
17.304 +IR=Iran
17.305 +IS=IJsland
17.306 +IT=Itali\u00eb
17.307 +JM=Jamaica
17.308 +JO=Jordani\u00eb
17.309 +JP=Japan
17.310 +KE=Kenia
17.311 +KG=Kirgizi\u00eb
17.312 +KH=Cambodja
17.313 +KI=Kiribati
17.314 +KM=Comoren
17.315 +KN=Saint Kitts en Nevis
17.316 +KP=Noord-Korea
17.317 +KR=Zuid-Korea
17.318 +KW=Koeweit
17.319 +KY=Caymaneilanden
17.320 +KZ=Kazachstan
17.321 +LA=Laos
17.322 +LB=Libanon
17.323 +LC=Saint Lucia
17.324 +LI=Liechtenstein
17.325 +LK=Sri Lanka
17.326 +LR=Liberia
17.327 +LS=Lesotho
17.328 +LT=Litouwen
17.329 +LU=Luxemburg
17.330 +LV=Letland
17.331 +LY=Libi\u00eb
17.332 +MA=Marokko
17.333 +MC=Monaco
17.334 +MD=Moldavi\u00eb
17.335 +ME=Montenegro
17.336 +MG=Madagaskar
17.337 +MH=Marshalleilanden
17.338 +MK=Macedoni\u00eb
17.339 +ML=Mali
17.340 +MM=Myanmar
17.341 +MN=Mongoli\u00eb
17.342 +MO=Macao SAR van China
17.343 +MP=Noordelijke Marianeneilanden
17.344 +MQ=Martinique
17.345 +MR=Mauritani\u00eb
17.346 +MS=Montserrat
17.347 +MT=Malta
17.348 +MU=Mauritius
17.349 +MV=Maldiven
17.350 +MW=Malawi
17.351 +MX=Mexico
17.352 +MY=Maleisi\u00eb
17.353 +MZ=Mozambique
17.354 +NA=Namibi\u00eb
17.355 +NC=Nieuw-Caledoni\u00eb
17.356 +NE=Niger
17.357 +NF=Norfolkeiland
17.358 +NG=Nigeria
17.359 +NI=Nicaragua
17.360 NL=Nederland
17.361 -BE=Belgi\u00eb
17.362 +NO=Noorwegen
17.363 +NP=Nepal
17.364 +NR=Nauru
17.365 +NU=Niue
17.366 +NZ=Nieuw-Zeeland
17.367 +OM=Oman
17.368 +PA=Panama
17.369 +PE=Peru
17.370 +PF=Frans-Polynesi\u00eb
17.371 +PG=Papoea-Nieuw-Guinea
17.372 +PH=Filipijnen
17.373 +PK=Pakistan
17.374 +PL=Polen
17.375 +PM=Saint Pierre en Miquelon
17.376 +PN=Pitcairn
17.377 +PR=Puerto Rico
17.378 +PS=Palestijns Gebied
17.379 +PT=Portugal
17.380 +PW=Palau
17.381 +PY=Paraguay
17.382 +QA=Qatar
17.383 +RE=R\u00e9union
17.384 +RO=Roemeni\u00eb
17.385 +RS=Servi\u00eb
17.386 +RU=Rusland
17.387 +RW=Rwanda
17.388 +SA=Saoedi-Arabi\u00eb
17.389 +SB=Salomonseilanden
17.390 +SC=Seychellen
17.391 +SD=Soedan
17.392 +SE=Zweden
17.393 +SG=Singapore
17.394 +SH=Sint-Helena
17.395 +SI=Sloveni\u00eb
17.396 +SJ=Svalbard en Jan Mayen
17.397 +SK=Slowakije
17.398 +SL=Sierra Leone
17.399 +SM=San Marino
17.400 +SN=Senegal
17.401 +SO=Somali\u00eb
17.402 +SR=Suriname
17.403 +ST=Sao Tom\u00e9 en Principe
17.404 +SV=El Salvador
17.405 +SY=Syri\u00eb
17.406 +SZ=Swaziland
17.407 +TC=Turks- en Caicoseilanden
17.408 +TD=Tsjaad
17.409 +TF=Franse Gebieden in de zuidelijke Indische Oceaan
17.410 +TG=Togo
17.411 +TH=Thailand
17.412 +TJ=Tadzjikistan
17.413 +TK=Tokelau
17.414 +TL=Oost-Timor
17.415 +TM=Turkmenistan
17.416 +TN=Tunesi\u00eb
17.417 +TO=Tonga
17.418 +TR=Turkije
17.419 +TT=Trinidad en Tobago
17.420 +TV=Tuvalu
17.421 +TW=Taiwan
17.422 +TZ=Tanzania
17.423 +UA=Oekra\u00efne
17.424 +UG=Oeganda
17.425 +UM=Amerikaanse kleinere afgelegen eilanden
17.426 +US=Verenigde Staten
17.427 +UY=Uruguay
17.428 +UZ=Oezbekistan
17.429 +VA=Vaticaanstad
17.430 +VC=Saint Vincent en de Grenadines
17.431 +VE=Venezuela
17.432 +VG=Britse Maagdeneilanden
17.433 +VI=Amerikaanse Maagdeneilanden
17.434 +VN=Vietnam
17.435 +VU=Vanuatu
17.436 +WF=Wallis en Futuna
17.437 +WS=Samoa
17.438 +YE=Jemen
17.439 +YT=Mayotte
17.440 +ZA=Zuid-Afrika
17.441 +ZM=Zambia
18.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_de.java Fri Jan 15 09:06:57 2010 -0800
18.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_de.java Wed Jan 20 17:11:52 2010 -0800
18.3 @@ -71,8 +71,8 @@
18.4 "Bhutanische Sommerzeit", "BTST"};
18.5 String CAT[] = new String[] {"Zentralafrikanische Zeit", "CAT",
18.6 "Zentralafrikanische Sommerzeit", "CAST"};
18.7 - String CET[] = new String[] {"Zentraleurop\u00e4ische Zeit", "CET",
18.8 - "Zentraleurop\u00e4ische Sommerzeit", "CEST"};
18.9 + String CET[] = new String[] {"Mitteleurop\u00e4ische Zeit", "MEZ",
18.10 + "Mitteleurop\u00e4ische Sommerzeit", "MESZ"};
18.11 String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST",
18.12 "Chatham Sommerzeit", "CHADT"};
18.13 String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT",
18.14 @@ -83,8 +83,8 @@
18.15 "Zentrale Sommerzeit", "CDT"};
18.16 String CTT[] = new String[] {"Chinesische Normalzeit", "CST",
18.17 "Chinesische Sommerzeit", "CDT"};
18.18 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
18.19 - "Cuba Daylight Time", "CDT"};
18.20 + String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
18.21 + "Kubanische Sommerzeit", "CDT"};
18.22 String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST",
18.23 "Zentrale Sommerzeit (Northern Territory)", "CST"};
18.24 String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
18.25 @@ -93,8 +93,8 @@
18.26 "Ostafrikanische Sommerzeit", "EAST"};
18.27 String EASTER[] = new String[] {"Osterinseln Zeit", "EAST",
18.28 "Osterinseln Sommerzeit", "EASST"};
18.29 - String EET[] = new String[] {"Osteurop\u00e4ische Zeit", "EET",
18.30 - "Osteurop\u00e4ische Sommerzeit", "EEST"};
18.31 + String EET[] = new String[] {"Osteurop\u00e4ische Zeit", "OEZ",
18.32 + "Osteurop\u00e4ische Sommerzeit", "OESZ"};
18.33 String EGT[] = new String[] {"Ostgr\u00f6nl\u00e4ndische Zeit", "EGT",
18.34 "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
18.35 String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
18.36 @@ -173,12 +173,12 @@
18.37 "Truk Sommerzeit", "TRUST"};
18.38 String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
18.39 "Ulaanbaatar Sommerzeit", "ULAST"};
18.40 - String WART[] = new String[] {"Argentinische Zeit", "WART",
18.41 - "Argentinische Sommerzeit", "WARST"};
18.42 + String WART[] = new String[] {"Westargentinische Zeit", "WART",
18.43 + "Westargentinische Sommerzeit", "WARST"};
18.44 String WAT[] = new String[] {"Westafrikanische Zeit", "WAT",
18.45 "Westafrikanische Sommerzeit", "WAST"};
18.46 - String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WET",
18.47 - "Westeurop\u00e4ische Sommerzeit", "WEST"};
18.48 + String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
18.49 + "Westeurop\u00e4ische Sommerzeit", "WESZ"};
18.50 String WIT[] = new String[] {"Westindonesische Zeit", "WIT",
18.51 "Westindonesische Sommerzeit", "WIST"};
18.52 String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
18.53 @@ -594,8 +594,8 @@
18.54 {"Australia/Canberra", EST_NSW},
18.55 {"Australia/Currie", EST_NSW},
18.56 {"Australia/Darwin", DARWIN},
18.57 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
18.58 - "Central Western Summer Time (Australia)", "CWST"}},
18.59 + {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST",
18.60 + "Zentral-Westliche Sommerzeit (Australien)", "CWST"}},
18.61 {"Australia/Hobart", TASMANIA},
18.62 {"Australia/LHI", LORD_HOWE},
18.63 {"Australia/Lindeman", BRISBANE},
19.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_es.java Fri Jan 15 09:06:57 2010 -0800
19.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_es.java Wed Jan 20 17:11:52 2010 -0800
19.3 @@ -83,8 +83,8 @@
19.4 "Hora de verano Central", "CDT"};
19.5 String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST",
19.6 "Hora de verano de China", "CDT"};
19.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
19.8 - "Cuba Daylight Time", "CDT"};
19.9 + String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
19.10 + "Hora de verano de Cuba", "CDT"};
19.11 String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST",
19.12 "Hora de verano Central (territorio del Norte)", "CST"};
19.13 String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
19.14 @@ -173,8 +173,8 @@
19.15 "Hora de verano de Truk", "TRUST"};
19.16 String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT",
19.17 "Hora de verano de Ulan Bator", "ULAST"};
19.18 - String WART[] = new String[] {"Hora de Argentina", "WART",
19.19 - "Hora de verano de Argentina", "WARST"};
19.20 + String WART[] = new String[] {"Hora de Argentina Occidental", "WART",
19.21 + "Hora de verano de Argentina Occidental", "WARST"};
19.22 String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT",
19.23 "Hora de verano de \u00c1frica Occidental", "WAST"};
19.24 String WET[] = new String[] {"Hora de Europa Occidental", "WET",
19.25 @@ -595,8 +595,8 @@
19.26 {"Australia/Canberra", EST_NSW},
19.27 {"Australia/Currie", EST_NSW},
19.28 {"Australia/Darwin", DARWIN},
19.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
19.30 - "Central Western Summer Time (Australia)", "CWST"}},
19.31 + {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST",
19.32 + "Hora de verano de Australia Central y Occidental", "CWST"}},
19.33 {"Australia/Hobart", TASMANIA},
19.34 {"Australia/LHI", LORD_HOWE},
19.35 {"Australia/Lindeman", BRISBANE},
20.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Fri Jan 15 09:06:57 2010 -0800
20.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Wed Jan 20 17:11:52 2010 -0800
20.3 @@ -83,8 +83,8 @@
20.4 "Heure avanc\u00e9e du Centre", "CDT"} ;
20.5 String CTT[] = new String[] {"Heure normale de Chine", "CST",
20.6 "Heure avanc\u00e9e de Chine", "CDT"} ;
20.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
20.8 - "Cuba Daylight Time", "CDT"};
20.9 + String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
20.10 + "Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
20.11 String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
20.12 "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
20.13 String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
20.14 @@ -173,8 +173,8 @@
20.15 "Heure d'\u00e9t\u00e9 de Truk", "TRUST"};
20.16 String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
20.17 "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ;
20.18 - String WART[] = new String[] {"Heure D'Argentine", "WART",
20.19 - "Heure d'\u00e9t\u00e9 D'Argentine", "WARST"} ;
20.20 + String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
20.21 + "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"} ;
20.22 String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
20.23 "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ;
20.24 String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
20.25 @@ -594,8 +594,8 @@
20.26 {"Australia/Canberra", EST_NSW},
20.27 {"Australia/Currie", EST_NSW},
20.28 {"Australia/Darwin", DARWIN},
20.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
20.30 - "Central Western Summer Time (Australia)", "CWST"}},
20.31 + {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
20.32 + "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}},
20.33 {"Australia/Hobart", TASMANIA},
20.34 {"Australia/LHI", LORD_HOWE},
20.35 {"Australia/Lindeman", BRISBANE},
21.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_it.java Fri Jan 15 09:06:57 2010 -0800
21.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_it.java Wed Jan 20 17:11:52 2010 -0800
21.3 @@ -83,8 +83,8 @@
21.4 "Ora legale USA centrale", "CDT"};
21.5 String CTT[] = new String[] {"Ora solare della Cina", "CST",
21.6 "Ora legale della Cina", "CDT"};
21.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
21.8 - "Cuba Daylight Time", "CDT"};
21.9 + String CUBA[] = new String[] {"Ora solare Cuba", "CST",
21.10 + "Ora legale Cuba", "CDT"};
21.11 String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST",
21.12 "Ora estiva centrale (Territori del Nord)", "CST"};
21.13 String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
21.14 @@ -173,8 +173,8 @@
21.15 "Ora estiva di Truk", "TRUST"};
21.16 String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT",
21.17 "Ora estiva di Ulaanbaatar", "ULAST"};
21.18 - String WART[] = new String[] {"Ora dell'Argentina", "WART",
21.19 - "Ora estiva dell'Argentina", "WARST"};
21.20 + String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART",
21.21 + "Ora estiva dell'Argentina occidentale", "WARST"};
21.22 String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT",
21.23 "Ora estiva dell'Africa occidentale", "WAST"};
21.24 String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
21.25 @@ -594,8 +594,8 @@
21.26 {"Australia/Canberra", EST_NSW},
21.27 {"Australia/Currie", EST_NSW},
21.28 {"Australia/Darwin", DARWIN},
21.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
21.30 - "Central Western Summer Time (Australia)", "CWST"}},
21.31 + {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST",
21.32 + "Ora estiva Australia centrorientale", "CWST"}},
21.33 {"Australia/Hobart", TASMANIA},
21.34 {"Australia/LHI", LORD_HOWE},
21.35 {"Australia/Lindeman", BRISBANE},
22.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Fri Jan 15 09:06:57 2010 -0800
22.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Wed Jan 20 17:11:52 2010 -0800
22.3 @@ -83,8 +83,8 @@
22.4 "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"};
22.5 String CTT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "CST",
22.6 "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"};
22.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
22.8 - "Cuba Daylight Time", "CDT"};
22.9 + String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
22.10 + "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
22.11 String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST",
22.12 "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"};
22.13 String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
22.14 @@ -173,8 +173,8 @@
22.15 "\u30c8\u30e9\u30c3\u30af\u590f\u6642\u9593", "TRUST"};
22.16 String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
22.17 "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST"};
22.18 - String WART[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
22.19 - "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"};
22.20 + String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
22.21 + "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"};
22.22 String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT",
22.23 "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
22.24 String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
22.25 @@ -594,8 +594,8 @@
22.26 {"Australia/Canberra", EST_NSW},
22.27 {"Australia/Currie", EST_NSW},
22.28 {"Australia/Darwin", DARWIN},
22.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
22.30 - "Central Western Summer Time (Australia)", "CWST"}},
22.31 + {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST",
22.32 + "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}},
22.33 {"Australia/Hobart", TASMANIA},
22.34 {"Australia/LHI", LORD_HOWE},
22.35 {"Australia/Lindeman", BRISBANE},
23.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Fri Jan 15 09:06:57 2010 -0800
23.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Wed Jan 20 17:11:52 2010 -0800
23.3 @@ -83,8 +83,8 @@
23.4 "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
23.5 String CTT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "CST",
23.6 "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
23.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
23.8 - "Cuba Daylight Time", "CDT"};
23.9 + String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
23.10 + "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
23.11 String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST",
23.12 "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"};
23.13 String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
23.14 @@ -173,8 +173,8 @@
23.15 "\ud2b8\ub8e8\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TRUST"};
23.16 String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
23.17 "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"};
23.18 - String WART[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
23.19 - "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"};
23.20 + String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
23.21 + "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"};
23.22 String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT",
23.23 "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
23.24 String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
23.25 @@ -594,8 +594,8 @@
23.26 {"Australia/Canberra", EST_NSW},
23.27 {"Australia/Currie", EST_NSW},
23.28 {"Australia/Darwin", DARWIN},
23.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
23.30 - "Central Western Summer Time (Australia)", "CWST"}},
23.31 + {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST",
23.32 + "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}},
23.33 {"Australia/Hobart", TASMANIA},
23.34 {"Australia/LHI", LORD_HOWE},
23.35 {"Australia/Lindeman", BRISBANE},
24.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Fri Jan 15 09:06:57 2010 -0800
24.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Wed Jan 20 17:11:52 2010 -0800
24.3 @@ -45,8 +45,8 @@
24.4 protected final Object[][] getContents() {
24.5 String ACT[] = new String[] {"Acre, normaltid", "ACT",
24.6 "Acre, sommartid", "ACST"};
24.7 - String ADELAIDE[] = new String[] {"Central Standard Time (S\u00f6dra Australien)", "CST",
24.8 - "Central Summer Time (S\u00f6dra Australien)", "CST"};
24.9 + String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST",
24.10 + "Central sommartid (S\u00f6dra Australien)", "CST"};
24.11 String AGT[] = new String[] {"Argentina, normaltid", "ART",
24.12 "Argentina, sommartid", "ARST"};
24.13 String AKST[] = new String[] {"Alaska, normaltid", "AKST",
24.14 @@ -61,10 +61,10 @@
24.15 "Atlantisk sommartid", "ADT"};
24.16 String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
24.17 "Bangladesh, sommartid", "BDST"};
24.18 - String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST",
24.19 - "Eastern Summer Time (Queensland)", "EST"};
24.20 - String BROKEN_HILL[] = new String[] {"Central Standard Time (S\u00f6dra Australien/Nya Sydwales)", "CST",
24.21 - "Central Summer Time (S\u00f6dra Australien/Nya Sydwales)", "CST"};
24.22 + String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST",
24.23 + "\u00d6stlig sommartid (Queensland)", "EST"};
24.24 + String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST",
24.25 + "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"};
24.26 String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
24.27 "Brasilien, sommartid", "BRST"};
24.28 String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
24.29 @@ -83,10 +83,10 @@
24.30 "Central sommartid", "CDT"};
24.31 String CTT[] = new String[] {"Kina, normaltid", "CST",
24.32 "Kina, sommartid", "CDT"};
24.33 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
24.34 - "Cuba Daylight Time", "CDT"};
24.35 - String DARWIN[] = new String[] {"Central Standard Time (Nordterritoriet)", "CST",
24.36 - "Central Summer Time (Nordterritoriet)", "CST"};
24.37 + String CUBA[] = new String[] {"Kuba, normaltid", "CST",
24.38 + "Kuba, sommartid", "CDT"};
24.39 + String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST",
24.40 + "Central sommartid (Nordterritoriet)", "CST"};
24.41 String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
24.42 "Irland, sommartid", "IST"};
24.43 String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT",
24.44 @@ -99,8 +99,8 @@
24.45 "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"};
24.46 String EST[] = new String[] {"Eastern, normaltid", "EST",
24.47 "Eastern, sommartid", "EDT"};
24.48 - String EST_NSW[] = new String[] {"Eastern Standard Time (Nya Sydwales)", "EST",
24.49 - "Eastern Summer Time (Nya Sydwales)", "EST"};
24.50 + String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST",
24.51 + "Eastern, sommartid (Nya Sydwales)", "EST"};
24.52 String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
24.53 "Ghana, sommartid", "GHST"};
24.54 String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
24.55 @@ -163,34 +163,34 @@
24.56 "Salomon\u00f6arna, sommartid", "SBST"};
24.57 String SGT[] = new String[] {"Singapore, normaltid", "SGT",
24.58 "Singapore, sommartid", "SGST"};
24.59 - String SLST[] = new String[] {"Greenwich Mean Time", "GMT",
24.60 + String SLST[] = new String[] {"Greenwichtid", "GMT",
24.61 "Sierra Leone, sommartid", "SLST"};
24.62 - String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmanien)", "EST",
24.63 - "Eastern Summer Time (Tasmanien)", "EST"};
24.64 + String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST",
24.65 + "Eastern, sommartid (Tasmanien)", "EST"};
24.66 String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
24.67 "Turkmenistan, sommartid", "TMST"};
24.68 String TRUT[] = new String[] {"Truk, normaltid", "TRUT",
24.69 "Truk, sommartid", "TRUST"};
24.70 String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
24.71 "Ulaanbaatar, sommartid", "ULAST"};
24.72 - String WART[] = new String[] {"Argentina, normaltid", "WART",
24.73 - "Argentina, sommartid", "WARST"};
24.74 + String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
24.75 + "V\u00e4stargentina, sommartid", "WARST"};
24.76 String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT",
24.77 "V\u00e4stafrikansk sommartid", "WAST"};
24.78 String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
24.79 "V\u00e4steuropeisk sommartid", "WEST"};
24.80 String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT",
24.81 "V\u00e4stindonesisk sommartid", "WIST"};
24.82 - String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
24.83 - "Western Summer Time (Australien)", "WST"};
24.84 + String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST",
24.85 + "V\u00e4stlig sommartid (Australien)", "WST"};
24.86 String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
24.87 "Samoa, sommartid", "SDT"};
24.88 String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
24.89 "V\u00e4stsamoansk sommartid", "WSST"};
24.90 String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
24.91 "Chamorro, sommartid", "ChDT"};
24.92 - String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST",
24.93 - "Eastern Summer Time (Victoria)", "EST"};
24.94 + String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST",
24.95 + "\u00d6stlig sommartid (Victoria)", "EST"};
24.96 String UTC[] = new String[] {"Koordinerad universell tid", "UTC",
24.97 "Koordinerad universell tid", "UTC"};
24.98 String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
24.99 @@ -594,8 +594,8 @@
24.100 {"Australia/Canberra", EST_NSW},
24.101 {"Australia/Currie", EST_NSW},
24.102 {"Australia/Darwin", DARWIN},
24.103 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
24.104 - "Central Western Summer Time (Australia)", "CWST"}},
24.105 + {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST",
24.106 + "Central v\u00e4stlig sommartid (Australien)", "CWST"}},
24.107 {"Australia/Hobart", TASMANIA},
24.108 {"Australia/LHI", LORD_HOWE},
24.109 {"Australia/Lindeman", BRISBANE},
25.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Fri Jan 15 09:06:57 2010 -0800
25.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Wed Jan 20 17:11:52 2010 -0800
25.3 @@ -83,8 +83,8 @@
25.4 "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"};
25.5 String CTT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "CST",
25.6 "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"};
25.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
25.8 - "Cuba Daylight Time", "CDT"};
25.9 + String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
25.10 + "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
25.11 String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST",
25.12 "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"};
25.13 String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
25.14 @@ -173,8 +173,8 @@
25.15 "\u7279\u9c81\u514b\u590f\u4ee4\u65f6", "TRUST"};
25.16 String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
25.17 "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"};
25.18 - String WART[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
25.19 - "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"};
25.20 + String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
25.21 + "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"};
25.22 String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT",
25.23 "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
25.24 String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
25.25 @@ -594,8 +594,8 @@
25.26 {"Australia/Canberra", EST_NSW},
25.27 {"Australia/Currie", EST_NSW},
25.28 {"Australia/Darwin", DARWIN},
25.29 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
25.30 - "Central Western Summer Time (Australia)", "CWST"}},
25.31 + {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST",
25.32 + "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}},
25.33 {"Australia/Hobart", TASMANIA},
25.34 {"Australia/LHI", LORD_HOWE},
25.35 {"Australia/Lindeman", BRISBANE},
26.1 --- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Fri Jan 15 09:06:57 2010 -0800
26.2 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Wed Jan 20 17:11:52 2010 -0800
26.3 @@ -83,8 +83,8 @@
26.4 "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
26.5 String CTT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "CST",
26.6 "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
26.7 - String CUBA[] = new String[] {"Cuba Standard Time", "CST",
26.8 - "Cuba Daylight Time", "CDT"};
26.9 + String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
26.10 + "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
26.11 String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST",
26.12 "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"};
26.13 String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
26.14 @@ -173,8 +173,8 @@
26.15 "\u7279\u9b6f\u514b\u590f\u4ee4\u6642\u9593", "TRUST"};
26.16 String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
26.17 "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"};
26.18 - String WART[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "WART",
26.19 - "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"};
26.20 + String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
26.21 + "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"};
26.22 String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT",
26.23 "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
26.24 String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
26.25 @@ -551,7 +551,8 @@
26.26 {"Asia/Samarkand", UZT},
26.27 {"Asia/Seoul", KST},
26.28 {"Asia/Singapore", SGT},
26.29 - {"Asia/Taipei", CTT},
26.30 + {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST",
26.31 + "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT"}},
26.32 {"Asia/Tel_Aviv", ISRAEL},
26.33 {"Asia/Tashkent", UZT},
26.34 {"Asia/Tbilisi", new String[] {"\u55ac\u6cbb\u4e9e\u6642\u9593", "GET",
26.35 @@ -594,8 +595,8 @@
26.36 {"Australia/Canberra", EST_NSW},
26.37 {"Australia/Currie", EST_NSW},
26.38 {"Australia/Darwin", DARWIN},
26.39 - {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
26.40 - "Central Western Summer Time (Australia)", "CWST"}},
26.41 + {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST",
26.42 + "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}},
26.43 {"Australia/Hobart", TASMANIA},
26.44 {"Australia/LHI", LORD_HOWE},
26.45 {"Australia/Lindeman", BRISBANE},
27.1 --- a/src/share/native/java/util/zip/zlib-1.2.3/zutil.h Fri Jan 15 09:06:57 2010 -0800
27.2 +++ b/src/share/native/java/util/zip/zlib-1.2.3/zutil.h Wed Jan 20 17:11:52 2010 -0800
27.3 @@ -220,7 +220,8 @@
27.4 # endif
27.5 # ifdef WIN32
27.6 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
27.7 -# if !defined(vsnprintf) && !defined(NO_vsnprintf)
27.8 +# if !defined(vsnprintf) && !defined(NO_vsnprintf) && (!defined(_MSC_VER) || (_MSC_VER < 1500))
27.9 + /* Only needed before Visual Studio 2008 */
27.10 # define vsnprintf _vsnprintf
27.11 # endif
27.12 # endif
28.1 --- a/test/sun/text/resources/LocaleData Fri Jan 15 09:06:57 2010 -0800
28.2 +++ b/test/sun/text/resources/LocaleData Wed Jan 20 17:11:52 2010 -0800
28.3 @@ -673,8 +673,8 @@
28.4 FormatData/es_VE/NumberElements/1=.
28.5 FormatData/es_VE/NumberElements/2=;
28.6
28.7 -# bug #4099810, 4290801
28.8 -CurrencyNames/uk_UA/UAH=\u0433\u0440\u0432.
28.9 +# bug #4099810, 4290801, 6868106
28.10 +CurrencyNames/uk_UA/UAH=\u0433\u0440\u043b.
28.11 FormatData/uk_UA/NumberPatterns/0=#,##0.###;-#,##0.###
28.12 # FormatData/uk_UA/NumberPatterns/1=#,##0.## '\u0433\u0440\u0432.';-#,##0.## '\u0433\u0440\u0432.' # Changed; see bug 4122840
28.13 FormatData/uk_UA/NumberPatterns/2=#,##0%
28.14 @@ -5526,3 +5526,575 @@
28.15 # BL, MF (6627549)
28.16 LocaleNames//BL=Saint Barth\u00e9lemy
28.17 LocaleNames//MF=Saint Martin
28.18 +
28.19 +# bug 6609737
28.20 +FormatData/de/DateTimePatterns/0=HH:mm' Uhr 'z
28.21 +TimeZoneNames/de/CET/1=Mitteleurop\u00e4ische Zeit
28.22 +TimeZoneNames/de/CET/2=MEZ
28.23 +TimeZoneNames/de/CET/3=Mitteleurop\u00e4ische Sommerzeit
28.24 +TimeZoneNames/de/CET/4=MESZ
28.25 +TimeZoneNames/de/EET/2=OEZ
28.26 +TimeZoneNames/de/EET/4=OESZ
28.27 +TimeZoneNames/de/WET/2=WEZ
28.28 +TimeZoneNames/de/WET/4=WESZ
28.29 +
28.30 +# bug 6610748
28.31 +FormatData/fi/AmPmMarkers/0=ap.
28.32 +FormatData/fi/AmPmMarkers/1=ip.
28.33 +
28.34 +# bug 6507067
28.35 +TimeZoneNames/zh_TW/Asia\/Taipei/1=\u53f0\u7063\u6a19\u6e96\u6642\u9593
28.36 +TimeZoneNames/zh_TW/Asia\/Taipei/2=TST
28.37 +
28.38 +# bug 6645271
28.39 +FormatData/hr_HR/DateTimePatterns/6=dd.MM.yyyy.
28.40 +FormatData/hr_HR/DateTimePatterns/7=dd.MM.yy.
28.41 +
28.42 +# bug 6873931
28.43 +CurrencyNames/tr_TR/TRY=TL
28.44 +
28.45 +#bug 6450945
28.46 +CalendarData/ro/firstDayOfWeek=2
28.47 +CalendarData/ro/minimalDaysInFirstWeek=1
28.48 +FormatData/ro/DayNames/6=s\u00e2mb\u0103t\u0103
28.49 +
28.50 +#bug 6645268
28.51 +LocaleNames/fi/fr=ranska
28.52 +LocaleNames/fi/FR=Ranska
28.53 +LocaleNames/fi_FI/fr=ranska
28.54 +LocaleNames/fi_FI/FR=Ranska
28.55 +
28.56 +# bug 6646611, 6914413
28.57 +FormatData/be_BY/MonthNames/10=\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430
28.58 +FormatData/be_BY/MonthAbbreviations/10=\u043b\u0456\u0441
28.59 +
28.60 +# bug 6645405
28.61 +FormatData/hu_HU/NumberPatterns/1=#,##0.## \u00A4;-#,##0.## \u00A4
28.62 +
28.63 +# bug 6650730
28.64 +FormatData/lt/NumberElements/1=\u00a0
28.65 +FormatData/lt/DateTimePatterns/6=yyyy-MM-dd
28.66 +
28.67 +#bug 6910489
28.68 +CalendarData/sl/firstDayOfWeek=2
28.69 +
28.70 +# bug 6573250
28.71 +CurrencyNames/en_CA/USD=US$
28.72 +
28.73 +# bug 6870908
28.74 +FormatData/et/MonthNames/0=jaanuar
28.75 +FormatData/et/MonthNames/1=veebruar
28.76 +FormatData/et/MonthNames/2=m\u00e4rts
28.77 +FormatData/et/MonthNames/3=aprill
28.78 +FormatData/et/MonthNames/4=mai
28.79 +FormatData/et/MonthNames/5=juuni
28.80 +FormatData/et/MonthNames/6=juuli
28.81 +FormatData/et/MonthNames/7=august
28.82 +FormatData/et/MonthNames/8=september
28.83 +FormatData/et/MonthNames/9=oktoober
28.84 +FormatData/et/MonthNames/10=november
28.85 +FormatData/et/MonthNames/11=detsember
28.86 +FormatData/et/MonthAbbreviations/0=jaan
28.87 +FormatData/et/MonthAbbreviations/1=veebr
28.88 +FormatData/et/MonthAbbreviations/2=m\u00e4rts
28.89 +FormatData/et/MonthAbbreviations/3=apr
28.90 +FormatData/et/MonthAbbreviations/4=mai
28.91 +FormatData/et/MonthAbbreviations/5=juuni
28.92 +FormatData/et/MonthAbbreviations/6=juuli
28.93 +FormatData/et/MonthAbbreviations/7=aug
28.94 +FormatData/et/MonthAbbreviations/8=sept
28.95 +FormatData/et/MonthAbbreviations/9=okt
28.96 +FormatData/et/MonthAbbreviations/10=nov
28.97 +FormatData/et/MonthAbbreviations/11=dets
28.98 +
28.99 +# bug 6585666
28.100 +LocaleNames/es/aa=afar
28.101 +LocaleNames/es/av=avar
28.102 +LocaleNames/es/az=azer\u00ed
28.103 +LocaleNames/es/ba=bashkir
28.104 +LocaleNames/es/bh=bihari
28.105 +LocaleNames/es/bn=bengal\u00ed
28.106 +LocaleNames/es/cu=eslavo eclesi\u00e1stico
28.107 +LocaleNames/es/dz=dzongkha
28.108 +LocaleNames/es/eu=vasco
28.109 +LocaleNames/es/fa=persa
28.110 +LocaleNames/es/ff=fula
28.111 +LocaleNames/es/fj=fidjiano
28.112 +LocaleNames/es/fo=fero\u00e9s
28.113 +LocaleNames/es/fy=fris\u00f3n
28.114 +LocaleNames/es/gu=gujarati
28.115 +LocaleNames/es/gv=ga\u00e9lico man\u00e9s
28.116 +LocaleNames/es/hi=hindi
28.117 +LocaleNames/es/ho=hiri motu
28.118 +LocaleNames/es/ie=interlingue
28.119 +LocaleNames/es/ig=igbo
28.120 +LocaleNames/es/ii=sichuan yi
28.121 +LocaleNames/es/ik=inupiaq
28.122 +LocaleNames/es/kg=kongo
28.123 +LocaleNames/es/ki=kikuyu
28.124 +LocaleNames/es/kj=kuanyama
28.125 +LocaleNames/es/kk=kazajo
28.126 +LocaleNames/es/km=jemer
28.127 +LocaleNames/es/kn=canar\u00e9s
28.128 +LocaleNames/es/ks=cachemiro
28.129 +LocaleNames/es/ku=kurdo
28.130 +LocaleNames/es/ky=kirghiz
28.131 +LocaleNames/es/lu=luba-katanga
28.132 +LocaleNames/es/mr=marathi
28.133 +LocaleNames/es/nb=bokmal noruego
28.134 +LocaleNames/es/nd=ndebele septentrional
28.135 +LocaleNames/es/nn=nynorsk noruego
28.136 +LocaleNames/es/nr=ndebele meridional
28.137 +LocaleNames/es/os=os\u00e9tico
28.138 +LocaleNames/es/rm=retorrom\u00e1nico
28.139 +LocaleNames/es/rn=kiroundi
28.140 +LocaleNames/es/rw=kinyarwanda
28.141 +LocaleNames/es/sd=sindhi
28.142 +LocaleNames/es/se=sami septentrional
28.143 +LocaleNames/es/sl=esloveno
28.144 +LocaleNames/es/sn=shona
28.145 +LocaleNames/es/ss=siswati
28.146 +LocaleNames/es/st=sesotho
28.147 +LocaleNames/es/su=sundan\u00e9s
28.148 +LocaleNames/es/sw=swahili
28.149 +LocaleNames/es/tg=tayiko
28.150 +LocaleNames/es/ti=tigri\u00f1a
28.151 +LocaleNames/es/tn=setchwana
28.152 +LocaleNames/es/to=tongano
28.153 +LocaleNames/es/tw=twi
28.154 +LocaleNames/es/ty=tahitiano
28.155 +LocaleNames/es/ug=uigur
28.156 +LocaleNames/es/uk=ucraniano
28.157 +LocaleNames/es/uz=uzbeko
28.158 +LocaleNames/es/vo=volap\u00fck
28.159 +LocaleNames/es/za=zhuang
28.160 +
28.161 +# bug 6716626 - language
28.162 +LocaleNames/nl/aa=Afar
28.163 +LocaleNames/nl/ab=Abchazisch
28.164 +LocaleNames/nl/ae=Avestisch
28.165 +LocaleNames/nl/af=Afrikaans
28.166 +LocaleNames/nl/ak=Akan
28.167 +LocaleNames/nl/am=Amhaars
28.168 +LocaleNames/nl/an=Aragonees
28.169 +LocaleNames/nl/ar=Arabisch
28.170 +LocaleNames/nl/as=Assamees
28.171 +LocaleNames/nl/av=Avarisch
28.172 +LocaleNames/nl/ay=Aymara
28.173 +LocaleNames/nl/az=Azerbeidzjaans
28.174 +LocaleNames/nl/ba=Basjkiers
28.175 +LocaleNames/nl/be=Wit-Russisch
28.176 +LocaleNames/nl/bg=Bulgaars
28.177 +LocaleNames/nl/bh=Bihari
28.178 +LocaleNames/nl/bi=Bislama
28.179 +LocaleNames/nl/bm=Bambara
28.180 +LocaleNames/nl/bn=Bengalees
28.181 +LocaleNames/nl/bo=Tibetaans
28.182 +LocaleNames/nl/br=Bretons
28.183 +LocaleNames/nl/bs=Bosnisch
28.184 +LocaleNames/nl/ca=Catalaans
28.185 +LocaleNames/nl/ce=Chechen
28.186 +LocaleNames/nl/ch=Chamorro
28.187 +LocaleNames/nl/co=Corsicaans
28.188 +LocaleNames/nl/cr=Cree
28.189 +LocaleNames/nl/cs=Tsjechisch
28.190 +LocaleNames/nl/cu=Kerkslavisch
28.191 +LocaleNames/nl/cv=Tsjoevasjisch
28.192 +LocaleNames/nl/cy=Welsh
28.193 +LocaleNames/nl/da=Deens
28.194 +LocaleNames/nl/de=Duits
28.195 +LocaleNames/nl/dv=Divehi
28.196 +LocaleNames/nl/dz=Dzongkha
28.197 +LocaleNames/nl/ee=Ewe
28.198 +LocaleNames/nl/el=Grieks
28.199 +LocaleNames/nl/en=Engels
28.200 +LocaleNames/nl/eo=Esperanto
28.201 +LocaleNames/nl/es=Spaans
28.202 +LocaleNames/nl/et=Estlands
28.203 +LocaleNames/nl/eu=Baskisch
28.204 +LocaleNames/nl/fa=Perzisch
28.205 +LocaleNames/nl/ff=Fulah
28.206 +LocaleNames/nl/fi=Fins
28.207 +LocaleNames/nl/fj=Fijisch
28.208 +LocaleNames/nl/fo=Faer\u00f6ers
28.209 +LocaleNames/nl/fr=Frans
28.210 +LocaleNames/nl/fy=Fries
28.211 +LocaleNames/nl/ga=Iers
28.212 +LocaleNames/nl/gd=Schots Gaelic
28.213 +LocaleNames/nl/gl=Galicisch
28.214 +LocaleNames/nl/gn=Guarani
28.215 +LocaleNames/nl/gu=Gujarati
28.216 +LocaleNames/nl/gv=Manx
28.217 +LocaleNames/nl/ha=Hausa
28.218 +LocaleNames/nl/he=Hebreeuws
28.219 +LocaleNames/nl/hi=Hindi
28.220 +LocaleNames/nl/ho=Hiri Motu
28.221 +LocaleNames/nl/hr=Kroatisch
28.222 +LocaleNames/nl/ht=Ha\u00eftiaans
28.223 +LocaleNames/nl/hu=Hongaars
28.224 +LocaleNames/nl/hy=Armeens
28.225 +LocaleNames/nl/hz=Herero
28.226 +LocaleNames/nl/ia=Interlingua
28.227 +LocaleNames/nl/id=Indonesisch
28.228 +LocaleNames/nl/ie=Interlingue
28.229 +LocaleNames/nl/ig=Igbo
28.230 +LocaleNames/nl/ii=Sichuan Yi
28.231 +LocaleNames/nl/ik=Inupiaq
28.232 +LocaleNames/nl/io=Ido
28.233 +LocaleNames/nl/is=IJslands
28.234 +LocaleNames/nl/it=Italiaans
28.235 +LocaleNames/nl/iu=Inuktitut
28.236 +LocaleNames/nl/ja=Japans
28.237 +LocaleNames/nl/jv=Javaans
28.238 +LocaleNames/nl/ka=Georgisch
28.239 +LocaleNames/nl/kg=Kongo
28.240 +LocaleNames/nl/ki=Kikuyu
28.241 +LocaleNames/nl/kj=Kuanyama
28.242 +LocaleNames/nl/kk=Kazachs
28.243 +LocaleNames/nl/kl=Kalaallisut
28.244 +LocaleNames/nl/km=Khmer
28.245 +LocaleNames/nl/kn=Kannada
28.246 +LocaleNames/nl/ko=Koreaans
28.247 +LocaleNames/nl/kr=Kanuri
28.248 +LocaleNames/nl/ks=Kashmiri
28.249 +LocaleNames/nl/ku=Koerdisch
28.250 +LocaleNames/nl/kv=Komi
28.251 +LocaleNames/nl/kw=Cornish
28.252 +LocaleNames/nl/ky=Kirgizisch
28.253 +LocaleNames/nl/la=Latijn
28.254 +LocaleNames/nl/lb=Luxemburgs
28.255 +LocaleNames/nl/lg=Ganda
28.256 +LocaleNames/nl/li=Limburgs
28.257 +LocaleNames/nl/ln=Lingala
28.258 +LocaleNames/nl/lo=Lao
28.259 +LocaleNames/nl/lt=Litouws
28.260 +LocaleNames/nl/lu=Luba-Katanga
28.261 +LocaleNames/nl/lv=Letlands
28.262 +LocaleNames/nl/mg=Malagasisch
28.263 +LocaleNames/nl/mh=Marshallees
28.264 +LocaleNames/nl/mi=Maori
28.265 +LocaleNames/nl/mk=Macedonisch
28.266 +LocaleNames/nl/ml=Malayalam
28.267 +LocaleNames/nl/mn=Mongools
28.268 +LocaleNames/nl/mo=Moldavisch
28.269 +LocaleNames/nl/mr=Marathi
28.270 +LocaleNames/nl/ms=Maleis
28.271 +LocaleNames/nl/mt=Maltees
28.272 +LocaleNames/nl/my=Birmees
28.273 +LocaleNames/nl/na=Nauru
28.274 +LocaleNames/nl/nb=Noors - Bokm\u00e5l
28.275 +LocaleNames/nl/nd=Noord-Ndbele
28.276 +LocaleNames/nl/ne=Nepalees
28.277 +LocaleNames/nl/ng=Ndonga
28.278 +LocaleNames/nl/nl=Nederlands
28.279 +LocaleNames/nl/nn=Noors - Nynorsk
28.280 +LocaleNames/nl/no=Noors
28.281 +LocaleNames/nl/nr=Zuid-Ndbele
28.282 +LocaleNames/nl/nv=Navajo
28.283 +LocaleNames/nl/ny=Nyanja
28.284 +LocaleNames/nl/oc=Occitaans
28.285 +LocaleNames/nl/oj=Ojibwa
28.286 +LocaleNames/nl/om=Oromo
28.287 +LocaleNames/nl/or=Oriya
28.288 +LocaleNames/nl/os=Ossetisch
28.289 +LocaleNames/nl/pa=Punjabi
28.290 +LocaleNames/nl/pi=Pali
28.291 +LocaleNames/nl/pl=Pools
28.292 +LocaleNames/nl/ps=Pasjtoe
28.293 +LocaleNames/nl/pt=Portugees
28.294 +LocaleNames/nl/qu=Quechua
28.295 +LocaleNames/nl/rm=Reto-Romaans
28.296 +LocaleNames/nl/rn=Rundi
28.297 +LocaleNames/nl/ro=Roemeens
28.298 +LocaleNames/nl/ru=Russisch
28.299 +LocaleNames/nl/rw=Kinyarwanda
28.300 +LocaleNames/nl/sa=Sanskriet
28.301 +LocaleNames/nl/sc=Sardinisch
28.302 +LocaleNames/nl/sd=Sindhi
28.303 +LocaleNames/nl/se=Noord-Samisch
28.304 +LocaleNames/nl/sg=Sango
28.305 +LocaleNames/nl/si=Singalees
28.306 +LocaleNames/nl/sk=Slowaaks
28.307 +LocaleNames/nl/sl=Sloveens
28.308 +LocaleNames/nl/sm=Samoaans
28.309 +LocaleNames/nl/sn=Shona
28.310 +LocaleNames/nl/so=Somalisch
28.311 +LocaleNames/nl/sq=Albanees
28.312 +LocaleNames/nl/sr=Servisch
28.313 +LocaleNames/nl/ss=Swati
28.314 +LocaleNames/nl/st=Zuid-Sotho
28.315 +LocaleNames/nl/su=Soendanees
28.316 +LocaleNames/nl/sv=Zweeds
28.317 +LocaleNames/nl/sw=Swahili
28.318 +LocaleNames/nl/ta=Tamil
28.319 +LocaleNames/nl/te=Teloegoe
28.320 +LocaleNames/nl/tg=Tadzjieks
28.321 +LocaleNames/nl/th=Thais
28.322 +LocaleNames/nl/ti=Tigrinya
28.323 +LocaleNames/nl/tk=Turkmeens
28.324 +LocaleNames/nl/tl=Tagalog
28.325 +LocaleNames/nl/tn=Tswana
28.326 +LocaleNames/nl/to=Tonga
28.327 +LocaleNames/nl/tr=Turks
28.328 +LocaleNames/nl/ts=Tsonga
28.329 +LocaleNames/nl/tt=Tataars
28.330 +LocaleNames/nl/tw=Twi
28.331 +LocaleNames/nl/ty=Tahitisch
28.332 +LocaleNames/nl/ug=Oeigoers
28.333 +LocaleNames/nl/uk=Oekra\u00efens
28.334 +LocaleNames/nl/ur=Urdu
28.335 +LocaleNames/nl/uz=Oezbeeks
28.336 +LocaleNames/nl/ve=Venda
28.337 +LocaleNames/nl/vi=Vietnamees
28.338 +LocaleNames/nl/vo=Volap\u00fck
28.339 +LocaleNames/nl/wa=Wallonisch
28.340 +LocaleNames/nl/wo=Wolof
28.341 +LocaleNames/nl/xh=Xhosa
28.342 +LocaleNames/nl/yi=Jiddisch
28.343 +LocaleNames/nl/yo=Yoruba
28.344 +LocaleNames/nl/za=Zhuang
28.345 +LocaleNames/nl/zh=Chinees
28.346 +LocaleNames/nl/zu=Zulu
28.347 +
28.348 +# bug 6716626 - country
28.349 +LocaleNames/nl/AD=Andorra
28.350 +LocaleNames/nl/AE=Verenigde Arabische Emiraten
28.351 +LocaleNames/nl/AF=Afghanistan
28.352 +LocaleNames/nl/AG=Antigua en Barbuda
28.353 +LocaleNames/nl/AI=Anguilla
28.354 +LocaleNames/nl/AL=Albani\u00eb
28.355 +LocaleNames/nl/AM=Armeni\u00eb
28.356 +LocaleNames/nl/AN=Nederlandse Antillen
28.357 +LocaleNames/nl/AO=Angola
28.358 +LocaleNames/nl/AQ=Antarctica
28.359 +LocaleNames/nl/AR=Argentini\u00eb
28.360 +LocaleNames/nl/AS=Amerikaans Samoa
28.361 +LocaleNames/nl/AT=Oostenrijk
28.362 +LocaleNames/nl/AU=Australi\u00eb
28.363 +LocaleNames/nl/AW=Aruba
28.364 +LocaleNames/nl/AX=Alandeilanden
28.365 +LocaleNames/nl/AZ=Azerbeidzjan
28.366 +LocaleNames/nl/BA=Bosni\u00eb en Herzegovina
28.367 +LocaleNames/nl/BB=Barbados
28.368 +LocaleNames/nl/BD=Bangladesh
28.369 +LocaleNames/nl/BE=Belgi\u00eb
28.370 +LocaleNames/nl/BF=Burkina Faso
28.371 +LocaleNames/nl/BG=Bulgarije
28.372 +LocaleNames/nl/BH=Bahrein
28.373 +LocaleNames/nl/BI=Burundi
28.374 +LocaleNames/nl/BJ=Benin
28.375 +LocaleNames/nl/BM=Bermuda
28.376 +LocaleNames/nl/BN=Brunei
28.377 +LocaleNames/nl/BO=Bolivia
28.378 +LocaleNames/nl/BR=Brazili\u00eb
28.379 +LocaleNames/nl/BS=Bahama\u2019s
28.380 +LocaleNames/nl/BT=Bhutan
28.381 +LocaleNames/nl/BV=Bouveteiland
28.382 +LocaleNames/nl/BW=Botswana
28.383 +LocaleNames/nl/BY=Wit-Rusland
28.384 +LocaleNames/nl/BZ=Belize
28.385 +LocaleNames/nl/CA=Canada
28.386 +LocaleNames/nl/CC=Cocoseilanden
28.387 +LocaleNames/nl/CD=Congo-Kinshasa
28.388 +LocaleNames/nl/CF=Centraal-Afrikaanse Republiek
28.389 +LocaleNames/nl/CG=Congo
28.390 +LocaleNames/nl/CH=Zwitserland
28.391 +LocaleNames/nl/CI=Ivoorkust
28.392 +LocaleNames/nl/CK=Cookeilanden
28.393 +LocaleNames/nl/CL=Chili
28.394 +LocaleNames/nl/CM=Kameroen
28.395 +LocaleNames/nl/CN=China
28.396 +LocaleNames/nl/CO=Colombia
28.397 +LocaleNames/nl/CR=Costa Rica
28.398 +LocaleNames/nl/CS=Servi\u00eb en Montenegro
28.399 +LocaleNames/nl/CU=Cuba
28.400 +LocaleNames/nl/CV=Kaapverdi\u00eb
28.401 +LocaleNames/nl/CX=Christmaseiland
28.402 +LocaleNames/nl/CY=Cyprus
28.403 +LocaleNames/nl/CZ=Tsjechi\u00eb
28.404 +LocaleNames/nl/DE=Duitsland
28.405 +LocaleNames/nl/DJ=Djibouti
28.406 +LocaleNames/nl/DK=Denemarken
28.407 +LocaleNames/nl/DM=Dominica
28.408 +LocaleNames/nl/DO=Dominicaanse Republiek
28.409 +LocaleNames/nl/DZ=Algerije
28.410 +LocaleNames/nl/EC=Ecuador
28.411 +LocaleNames/nl/EE=Estland
28.412 +LocaleNames/nl/EG=Egypte
28.413 +LocaleNames/nl/EH=Westelijke Sahara
28.414 +LocaleNames/nl/ER=Eritrea
28.415 +LocaleNames/nl/ES=Spanje
28.416 +LocaleNames/nl/ET=Ethiopi\u00eb
28.417 +LocaleNames/nl/FI=Finland
28.418 +LocaleNames/nl/FJ=Fiji
28.419 +LocaleNames/nl/FK=Falklandeilanden
28.420 +LocaleNames/nl/FM=Micronesi\u00eb
28.421 +LocaleNames/nl/FO=Faer\u00f6er
28.422 +LocaleNames/nl/FR=Frankrijk
28.423 +LocaleNames/nl/GA=Gabon
28.424 +LocaleNames/nl/GB=Verenigd Koninkrijk
28.425 +LocaleNames/nl/GD=Grenada
28.426 +LocaleNames/nl/GE=Georgi\u00eb
28.427 +LocaleNames/nl/GF=Frans-Guyana
28.428 +LocaleNames/nl/GH=Ghana
28.429 +LocaleNames/nl/GI=Gibraltar
28.430 +LocaleNames/nl/GL=Groenland
28.431 +LocaleNames/nl/GM=Gambia
28.432 +LocaleNames/nl/GN=Guinee
28.433 +LocaleNames/nl/GP=Guadeloupe
28.434 +LocaleNames/nl/GQ=Equatoriaal-Guinea
28.435 +LocaleNames/nl/GR=Griekenland
28.436 +LocaleNames/nl/GS=Zuid-Georgi\u00eb en Zuidelijke Sandwicheilanden
28.437 +LocaleNames/nl/GT=Guatemala
28.438 +LocaleNames/nl/GU=Guam
28.439 +LocaleNames/nl/GW=Guinee-Bissau
28.440 +LocaleNames/nl/GY=Guyana
28.441 +LocaleNames/nl/HK=Hongkong SAR van China
28.442 +LocaleNames/nl/HM=Heard- en McDonaldeilanden
28.443 +LocaleNames/nl/HN=Honduras
28.444 +LocaleNames/nl/HR=Kroati\u00eb
28.445 +LocaleNames/nl/HT=Ha\u00efti
28.446 +LocaleNames/nl/HU=Hongarije
28.447 +LocaleNames/nl/ID=Indonesi\u00eb
28.448 +LocaleNames/nl/IE=Ierland
28.449 +LocaleNames/nl/IL=Isra\u00ebl
28.450 +LocaleNames/nl/IN=India
28.451 +LocaleNames/nl/IO=Britse Gebieden in de Indische Oceaan
28.452 +LocaleNames/nl/IQ=Irak
28.453 +LocaleNames/nl/IR=Iran
28.454 +LocaleNames/nl/IS=IJsland
28.455 +LocaleNames/nl/IT=Itali\u00eb
28.456 +LocaleNames/nl/JM=Jamaica
28.457 +LocaleNames/nl/JO=Jordani\u00eb
28.458 +LocaleNames/nl/JP=Japan
28.459 +LocaleNames/nl/KE=Kenia
28.460 +LocaleNames/nl/KG=Kirgizi\u00eb
28.461 +LocaleNames/nl/KH=Cambodja
28.462 +LocaleNames/nl/KI=Kiribati
28.463 +LocaleNames/nl/KM=Comoren
28.464 +LocaleNames/nl/KN=Saint Kitts en Nevis
28.465 +LocaleNames/nl/KP=Noord-Korea
28.466 +LocaleNames/nl/KR=Zuid-Korea
28.467 +LocaleNames/nl/KW=Koeweit
28.468 +LocaleNames/nl/KY=Caymaneilanden
28.469 +LocaleNames/nl/KZ=Kazachstan
28.470 +LocaleNames/nl/LA=Laos
28.471 +LocaleNames/nl/LB=Libanon
28.472 +LocaleNames/nl/LC=Saint Lucia
28.473 +LocaleNames/nl/LI=Liechtenstein
28.474 +LocaleNames/nl/LK=Sri Lanka
28.475 +LocaleNames/nl/LR=Liberia
28.476 +LocaleNames/nl/LS=Lesotho
28.477 +LocaleNames/nl/LT=Litouwen
28.478 +LocaleNames/nl/LU=Luxemburg
28.479 +LocaleNames/nl/LV=Letland
28.480 +LocaleNames/nl/LY=Libi\u00eb
28.481 +LocaleNames/nl/MA=Marokko
28.482 +LocaleNames/nl/MC=Monaco
28.483 +LocaleNames/nl/MD=Moldavi\u00eb
28.484 +LocaleNames/nl/ME=Montenegro
28.485 +LocaleNames/nl/MG=Madagaskar
28.486 +LocaleNames/nl/MH=Marshalleilanden
28.487 +LocaleNames/nl/MK=Macedoni\u00eb
28.488 +LocaleNames/nl/ML=Mali
28.489 +LocaleNames/nl/MM=Myanmar
28.490 +LocaleNames/nl/MN=Mongoli\u00eb
28.491 +LocaleNames/nl/MO=Macao SAR van China
28.492 +LocaleNames/nl/MP=Noordelijke Marianeneilanden
28.493 +LocaleNames/nl/MQ=Martinique
28.494 +LocaleNames/nl/MR=Mauritani\u00eb
28.495 +LocaleNames/nl/MS=Montserrat
28.496 +LocaleNames/nl/MT=Malta
28.497 +LocaleNames/nl/MU=Mauritius
28.498 +LocaleNames/nl/MV=Maldiven
28.499 +LocaleNames/nl/MW=Malawi
28.500 +LocaleNames/nl/MX=Mexico
28.501 +LocaleNames/nl/MY=Maleisi\u00eb
28.502 +LocaleNames/nl/MZ=Mozambique
28.503 +LocaleNames/nl/NA=Namibi\u00eb
28.504 +LocaleNames/nl/NC=Nieuw-Caledoni\u00eb
28.505 +LocaleNames/nl/NE=Niger
28.506 +LocaleNames/nl/NF=Norfolkeiland
28.507 +LocaleNames/nl/NG=Nigeria
28.508 +LocaleNames/nl/NI=Nicaragua
28.509 +LocaleNames/nl/NL=Nederland
28.510 +LocaleNames/nl/NO=Noorwegen
28.511 +LocaleNames/nl/NP=Nepal
28.512 +LocaleNames/nl/NR=Nauru
28.513 +LocaleNames/nl/NU=Niue
28.514 +LocaleNames/nl/NZ=Nieuw-Zeeland
28.515 +LocaleNames/nl/OM=Oman
28.516 +LocaleNames/nl/PA=Panama
28.517 +LocaleNames/nl/PE=Peru
28.518 +LocaleNames/nl/PF=Frans-Polynesi\u00eb
28.519 +LocaleNames/nl/PG=Papoea-Nieuw-Guinea
28.520 +LocaleNames/nl/PH=Filipijnen
28.521 +LocaleNames/nl/PK=Pakistan
28.522 +LocaleNames/nl/PL=Polen
28.523 +LocaleNames/nl/PM=Saint Pierre en Miquelon
28.524 +LocaleNames/nl/PN=Pitcairn
28.525 +LocaleNames/nl/PR=Puerto Rico
28.526 +LocaleNames/nl/PS=Palestijns Gebied
28.527 +LocaleNames/nl/PT=Portugal
28.528 +LocaleNames/nl/PW=Palau
28.529 +LocaleNames/nl/PY=Paraguay
28.530 +LocaleNames/nl/QA=Qatar
28.531 +LocaleNames/nl/RE=R\u00e9union
28.532 +LocaleNames/nl/RO=Roemeni\u00eb
28.533 +LocaleNames/nl/RS=Servi\u00eb
28.534 +LocaleNames/nl/RU=Rusland
28.535 +LocaleNames/nl/RW=Rwanda
28.536 +LocaleNames/nl/SA=Saoedi-Arabi\u00eb
28.537 +LocaleNames/nl/SB=Salomonseilanden
28.538 +LocaleNames/nl/SC=Seychellen
28.539 +LocaleNames/nl/SD=Soedan
28.540 +LocaleNames/nl/SE=Zweden
28.541 +LocaleNames/nl/SG=Singapore
28.542 +LocaleNames/nl/SH=Sint-Helena
28.543 +LocaleNames/nl/SI=Sloveni\u00eb
28.544 +LocaleNames/nl/SJ=Svalbard en Jan Mayen
28.545 +LocaleNames/nl/SK=Slowakije
28.546 +LocaleNames/nl/SL=Sierra Leone
28.547 +LocaleNames/nl/SM=San Marino
28.548 +LocaleNames/nl/SN=Senegal
28.549 +LocaleNames/nl/SO=Somali\u00eb
28.550 +LocaleNames/nl/SR=Suriname
28.551 +LocaleNames/nl/ST=Sao Tom\u00e9 en Principe
28.552 +LocaleNames/nl/SV=El Salvador
28.553 +LocaleNames/nl/SY=Syri\u00eb
28.554 +LocaleNames/nl/SZ=Swaziland
28.555 +LocaleNames/nl/TC=Turks- en Caicoseilanden
28.556 +LocaleNames/nl/TD=Tsjaad
28.557 +LocaleNames/nl/TF=Franse Gebieden in de zuidelijke Indische Oceaan
28.558 +LocaleNames/nl/TG=Togo
28.559 +LocaleNames/nl/TH=Thailand
28.560 +LocaleNames/nl/TJ=Tadzjikistan
28.561 +LocaleNames/nl/TK=Tokelau
28.562 +LocaleNames/nl/TL=Oost-Timor
28.563 +LocaleNames/nl/TM=Turkmenistan
28.564 +LocaleNames/nl/TN=Tunesi\u00eb
28.565 +LocaleNames/nl/TO=Tonga
28.566 +LocaleNames/nl/TR=Turkije
28.567 +LocaleNames/nl/TT=Trinidad en Tobago
28.568 +LocaleNames/nl/TV=Tuvalu
28.569 +LocaleNames/nl/TW=Taiwan
28.570 +LocaleNames/nl/TZ=Tanzania
28.571 +LocaleNames/nl/UA=Oekra\u00efne
28.572 +LocaleNames/nl/UG=Oeganda
28.573 +LocaleNames/nl/UM=Amerikaanse kleinere afgelegen eilanden
28.574 +LocaleNames/nl/US=Verenigde Staten
28.575 +LocaleNames/nl/UY=Uruguay
28.576 +LocaleNames/nl/UZ=Oezbekistan
28.577 +LocaleNames/nl/VA=Vaticaanstad
28.578 +LocaleNames/nl/VC=Saint Vincent en de Grenadines
28.579 +LocaleNames/nl/VE=Venezuela
28.580 +LocaleNames/nl/VG=Britse Maagdeneilanden
28.581 +LocaleNames/nl/VI=Amerikaanse Maagdeneilanden
28.582 +LocaleNames/nl/VN=Vietnam
28.583 +LocaleNames/nl/VU=Vanuatu
28.584 +LocaleNames/nl/WF=Wallis en Futuna
28.585 +LocaleNames/nl/WS=Samoa
28.586 +LocaleNames/nl/YE=Jemen
28.587 +LocaleNames/nl/YT=Mayotte
28.588 +LocaleNames/nl/ZA=Zuid-Afrika
28.589 +LocaleNames/nl/ZM=Zambia
29.1 --- a/test/sun/text/resources/LocaleDataTest.java Fri Jan 15 09:06:57 2010 -0800
29.2 +++ b/test/sun/text/resources/LocaleDataTest.java Wed Jan 20 17:11:52 2010 -0800
29.3 @@ -31,7 +31,8 @@
29.4 * 5102005 5074431 6182685 6208712 6277020 6245766 6351682 6386647 6379382
29.5 * 6414459 6455680 6498742 6558863 6488119 6547501 6497154 6558856 6481177
29.6 * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
29.7 - * 6509039
29.8 + * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
29.9 + * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413
29.10 * @summary Verify locale data
29.11 *
29.12 */
29.13 @@ -255,6 +256,15 @@
29.14 index = key.length();
29.15 resTag = key.substring(oldIndex, index);
29.16
29.17 + // TimeZone name may have "/" in it, for example "Asia/Taipei", so use "Asia\/Taipei in LocaleData.
29.18 + if(resTag.endsWith("\\")) {
29.19 + resTag = resTag.substring(0, resTag.length() - 1);
29.20 + oldIndex = index;
29.21 + index = key.indexOf("/", oldIndex + 1);
29.22 + if (index == -1) index = key.length();
29.23 + resTag += key.substring(oldIndex, index);
29.24 + }
29.25 +
29.26 if (index < key.length() - 1)
29.27 qualifier = key.substring(index + 1);
29.28 else
30.1 --- a/test/sun/util/resources/Locale/Bug4429024.java Fri Jan 15 09:06:57 2010 -0800
30.2 +++ b/test/sun/util/resources/Locale/Bug4429024.java Wed Jan 20 17:11:52 2010 -0800
30.3 @@ -46,7 +46,7 @@
30.4 { "en", "englanti" },
30.5 { "es", "espanja" },
30.6 { "fi", "suomi" },
30.7 - { "fr", "franska" },
30.8 + { "fr", "ranska" },
30.9 { "he", "heprea" },
30.10 { "hi", "hindi" },
30.11 { "it", "italia" },
30.12 @@ -75,7 +75,7 @@
30.13 { "DK", "Tanska" },
30.14 { "ES", "Espanja" },
30.15 { "FI", "Suomi" },
30.16 - { "FR", "Franska" },
30.17 + { "FR", "Ranska" },
30.18 { "GB", "Iso-Britannia" },
30.19 { "GR", "Kreikka" },
30.20 { "IE", "Irlanti" },