# HG changeset patch
# User mfang
# Date 1344900379 25200
# Node ID 1e6bf2c0eca51147e8bcb4e759dae81ad8131099
# Parent  382651d28f2502d371eca751962232c0e535e57a# Parent  01895ae4d4298c23321267e5982016d377455e91
Merge

diff -r 382651d28f25 -r 1e6bf2c0eca5 jdk/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties	Wed Jul 05 18:18:57 2017 +0200
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties	Mon Aug 13 16:26:19 2012 -0700
@@ -36,5 +36,5 @@
 # Taligent is a registered trademark of Taligent, Inc.
 
 VEB=Bs
-VEF=BsF.
+VEF=Bs.F.
 
diff -r 382651d28f25 -r 1e6bf2c0eca5 jdk/test/sun/text/resources/LocaleData
--- a/jdk/test/sun/text/resources/LocaleData	Wed Jul 05 18:18:57 2017 +0200
+++ b/jdk/test/sun/text/resources/LocaleData	Mon Aug 13 16:26:19 2012 -0700
@@ -655,7 +655,6 @@
 FormatData/es_UY/NumberElements/2=;
 CurrencyNames/es_VE/VEB=Bs
 # bug 6570259
-CurrencyNames/es_VE/VEF=BsF.
 FormatData/es_VE/NumberPatterns/0=#,##0.###;-#,##0.###
 # FormatData/es_VE/NumberPatterns/1=Bs#,##0.00;Bs -#,##0.00 # Changed; see bug 4122840
 FormatData/es_VE/NumberPatterns/2=#,##0%
@@ -7034,3 +7033,5 @@
 FormatData/sl/DateTimePatterns/4=EEEE, dd. MMMM y
 FormatData/sl/DateTimePatterns/5=dd. MMMM y
 
+# bug 7189611
+CurrencyNames/es_VE/VEF=Bs.F.
diff -r 382651d28f25 -r 1e6bf2c0eca5 jdk/test/sun/text/resources/LocaleDataTest.java
--- a/jdk/test/sun/text/resources/LocaleDataTest.java	Wed Jul 05 18:18:57 2017 +0200
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java	Mon Aug 13 16:26:19 2012 -0700
@@ -34,7 +34,7 @@
  *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
- *      7003124 7085757 7028073 7171028
+ *      7003124 7085757 7028073 7171028 7189611
  * @summary Verify locale data
  *
  */