# HG changeset patch
# User mfang
# Date 1303237476 25200
# Node ID c84853186551fb247ac3a76c6b4943efa412d840
# Parent  268137cdd00209a84a429e542ca8148ae2314214# Parent  b00871ce7045676dd2bda6f240c99b2b603c1d2a
Merge

diff -r 268137cdd002 -r c84853186551 jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties	Tue Apr 19 11:24:36 2011 -0700
@@ -65,6 +65,8 @@
 #
 adp=Andorranische Pesete
 aed=UAE Dirham
+afa=Afghani (1927-2002)
+afn=Afghani
 all=Lek
 amd=Dram
 ang=Niederl. Antillen Gulden
@@ -85,6 +87,7 @@
 bif=Burundi-Franc
 bmd=Bermuda-Dollar
 bnd=Brunei-Dollar
+bob=Boliviano
 bov=Mvdol
 brl=Real
 bsd=Bahama-Dollar
@@ -106,6 +109,7 @@
 cve=Kap Verde Escudo
 cyp=Zypern-Pfund
 czk=Tschechische Krone
+dem=Deutsche Mark
 djf=Dschibuti-Franc
 dkk=D\u00e4nische Krone
 dop=Dominikanischer Peso
@@ -176,7 +180,9 @@
 mtl=Maltesische Lira
 mur=Mauritius-Rupie
 mvr=Rufiyaa
+mwk=Malawi Kwacha
 mxn=Mexikanischer Peso
+mxv=Mexican Unidad de Inversion (UDI)
 myr=Malaysischer Ringgit
 mzm=Alter Metical
 mzn=Metical
@@ -217,6 +223,7 @@
 srd=Surinamischer Dollar
 srg=Suriname Gulden
 std=Dobra
+svc=El Salvador Colon
 syp=Syrisches Pfund
 szl=Lilangeni
 thb=Baht
diff -r 268137cdd002 -r c84853186551 jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties	Tue Apr 19 11:24:36 2011 -0700
@@ -86,6 +86,7 @@
 bif=Franco del Burundi
 bmd=Dollaro delle Bermuda
 bnd=Dollaro del Brunei
+bob=Boliviano
 bov=Mvdol Boliviano
 brl=Real Brasiliano
 bsd=Dollaro delle Bahamas
diff -r 268137cdd002 -r c84853186551 jdk/test/java/util/Currency/CurrencyTest.java
--- a/jdk/test/java/util/Currency/CurrencyTest.java	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/test/java/util/Currency/CurrencyTest.java	Tue Apr 19 11:24:36 2011 -0700
@@ -23,7 +23,7 @@
 /*
  * @test
  * @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531
- *    6488442
+ *    6488442 7036905
  * @summary Basic tests for Currency class.
  */
 
@@ -249,7 +249,7 @@
         testDisplayName("ITL", new Locale("it"), "Lira Italiana");
         testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186");
         testDisplayName("KRW", Locale.KOREAN, "\ub300\ud55c\ubbfc\uad6d \uc6d0");
-        testDisplayName("SEK", new Locale("sv"), "Svensk krona");
+        testDisplayName("SEK", new Locale("sv"), "svensk krona");
         testDisplayName("CNY", Locale.SIMPLIFIED_CHINESE, "\u4eba\u6c11\u5e01");
         testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63");
     }
diff -r 268137cdd002 -r c84853186551 jdk/test/sun/text/resources/LocaleData
--- a/jdk/test/sun/text/resources/LocaleData	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/test/sun/text/resources/LocaleData	Tue Apr 19 11:24:36 2011 -0700
@@ -6942,3 +6942,14 @@
 CurrencyNames/zh_TW/xts=XTS
 CurrencyNames/zh_TW/xxx=XXX
 CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5
+
+# bug 7036905
+CurrencyNames/de/afa=Afghani (1927-2002)
+CurrencyNames/de/afn=Afghani
+CurrencyNames/de/bob=Boliviano
+CurrencyNames/de/dem=Deutsche Mark
+CurrencyNames/de/mwk=Malawi Kwacha
+CurrencyNames/de/mxv=Mexican Unidad de Inversion (UDI)
+CurrencyNames/de/svc=El Salvador Colon
+
+CurrencyNames/it/bob=Boliviano
diff -r 268137cdd002 -r c84853186551 jdk/test/sun/text/resources/LocaleDataTest.java
--- a/jdk/test/sun/text/resources/LocaleDataTest.java	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java	Tue Apr 19 11:24:36 2011 -0700
@@ -33,7 +33,7 @@
  *      6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
  *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
- *      6919624 6998391 7019267 7020960 7025837 7020583
+ *      6919624 6998391 7019267 7020960 7025837 7020583 7036905
  * @summary Verify locale data
  *
  */