--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_es.properties Wed Mar 30 22:52:41 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_es.properties Tue Apr 05 21:09:17 2011 -0700
@@ -1,47 +1,70 @@
#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=peseta andorrana
-aed=dirham de los Emiratos \u00c1rabes Unidos
+aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
afa=afgani (1927-2002)
afn=afgani
all=lek alban\u00e9s
@@ -52,7 +75,8 @@
ats=chel\u00edn austriaco
aud=d\u00f3lar australiano
awg=flor\u00edn de Aruba
-azm=manat azer\u00ed
+azm=manat azer\u00ed (1993-2006)
+azn=manat azer\u00ed
bam=marco convertible de Bosnia-Herzegovina
bbd=d\u00f3lar de Barbados
bdt=taka de Bangladesh
@@ -80,7 +104,7 @@
cny=yuan renminbi chino
cop=peso colombiano
crc=col\u00f3n costarricense
-csd=dinar serbio
+csd=antiguo dinar serbio
cup=peso cubano
cve=escudo de Cabo Verde
cyp=libra chipriota
@@ -102,7 +126,8 @@
frf=franco franc\u00e9s
gbp=libra esterlina brit\u00e1nica
gel=lari georgiano
-ghc=cedi ghan\u00e9s
+ghc=cedi ghan\u00e9s (1979-2007)
+ghs=cedi ghan\u00e9s
gip=libra de Gibraltar
gmd=dalasi gambiano
gnf=franco guineano
@@ -160,7 +185,8 @@
mxn=peso mexicano
mxv=unidad de inversi\u00f3n (UDI) mexicana
myr=ringgit malasio
-mzm=metical mozambique\u00f1o
+mzm=antiguo metical mozambique\u00f1o
+mzn=metical mozambique\u00f1o
nad=d\u00f3lar de Namibia
ngn=naira nigeriano
nio=c\u00f3rdoba oro nicarag\u00fcense
@@ -180,6 +206,7 @@
qar=riyal de Qatar
rol=antiguo leu rumano
ron=leu rumano
+rsd=dinar serbio
rub=rublo ruso
rur=rublo ruso (1991-1998)
rwf=franco ruand\u00e9s
@@ -187,6 +214,7 @@
sbd=d\u00f3lar de las Islas Salom\u00f3n
scr=rupia de Seychelles
sdd=dinar sudan\u00e9s
+sdg=libra sudanesa
sek=corona sueca
sgd=d\u00f3lar singapurense
shp=libra de Santa Elena
@@ -206,7 +234,7 @@
tnd=dinar tunecino
top=pa\u02bbanga tongano
tpe=escudo timorense
-trl=lira turca
+trl=lira turca antigua
try=nueva lira turca
ttd=d\u00f3lar de Trinidad y Tobago
twd=nuevo d\u00f3lar taiwan\u00e9s
@@ -219,6 +247,7 @@
uyu=peso uruguayo
uzs=sum uzbeko
veb=bol\u00edvar venezolano
+vef=bol\u00edvar fuerte venezolano
vnd=dong vietnamita
vuv=vatu vanuatuense
wst=tala samoano