diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index a81cb19..ebadabe 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -177,3 +177,4 @@
 5f3645aa920d373b26d01b21f3b8b30fc4e10a0d jdk7u6-b10
 cd64596c2dd7f195a6d38b6269bab23e7fad4361 jdk7u6-b11
 61cfcee1d00cb4af288e640216af2bccbc3c9ef0 jdk7u6-b12
+9b9a6d318e8aa5b8f0e42d2d3d2c0c34cb3f986d jdk7u6-b13
diff --git a/corba/.hgtags b/corba/.hgtags
index 29e4236..46a44f9 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -177,3 +177,4 @@
 c9f6750370c9a99d149d73fd32c363d9959d19d1 jdk7u6-b10
 a2089d3bf5a00be50764e1ced77e270ceddddb5d jdk7u6-b11
 34354c623c450dc9f2f58981172fa3d66f51e89c jdk7u6-b12
+76bee3576f61d4d96fef118902d5d237a4f3d219 jdk7u6-b13
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
index 3343f1f..b33670e 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
index 96707e4..1256289 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
index b46f46c..b1b64f1 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
index 7d39881..908f7a4 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
@@ -23,9 +23,9 @@
 # questions.
 #
 
-orbd.usage=Utilizzo: {0} <opzioni> \n\ndove <opzioni> include:\n  -port                  Porta di attivazione da cui avviare ORBD, valore predefinito 1049 (opzionale)\n  -defaultdb             Directory per i file ORBD, valore predefinito "./orb.db" (opzionale)\n  -serverid              ID server per ORBD, valore predefinito 1 (opzionale)\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -ORBInitialHost       HostName iniziale (richiesto)\n
+orbd.usage=Uso: {0} <opzioni> \n\ndove <opzioni> include:\n  -port                  Porta di attivazione da cui avviare ORBD, valore predefinito 1049 (opzionale)\n  -defaultdb             Directory per i file ORBD, valore predefinito "./orb.db" (opzionale)\n  -serverid              ID server per ORBD, valore predefinito 1 (opzionale)\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -ORBInitialHost       HostName iniziale (richiesto)\n
 
-servertool.usage=Utilizzo: {0} <opzioni> \n\ndove <opzioni> include:\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -ORBInitialHost        HostName iniziale (richiesto)\n
+servertool.usage=Uso: {0} <opzioni> \n\ndove <opzioni> include:\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -ORBInitialHost        HostName iniziale (richiesto)\n
 servertool.banner=\n\nBenvenuti in Java IDL Server Tool     \nimmettere i comandi quando richiesto \n
 servertool.shorthelp=\n\n\tComandi disponibili:\n\t-------------------- \n
 servertool.baddef=Definizione server errata: {0}
@@ -82,13 +82,13 @@
 servertool.help=\thelp\n\tOR\n\thelp <nome comando>\n
 servertool.help1=Guida
 
-servertool.orbidmap=\tUtilizzo: orblist [ -serverid <id server> | -applicationName <nome> ]\n
+servertool.orbidmap=\tUso: orblist [ -serverid <id server> | -applicationName <nome> ]\n
 servertool.orbidmap1=lista nomi orb e relativa mappatura
 servertool.orbidmap2=\n\tId ORB\t\tNome ORB\n\t------\t\t--------\n
 pnameserv.success=NameServer persistente avviato correttamente
 
 
-bootstrap.usage=Utilizzo: {0} <opzioni> \n\ndove <opzioni> include:\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -InitialServicesFile   File contenente la lista dei servizi iniziali (richiesto)\n
+bootstrap.usage=Uso: {0} <opzioni> \n\ndove <opzioni> include:\n  -ORBInitialPort        Porta iniziale (richiesta)\n  -InitialServicesFile   File contenente la lista dei servizi iniziali (richiesto)\n
 bootstrap.success=impostazione porta su {0} e lettura servizi da {1} in corso
 bootstrap.filenotreadable=il file {0} non \u00E8 leggibile
 bootstrap.filenotfound=impossibile trovare il file {0}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
index 8911bd1..c236f07 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
index 7d58921..7be6158 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties
index 1c5dbce..81ca99d 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
index eaf5b45..c11488e 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
index e03e66b..6dce9e6 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
index 075fa02..db79752 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2005, 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
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index fd05cfc..07047e3 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -293,3 +293,5 @@
 e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03
 f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12
 7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04
+28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13
+202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index fca024a..a44f30d 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=2
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index ed47f54..ab87972 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -356,12 +356,12 @@
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
-    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC
-#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
-#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
-#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
-#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
-#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
 
 jprt.my.windows.i586.test.targets = \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -505,3 +505,6 @@
 jprt.make.rule.test.targets.jdk7u6=${jprt.make.rule.test.targets.jdk7}
 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
 
+# 7155453: Work-around to prevent popups on OSX from blocking test completion
+# but the work-around is added to all platforms to be consistent 
+jprt.jbb.options=-Djava.awt.headless=true
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index f48e35a..e2ecf53 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -1601,7 +1601,8 @@
     case 5001: st->print(" Windows XP"); break;
     case 5002:
     case 6000:
-    case 6001: {
+    case 6001:
+    case 6002: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1633,6 +1634,14 @@
         }
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else if (os_vers == 6002) {
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 8");
+        } else {
+            st->print(" Windows Server 2012");
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       } else { // future os
         // Unrecognized windows, print out its major and minor versions
         st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.hpp b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
index 248d174..a251dd2 100644
--- a/hotspot/src/share/vm/c1/c1_ValueMap.hpp
+++ b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
@@ -141,8 +141,11 @@
 
   // visitor functions
   void do_StoreField     (StoreField*      x) {
-    if (x->is_init_point()) {
-      // putstatic is an initialization point so treat it as a wide kill
+    if (x->is_init_point() ||  // putstatic is an initialization point so treat it as a wide kill
+        // This is actually too strict and the JMM doesn't require
+        // this in all cases (e.g. load a; volatile store b; load a)
+        // but possible future optimizations might require this.
+        x->field()->is_volatile()) {
       kill_memory();
     } else {
       kill_field(x->field());
@@ -160,8 +163,8 @@
   void do_Local          (Local*           x) { /* nothing to do */ }
   void do_Constant       (Constant*        x) { /* nothing to do */ }
   void do_LoadField      (LoadField*       x) {
-    if (x->is_init_point()) {
-      // getstatic is an initialization point so treat it as a wide kill
+    if (x->is_init_point() ||         // getstatic is an initialization point so treat it as a wide kill
+        x->field()->is_volatile()) {  // the JMM requires this
       kill_memory();
     }
   }
diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp
index 9ab47f7..7b5932a 100644
--- a/hotspot/src/share/vm/classfile/verifier.cpp
+++ b/hotspot/src/share/vm/classfile/verifier.cpp
@@ -1738,10 +1738,14 @@
   int target = bci + default_offset;
   stackmap_table->check_jump_target(current_frame, target, CHECK_VERIFY(this));
   for (int i = 0; i < keys; i++) {
+    // Because check_jump_target() may safepoint, the bytecode could have
+    // moved, which means 'aligned_bcp' is no good and needs to be recalculated.
+    aligned_bcp = (address)round_to((intptr_t)(bcs->bcp() + 1), jintSize);
     target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize);
     stackmap_table->check_jump_target(
       current_frame, target, CHECK_VERIFY(this));
   }
+  NOT_PRODUCT(aligned_bcp = NULL);  // no longer valid at this point
 }
 
 bool ClassVerifier::name_in_supers(
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 833f6f1..b37f44a 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -378,6 +378,7 @@
   jclass cls = NULL;
   DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls);
 
+  TempNewSymbol class_name = NULL;
   // Since exceptions can be thrown, class initialization can take place
   // if name is NULL no check for class name in .class stream has to be made.
   if (name != NULL) {
@@ -387,9 +388,8 @@
       // into the constant pool.
       THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name);
     }
+    class_name = SymbolTable::new_symbol(name, CHECK_NULL);
   }
-  TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD);
-
   ResourceMark rm(THREAD);
   ClassFileStream st((u1*) buf, bufLen, NULL);
   Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 48ff822..43d2dae 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -177,3 +177,4 @@
 f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10
 5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11
 c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12
+15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 4c2bdbb..628cda9 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -177,3 +177,4 @@
 c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10
 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11
 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12
+e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13
diff --git a/jdk/.hgtags b/jdk/.hgtags
index c59aac2..2faf7d5 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -177,3 +177,4 @@
 a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10
 18a1b4f0681ae6e748fc60162dd76e357de3304b jdk7u6-b11
 76306dce87104d9f333db3371ca97c80cac9674a jdk7u6-b12
+aa49fe7490963f0c53741fbca3a175e0fec93951 jdk7u6-b13
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties
index 07f18e6..0fdcd42 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Allgemeine Datei
-FileChooser.directoryDescriptionText=Verzeichnis
-FileChooser.newFolderErrorText=Bei der Erstellung des Ordners ist ein Fehler aufgetreten
+FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
+FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
+FileChooser.newFolderError.textAndMnemonic=Bei der Erstellung des Ordners ist ein Fehler aufgetreten
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Alle Dateien
-FileChooser.cancelButtonText=Abbrechen
-FileChooser.saveButtonText=Speichern
-FileChooser.openButtonText=\u00D6ffnen
-FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00D6ffnen
-FileChooser.updateButtonText=Updaten
-FileChooser.helpButtonText=Hilfe
-FileChooser.directoryOpenButtonText=\u00D6ffnen
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.cancelButton.textAndMnemonic=Abbrechen
+FileChooser.saveButton.textAndMnemonic=Speichern
+FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.updateButton.textAndMnemonic=Updaten
+FileChooser.helpButton.textAndMnemonic=Hilfe
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Speichern
-FileChooser.openTitleText=\u00D6ffnen
-FileChooser.newFolderExistsErrorText=Dieser Name ist bereits vergeben
-FileChooser.chooseButtonText=W\u00E4hlen
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Speichern
+FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
+FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
 
-FileChooser.newFolderButtonText=Neuer Ordner
-FileChooser.newFolderTitleText=Neuer Ordner
-FileChooser.fileNameLabelText=Datei:
-FileChooser.saveDialogFileNameLabelText=Speichern unter:
-FileChooser.filesOfTypeLabelText=Dateiformat:
+FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
+FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
+FileChooser.fileNameLabel.textAndMnemonic=Datei:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Speichern unter:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Dateiformat:
 
 FileChooser.desktopName=Desktop
-FileChooser.newFolderPromptText=Name des neuen Ordners:
+FileChooser.newFolderPrompt.textAndMnemonic=Name des neuen Ordners:
 FileChooser.untitledFolderName=unbenannter Ordner
 FileChooser.untitledFileName=unbenannt
-FileChooser.createButtonText=Erstellen
+FileChooser.createButton.textAndMnemonic=Erstellen
 
-FileChooser.byDateText=\u00C4nderungsdatum
-FileChooser.byNameText=Name
+FileChooser.byDate.textAndMnemonic=\u00C4nderungsdatum
+FileChooser.by.textAndMnemonic=Name
 FileChooser.newFolderAccessibleName=Neuer Ordner
 
 FileChooser.mac.newFolder=unbenannter Ordner
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Vorschau
-ColorChooser.okText=OK
-ColorChooser.cancelText=Abbrechen
-ColorChooser.resetText=Zur\u00FCcksetzen
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=90
-ColorChooser.sampleText=Beispieltext  Beispieltext
-ColorChooser.swatchesNameText=Muster
-ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Aktuell:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rot
-ColorChooser.rgbRedMnemonic=84
-ColorChooser.rgbGreenText=Gr\u00FCn
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Blau
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Vorschau
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Abbrechen
+ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
+ColorChooser.swatches.textAndMnemonic=&Muster
+ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&t
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blau
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Ja
-OptionPane.yesButtonMnemonic=74
-OptionPane.noButtonText=Nein
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Abbrechen
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Option ausw\u00E4hlen
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nein
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Abbrechen
+OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Eingabe
+OptionPane.inputDialog.titleAndMnemonic=Eingabe
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Meldung
+OptionPane.messageDialog.titleAndMnemonic=Meldung
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Drucken
-PrintingDialog.titleAbortingText=Drucken (wird abgebrochen)
+PrintingDialog.titleProgress.textAndMnemonic=Drucken
+PrintingDialog.titleAborting.textAndMnemonic=Drucken (wird abgebrochen)
 
-PrintingDialog.contentInitialText=Druckvorgang l\u00E4uft...
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Seite {0} wurde gedruckt ...
+PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt ...
 
-PrintingDialog.contentAbortingText=Druckvorgang wird abgebrochen ...
+PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen ...
 
-PrintingDialog.abortButtonText=Abbruch
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Druckvorgang abbrechen
+PrintingDialog.abortButton.textAndMnemonic=&Abbruch
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimieren
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Schlie\u00DFen
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Wiederherstellen
-InternalFrameTitlePane.moveButtonText=Verschieben
-InternalFrameTitlePane.sizeButtonText=Gr\u00F6\u00DFe
-InternalFrameTitlePane.minimizeButtonText=Minimieren
-InternalFrameTitlePane.maximizeButtonText=Maximieren
-InternalFrameTitlePane.closeButtonText=Schlie\u00DFen
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
+InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Abfrage weiterleiten
-FormView.resetButtonText=Zur\u00FCcksetzen
-FormView.browseFileButtonText=Durchsuchen ...
+FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
+FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.browseFileButton.textAndMnemonic=Durchsuchen ...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=Formatvorlagen\u00E4nderung
-AbstractDocument.additionText=Hinzuf\u00FCgen
-AbstractDocument.deletionText=L\u00F6schen
-AbstractDocument.undoText=R\u00FCckg\u00E4ngig
-AbstractDocument.redoText=Wiederherstellen
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
+AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
+AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
+AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.redo.textAndMnemonic=Wiederherstellen
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=Klicken
+AbstractButton.click.textAndMnemonic=Klicken
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=R\u00FCckg\u00E4ngig
-AbstractUndoableEdit.redoText=Wiederherstellen
+AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Fortschritt ...
+ProgressMonitor.progress.textAndMnemonic=Fortschritt ...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=linke Schaltfl\u00E4che
-SplitPane.rightButtonText=rechte Schaltfl\u00E4che
+SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
 # Used for Isindex
 IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
 InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties
index 41c7651..77c50d5 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Archivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Directorio
-FileChooser.newFolderErrorText=Se ha producido un error durante la creaci\u00F3n de carpetas
+FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Directorio
+FileChooser.newFolderError.textAndMnemonic=Se ha producido un error durante la creaci\u00F3n de carpetas
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Todos los Archivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.saveButtonText=Guardar
-FileChooser.openButtonText=Abrir
-FileChooser.saveDialogTitleText=Guardar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Actualizar
-FileChooser.helpButtonText=Ayuda
-FileChooser.directoryOpenButtonText=Abrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Guardar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Actualizar
+FileChooser.helpButton.textAndMnemonic=Ayuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Guardar
-FileChooser.openTitleText=Abrir
-FileChooser.newFolderExistsErrorText=Ya existe ese nombre
-FileChooser.chooseButtonText=Seleccionar
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Guardar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ya existe ese nombre
+FileChooser.chooseButton.textAndMnemonic=Seleccionar
 
-FileChooser.newFolderButtonText=Nueva Carpeta
-FileChooser.newFolderTitleText=Nueva Carpeta
-FileChooser.fileNameLabelText=Archivo:
-FileChooser.saveDialogFileNameLabelText=Guardar como:
-FileChooser.filesOfTypeLabelText=Formato de Archivo:
+FileChooser.newFolderButton.textAndMnemonic=Nueva Carpeta
+FileChooser.newFolderTitle.textAndMnemonic=Nueva Carpeta
+FileChooser.fileNameLabel.textAndMnemonic=Archivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Guardar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato de Archivo:
 
 FileChooser.desktopName=Escritorio
-FileChooser.newFolderPromptText=Nombre de la Nueva Carpeta:
+FileChooser.newFolderPrompt.textAndMnemonic=Nombre de la Nueva Carpeta:
 FileChooser.untitledFolderName=carpeta sin t\u00EDtulo
 FileChooser.untitledFileName=sin t\u00EDtulo
-FileChooser.createButtonText=Crear
+FileChooser.createButton.textAndMnemonic=Crear
 
-FileChooser.byDateText=Fecha de Modificaci\u00F3n
-FileChooser.byNameText=Nombre
+FileChooser.byDate.textAndMnemonic=Fecha de Modificaci\u00F3n
+FileChooser.by.textAndMnemonic=Nombre
 FileChooser.newFolderAccessibleName=Nueva Carpeta
 
 FileChooser.mac.newFolder=carpeta sin t\u00EDtulo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Vista Previa
-ColorChooser.okText=Aceptar
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Restablecer
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Ejemplo  Texto de Ejemplo
-ColorChooser.swatchesNameText=Muestras
-ColorChooser.swatchesMnemonic=85
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Reciente:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rojo
-ColorChooser.rgbRedMnemonic=74
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=90
+ColorChooser.preview.textAndMnemonic=Vista Previa
+ColorChooser.ok.textAndMnemonic=Aceptar
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Restablecer
+ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
+ColorChooser.swatches.textAndMnemonic=M&uestras
+ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&jo
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=A&zul
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=S\u00ED
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Seleccionar una Opci\u00F3n
+OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=Aceptar
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensaje
+OptionPane.messageDialog.titleAndMnemonic=Mensaje
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impresi\u00F3n
-PrintingDialog.titleAbortingText=Impresi\u00F3n (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
+PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
 
-PrintingDialog.contentInitialText=Impresi\u00F3n en curso...
+PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina {0} impresa...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
 
-PrintingDialog.contentAbortingText=Abortando la impresi\u00F3n...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impresi\u00F3n
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Cerrar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tama\u00F1o
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Cerrar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Enviar Consulta
-FormView.resetButtonText=Restablecer
-FormView.browseFileButtonText=Examinar...
+FormView.submitButton.textAndMnemonic=Enviar Consulta
+FormView.resetButton.textAndMnemonic=Restablecer
+FormView.browseFileButton.textAndMnemonic=Examinar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=cambio de estilo
-AbstractDocument.additionText=adici\u00F3n
-AbstractDocument.deletionText=supresi\u00F3n
-AbstractDocument.undoText=Deshacer
-AbstractDocument.redoText=Rehacer
+AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
+AbstractDocument.addition.textAndMnemonic=adici\u00F3n
+AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.undo.textAndMnemonic=Deshacer
+AbstractDocument.redo.textAndMnemonic=Rehacer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=hacer clic
+AbstractButton.click.textAndMnemonic=hacer clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Deshacer
-AbstractUndoableEdit.redoText=Rehacer
+AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
+AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progreso...
+ProgressMonitor.progress.textAndMnemonic=Progreso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00F3n: izquierda
-SplitPane.rightButtonText=bot\u00F3n: derecha
+SplitPane.leftButton.textAndMnemonic=bot\u00F3n: izquierda
+SplitPane.rightButton.textAndMnemonic=bot\u00F3n: derecha
 # Used for Isindex
 IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties
index a7302bd..7774ee6 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Fichier g\u00E9n\u00E9rique
-FileChooser.directoryDescriptionText=R\u00E9pertoire
-FileChooser.newFolderErrorText=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
+FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Tous les fichiers
-FileChooser.cancelButtonText=Annuler
-FileChooser.saveButtonText=Enregistrer
-FileChooser.openButtonText=Ouvrir
-FileChooser.saveDialogTitleText=Enregistrer
-FileChooser.openDialogTitleText=Ouvrir
-FileChooser.updateButtonText=Mettre \u00E0 jour
-FileChooser.helpButtonText=Aide
-FileChooser.directoryOpenButtonText=Ouvrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.cancelButton.textAndMnemonic=Annuler
+FileChooser.saveButton.textAndMnemonic=Enregistrer
+FileChooser.openButton.textAndMnemonic=Ouvrir
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
+FileChooser.helpButton.textAndMnemonic=Aide
+FileChooser.directoryOpenButton.textAndMnemonic=Ouvrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Enregistrer
-FileChooser.openTitleText=Ouvrir
-FileChooser.newFolderExistsErrorText=Ce nom est d\u00E9j\u00E0 utilis\u00E9
-FileChooser.chooseButtonText=Choisir
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Enregistrer
+FileChooser.openTitle.textAndMnemonic=Ouvrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ce nom est d\u00E9j\u00E0 utilis\u00E9
+FileChooser.chooseButton.textAndMnemonic=Choisir
 
-FileChooser.newFolderButtonText=Nouveau dossier
-FileChooser.newFolderTitleText=Nouveau dossier
-FileChooser.fileNameLabelText=Fichier :
-FileChooser.saveDialogFileNameLabelText=Enregistrer sous :
-FileChooser.filesOfTypeLabelText=Format de fichier :
+FileChooser.newFolderButton.textAndMnemonic=Nouveau dossier
+FileChooser.newFolderTitle.textAndMnemonic=Nouveau dossier
+FileChooser.fileNameLabel.textAndMnemonic=Fichier :
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Enregistrer sous :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Format de fichier :
 
 FileChooser.desktopName=Bureau
-FileChooser.newFolderPromptText=Nom du nouveau dossier :
+FileChooser.newFolderPrompt.textAndMnemonic=Nom du nouveau dossier :
 FileChooser.untitledFolderName=dossier sans titre
 FileChooser.untitledFileName=sans titre
-FileChooser.createButtonText=Cr\u00E9er
+FileChooser.createButton.textAndMnemonic=Cr\u00E9er
 
-FileChooser.byDateText=Date de modification
-FileChooser.byNameText=Nom
+FileChooser.byDate.textAndMnemonic=Date de modification
+FileChooser.by.textAndMnemonic=Nom
 FileChooser.newFolderAccessibleName=Nouveau dossier
 
 FileChooser.mac.newFolder=dossier sans titre
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Aper\u00E7u
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annuler
-ColorChooser.resetText=R\u00E9initialiser
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Echantillon de texte  Echantillon de texte
-ColorChooser.swatchesNameText=Echantillons
-ColorChooser.swatchesMnemonic=69
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Dernier :
-ColorChooser.hsbNameText=TSL
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=84
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=T
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=L
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=V
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RVB
-ColorChooser.rgbMnemonic=86
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rouge
-ColorChooser.rgbRedMnemonic=79
-ColorChooser.rgbGreenText=Vert
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Bleu
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annuler
+ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
+ColorChooser.swatches.textAndMnemonic=&Echantillons
+ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
+ColorChooser.hsb.textAndMnemonic=&TSL
+ColorChooser.hsbHue.textAndMnemonic=T
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=V
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&VB
+ColorChooser.rgbRed.textAndMnemonic=R&ouge
+ColorChooser.rgbGreen.textAndMnemonic=&Vert
+ColorChooser.rgbBlue.textAndMnemonic=&Bleu
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Oui
-OptionPane.yesButtonMnemonic=79
-OptionPane.noButtonText=Non
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annuler
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=S\u00E9lectionner une option
+OptionPane.yesButton.textAndMnemonic=&Oui
+OptionPane.noButton.textAndMnemonic=&Non
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annuler
+OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entr\u00E9e
+OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Message
+OptionPane.messageDialog.titleAndMnemonic=Message
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impression
-PrintingDialog.titleAbortingText=Impression (abandon)
+PrintingDialog.titleProgress.textAndMnemonic=Impression
+PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
 
-PrintingDialog.contentInitialText=Impression en cours...
+PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Page {0} imprim\u00E9e...
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
 
-PrintingDialog.contentAbortingText=Abandon de l'impression...
+PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
 
-PrintingDialog.abortButtonText=Abandonner
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abandonner l'impression
+PrintingDialog.abortButton.textAndMnemonic=&Abandonner
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=R\u00E9duire
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Fermer
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurer
-InternalFrameTitlePane.moveButtonText=D\u00E9placer
-InternalFrameTitlePane.sizeButtonText=Taille
-InternalFrameTitlePane.minimizeButtonText=R\u00E9duire
-InternalFrameTitlePane.maximizeButtonText=Agrandir
-InternalFrameTitlePane.closeButtonText=Fermer
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
+InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Soumettre la requ\u00EAte
-FormView.resetButtonText=R\u00E9initialiser
-FormView.browseFileButtonText=Parcourir...
+FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
+FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.browseFileButton.textAndMnemonic=Parcourir...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modification de style
-AbstractDocument.additionText=ajout
-AbstractDocument.deletionText=suppression
-AbstractDocument.undoText=Annuler
-AbstractDocument.redoText=R\u00E9tablir
+AbstractDocument.styleChange.textAndMnemonic=modification de style
+AbstractDocument.addition.textAndMnemonic=ajout
+AbstractDocument.deletion.textAndMnemonic=suppression
+AbstractDocument.undo.textAndMnemonic=Annuler
+AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=cliquer
+AbstractButton.click.textAndMnemonic=cliquer
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annuler
-AbstractUndoableEdit.redoText=R\u00E9tablir
+AbstractUndoableEdit.undo.textAndMnemonic=Annuler
+AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progression...
+ProgressMonitor.progress.textAndMnemonic=Progression...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bouton gauche
-SplitPane.rightButtonText=bouton droit
+SplitPane.leftButton.textAndMnemonic=bouton gauche
+SplitPane.rightButton.textAndMnemonic=bouton droit
 # Used for Isindex
 IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties
index ed1e14c..3114dd7 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=File generico
-FileChooser.directoryDescriptionText=Directory
-FileChooser.newFolderErrorText=Si \u00E8 verificato un errore durante la creazione della cartella
+FileChooser.fileDescription.textAndMnemonic=File generico
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Si \u00E8 verificato un errore durante la creazione della cartella
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Tutti i file
-FileChooser.cancelButtonText=Annulla
-FileChooser.saveButtonText=Salva
-FileChooser.openButtonText=Apri
-FileChooser.saveDialogTitleText=Salva
-FileChooser.openDialogTitleText=Apri
-FileChooser.updateButtonText=Aggiorna
-FileChooser.helpButtonText=?
-FileChooser.directoryOpenButtonText=Apri
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.cancelButton.textAndMnemonic=Annulla
+FileChooser.saveButton.textAndMnemonic=Salva
+FileChooser.openButton.textAndMnemonic=Apri
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.updateButton.textAndMnemonic=Aggiorna
+FileChooser.helpButton.textAndMnemonic=?
+FileChooser.directoryOpenButton.textAndMnemonic=Apri
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Salva
-FileChooser.openTitleText=Apri
-FileChooser.newFolderExistsErrorText=Il nome \u00E8 gi\u00E0 stato assegnato
-FileChooser.chooseButtonText=Scegli
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salva
+FileChooser.openTitle.textAndMnemonic=Apri
+FileChooser.newFolderExistsError.textAndMnemonic=Il nome \u00E8 gi\u00E0 stato assegnato
+FileChooser.chooseButton.textAndMnemonic=Scegli
 
-FileChooser.newFolderButtonText=Nuova cartella
-FileChooser.newFolderTitleText=Nuova cartella
-FileChooser.fileNameLabelText=File:
-FileChooser.saveDialogFileNameLabelText=Salva con nome:
-FileChooser.filesOfTypeLabelText=Formato file:
+FileChooser.newFolderButton.textAndMnemonic=Nuova cartella
+FileChooser.newFolderTitle.textAndMnemonic=Nuova cartella
+FileChooser.fileNameLabel.textAndMnemonic=File:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salva con nome:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato file:
 
 FileChooser.desktopName=Desktop
-FileChooser.newFolderPromptText=Nome nuova cartella:
+FileChooser.newFolderPrompt.textAndMnemonic=Nome nuova cartella:
 FileChooser.untitledFolderName=cartella senza titolo
 FileChooser.untitledFileName=senza titolo
-FileChooser.createButtonText=Crea
+FileChooser.createButton.textAndMnemonic=Crea
 
-FileChooser.byDateText=Data modifica
-FileChooser.byNameText=Nome
+FileChooser.byDate.textAndMnemonic=Data modifica
+FileChooser.by.textAndMnemonic=Nome
 FileChooser.newFolderAccessibleName=Nuova cartella
 
 FileChooser.mac.newFolder=cartella senza titolo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Anteprima
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annulla
-ColorChooser.resetText=Reimposta
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=69
-ColorChooser.sampleText=Testo di prova          Testo di prova
-ColorChooser.swatchesNameText=Colori campione
-ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Recenti:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Rosso
-ColorChooser.rgbRedMnemonic=82
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=68
-ColorChooser.rgbBlueText=Blu
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=Anteprima
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annulla
+ColorChooser.reset.textAndMnemonic=R&eimposta
+ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
+ColorChooser.swatches.textAndMnemonic=Colori ca&mpione
+ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Rosso
+ColorChooser.rgbGreen.textAndMnemonic=Ver&de
+ColorChooser.rgbBlue.textAndMnemonic=&Blu
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=S\u00EC
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annulla
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Selezionare una opzione
+OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annulla
+OptionPane.title.textAndMnemonic=Selezionare una opzione
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Input
+OptionPane.inputDialog.titleAndMnemonic=Input
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Messaggio
+OptionPane.messageDialog.titleAndMnemonic=Messaggio
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Stampa in corso
-PrintingDialog.titleAbortingText=Stampa in corso (operazione interrotta)
+PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
+PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
 
-PrintingDialog.contentInitialText=Stampa in corso...
+PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Pagina stampata {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
 
-PrintingDialog.contentAbortingText=Interruzione della stampa in corso...
+PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa in corso...
 
-PrintingDialog.abortButtonText=Interrompi
-PrintingDialog.abortButtonMnemonic=73
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Interrompe la stampa
+PrintingDialog.abortButton.textAndMnemonic=&Interrompi
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompe la stampa
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Riduce a icona
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Chiude
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Ripristina
-InternalFrameTitlePane.moveButtonText=Sposta
-InternalFrameTitlePane.sizeButtonText=Dimensiona
-InternalFrameTitlePane.minimizeButtonText=Riduci a icona
-InternalFrameTitlePane.maximizeButtonText=Ingrandisci
-InternalFrameTitlePane.closeButtonText=Chiudi
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
+InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensiona
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
+InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Sottometti query
-FormView.resetButtonText=Reimposta
-FormView.browseFileButtonText=Sfoglia...
+FormView.submitButton.textAndMnemonic=Sottometti query
+FormView.resetButton.textAndMnemonic=Reimposta
+FormView.browseFileButton.textAndMnemonic=Sfoglia...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modifica di stile
-AbstractDocument.additionText=aggiunta
-AbstractDocument.deletionText=eliminazione
-AbstractDocument.undoText=Annulla
-AbstractDocument.redoText=Ripeti
+AbstractDocument.styleChange.textAndMnemonic=modifica di stile
+AbstractDocument.addition.textAndMnemonic=aggiunta
+AbstractDocument.deletion.textAndMnemonic=eliminazione
+AbstractDocument.undo.textAndMnemonic=Annulla
+AbstractDocument.redo.textAndMnemonic=Ripeti
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=fare clic
+AbstractButton.click.textAndMnemonic=fare clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annulla
-AbstractUndoableEdit.redoText=Ripeti
+AbstractUndoableEdit.undo.textAndMnemonic=Annulla
+AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=In corso...
+ProgressMonitor.progress.textAndMnemonic=In corso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=pulsante sinistro
-SplitPane.rightButtonText=pulsante destro
+SplitPane.leftButton.textAndMnemonic=pulsante sinistro
+SplitPane.rightButton.textAndMnemonic=pulsante destro
 # Used for Isindex
 IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
 InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
 InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties
index c3caba9..07e6a0e 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
-FileChooser.directoryDescriptionText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-FileChooser.newFolderErrorText=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
+FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+FileChooser.newFolderError.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.saveButtonText=\u4FDD\u5B58
-FileChooser.openButtonText=\u958B\u304F
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.updateButtonText=\u66F4\u65B0
-FileChooser.helpButtonText=\u30D8\u30EB\u30D7
-FileChooser.directoryOpenButtonText=\u958B\u304F
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u304F
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\u4FDD\u5B58
-FileChooser.openTitleText=\u958B\u304F
-FileChooser.newFolderExistsErrorText=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-FileChooser.chooseButtonText=\u9078\u629E
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openTitle.textAndMnemonic=\u958B\u304F
+FileChooser.newFolderExistsError.textAndMnemonic=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+FileChooser.chooseButton.textAndMnemonic=\u9078\u629E
 
-FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderTitleText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB:
-FileChooser.saveDialogFileNameLabelText=\u5225\u540D\u4FDD\u5B58:
-FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u5225\u540D\u4FDD\u5B58:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
 
 FileChooser.desktopName=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7
-FileChooser.newFolderPromptText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
 FileChooser.untitledFolderName=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
 FileChooser.untitledFileName=\u7121\u984C
-FileChooser.createButtonText=\u4F5C\u6210
+FileChooser.createButton.textAndMnemonic=\u4F5C\u6210
 
-FileChooser.byDateText=\u5909\u66F4\u65E5
-FileChooser.byNameText=\u540D\u524D
+FileChooser.byDate.textAndMnemonic=\u5909\u66F4\u65E5
+FileChooser.by.textAndMnemonic=\u540D\u524D
 FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
 
 FileChooser.mac.newFolder=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC
-ColorChooser.okText=OK
-ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u30EA\u30BB\u30C3\u30C8(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatchesNameText=\u30B5\u30F3\u30D7\u30EB(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\u6700\u65B0:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\u8D64(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DD1(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u9752(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
+ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
+ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u306F\u3044(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u3044\u3044\u3048(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
+OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u5165\u529B
+OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u30E1\u30C3\u30BB\u30FC\u30B8
+OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
 
-PrintingDialog.contentInitialText=\u5370\u5237\u4E2D...
+PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
 
-PrintingDialog.contentAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u5370\u5237\u306E\u4E2D\u6B62
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u5FA9\u5143
-InternalFrameTitlePane.moveButtonText=\u79FB\u52D5
-InternalFrameTitlePane.sizeButtonText=\u30B5\u30A4\u30BA
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u9589\u3058\u308B
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButtonText=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButtonText=\u53C2\u7167...
+FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
+FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
+FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.additionText=\u8FFD\u52A0
-AbstractDocument.deletionText=\u524A\u9664
-AbstractDocument.undoText=\u5143\u306B\u623B\u3059
-AbstractDocument.redoText=\u3084\u308A\u76F4\u3057
+AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
+AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
+AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u30AF\u30EA\u30C3\u30AF
+AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redoText=\u3084\u308A\u76F4\u3057
+AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u9032\u884C\u4E2D...
+ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButtonText=\u53F3\u30DC\u30BF\u30F3
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
+SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
 # Used for Isindex
 IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties
index 1a8611d..3fbfbe7 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\uC77C\uBC18 \uD30C\uC77C
-FileChooser.directoryDescriptionText=\uB514\uB809\uD1A0\uB9AC
-FileChooser.newFolderErrorText=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
+FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
+FileChooser.newFolderError.textAndMnemonic=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButtonText=\uCDE8\uC18C
-FileChooser.saveButtonText=\uC800\uC7A5
-FileChooser.openButtonText=\uC5F4\uAE30
-FileChooser.saveDialogTitleText=\uC800\uC7A5
-FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.updateButtonText=\uAC31\uC2E0
-FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButtonText=\uC5F4\uAE30
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
+FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
+FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
+FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
+FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\uC800\uC7A5
-FileChooser.openTitleText=\uC5F4\uAE30
-FileChooser.newFolderExistsErrorText=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
-FileChooser.chooseButtonText=\uC120\uD0DD
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.newFolderExistsError.textAndMnemonic=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
+FileChooser.chooseButton.textAndMnemonic=\uC120\uD0DD
 
-FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderTitleText=\uC0C8 \uD3F4\uB354
-FileChooser.fileNameLabelText=\uD30C\uC77C:
-FileChooser.saveDialogFileNameLabelText=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
-FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uD615\uC2DD:
+FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderTitle.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uD615\uC2DD:
 
 FileChooser.desktopName=\uB370\uC2A4\uD06C\uD1B1
-FileChooser.newFolderPromptText=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
+FileChooser.newFolderPrompt.textAndMnemonic=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
 FileChooser.untitledFolderName=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
 FileChooser.untitledFileName=\uC81C\uBAA9 \uC5C6\uC74C
-FileChooser.createButtonText=\uC0DD\uC131
+FileChooser.createButton.textAndMnemonic=\uC0DD\uC131
 
-FileChooser.byDateText=\uC218\uC815\uB41C \uB0A0\uC9DC
-FileChooser.byNameText=\uC774\uB984
+FileChooser.byDate.textAndMnemonic=\uC218\uC815\uB41C \uB0A0\uC9DC
+FileChooser.by.textAndMnemonic=\uC774\uB984
 FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
 
 FileChooser.mac.newFolder=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.okText=\uD655\uC778
-ColorChooser.cancelText=\uCDE8\uC18C
-ColorChooser.resetText=\uC7AC\uC124\uC815(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatchesNameText=\uACAC\uBCF8(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\uCD5C\uADFC \uBAA9\uB85D:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\uB179\uC0C9(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
+ColorChooser.ok.textAndMnemonic=\uD655\uC778
+ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
+ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
+ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
+ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\uC608(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\uCDE8\uC18C
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\uC635\uC158 \uC120\uD0DD
+OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
+OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778
+OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\uC785\uB825
+OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\uBA54\uC2DC\uC9C0
+OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\uC778\uC1C4
-PrintingDialog.titleAbortingText=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
+PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
 
-PrintingDialog.contentInitialText=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
 
-PrintingDialog.contentAbortingText=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
 
-PrintingDialog.abortButtonText=\uC911\uB2E8(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\uC778\uC1C4 \uC911\uB2E8
+PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=\uB2EB\uAE30
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\uBCF5\uC6D0
-InternalFrameTitlePane.moveButtonText=\uC774\uB3D9
-InternalFrameTitlePane.sizeButtonText=\uD06C\uAE30
-InternalFrameTitlePane.minimizeButtonText=\uCD5C\uC18C\uD654
-InternalFrameTitlePane.maximizeButtonText=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonText=\uB2EB\uAE30
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
+InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButtonText=\uC7AC\uC124\uC815
-FormView.browseFileButtonText=\uCC3E\uC544\uBCF4\uAE30...
+FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
+FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
+FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.additionText=\uCD94\uAC00
-AbstractDocument.deletionText=\uC0AD\uC81C
-AbstractDocument.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redoText=\uC7AC\uC2E4\uD589
+AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
+AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
+AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
+AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\uB204\uB974\uAE30
+AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redoText=\uC7AC\uC2E4\uD589
+AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\uC9C4\uD589...
+ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButtonText=\uC624\uB978\uCABD \uB2E8\uCD94
+SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
+SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
 # Used for Isindex
 IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
 InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
 InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
index 2b8763e..3c4ca83 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Arquivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Diret\u00F3rio
-FileChooser.newFolderErrorText=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
+FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.newFolderError.textAndMnemonic=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Todos os Arquivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.saveButtonText=Salvar
-FileChooser.openButtonText=Abrir
-FileChooser.saveDialogTitleText=Salvar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Atualizar
-FileChooser.helpButtonText=Ajuda
-FileChooser.directoryOpenButtonText=Abrir
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Salvar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Atualizar
+FileChooser.helpButton.textAndMnemonic=Ajuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Salvar
-FileChooser.openTitleText=Abrir
-FileChooser.newFolderExistsErrorText=Este nome j\u00E1 foi utilizado
-FileChooser.chooseButtonText=Escolher
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salvar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Este nome j\u00E1 foi utilizado
+FileChooser.chooseButton.textAndMnemonic=Escolher
 
-FileChooser.newFolderButtonText=Nova Pasta
-FileChooser.newFolderTitleText=Nova Pasta
-FileChooser.fileNameLabelText=Arquivo:
-FileChooser.saveDialogFileNameLabelText=Salvar como:
-FileChooser.filesOfTypeLabelText=Formato do Arquivo:
+FileChooser.newFolderButton.textAndMnemonic=Nova Pasta
+FileChooser.newFolderTitle.textAndMnemonic=Nova Pasta
+FileChooser.fileNameLabel.textAndMnemonic=Arquivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salvar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato do Arquivo:
 
 FileChooser.desktopName=\u00C1rea de Trabalho
-FileChooser.newFolderPromptText=Nome da nova pasta:
+FileChooser.newFolderPrompt.textAndMnemonic=Nome da nova pasta:
 FileChooser.untitledFolderName=pasta sem t\u00EDtulo
 FileChooser.untitledFileName=sem t\u00EDtulo
-FileChooser.createButtonText=Criar
+FileChooser.createButton.textAndMnemonic=Criar
 
-FileChooser.byDateText=Data da Modifica\u00E7\u00E3o
-FileChooser.byNameText=Nome
+FileChooser.byDate.textAndMnemonic=Data da Modifica\u00E7\u00E3o
+FileChooser.by.textAndMnemonic=Nome
 FileChooser.newFolderAccessibleName=Nova Pasta
 
 FileChooser.mac.newFolder=pasta sem t\u00EDtulo
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Visualizar
-ColorChooser.okText=OK
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Redefinir
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Amostra Texto de Amostra
-ColorChooser.swatchesNameText=Amostras
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Recente:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=Vermelho
-ColorChooser.rgbRedMnemonic=86
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=65
+ColorChooser.preview.textAndMnemonic=Visualizar
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Redefinir
+ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
+ColorChooser.swatches.textAndMnemonic=Amo&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Recente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Vermelho
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=&Azul
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Sim
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=N\u00E3o
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o
+OptionPane.yesButton.textAndMnemonic=&Sim
+OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensagem
+OptionPane.messageDialog.titleAndMnemonic=Mensagem
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impress\u00E3o
-PrintingDialog.titleAbortingText=Impress\u00E3o (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
+PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
 
-PrintingDialog.contentInitialText=Impress\u00E3o em andamento...
+PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina impressa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
 
-PrintingDialog.contentAbortingText=Abortando impress\u00E3o...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impress\u00E3o
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=Fechar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tamanho
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Fechar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Submeter Consulta
-FormView.resetButtonText=Redefinir
-FormView.browseFileButtonText=Procurar...
+FormView.submitButton.textAndMnemonic=Submeter Consulta
+FormView.resetButton.textAndMnemonic=Redefinir
+FormView.browseFileButton.textAndMnemonic=Procurar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=altera\u00E7\u00E3o de estilo
-AbstractDocument.additionText=adi\u00E7\u00E3o
-AbstractDocument.deletionText=dele\u00E7\u00E3o
-AbstractDocument.undoText=Desfazer
-AbstractDocument.redoText=Refazer
+AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
+AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
+AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
+AbstractDocument.undo.textAndMnemonic=Desfazer
+AbstractDocument.redo.textAndMnemonic=Refazer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=clicar
+AbstractButton.click.textAndMnemonic=clicar
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Desfazer
-AbstractUndoableEdit.redoText=Refazer
+AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
+AbstractUndoableEdit.redo.textAndMnemonic=Refazer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Andamento...
+ProgressMonitor.progress.textAndMnemonic=Andamento...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00E3o esquerdo
-SplitPane.rightButtonText=bot\u00E3o direito
+SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
+SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
 # Used for Isindex
 IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Fechar
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties
index 013588d..2a7383f 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Generisk fil
-FileChooser.directoryDescriptionText=Katalog
-FileChooser.newFolderErrorText=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
+FileChooser.fileDescription.textAndMnemonic=Generisk fil
+FileChooser.directoryDescription.textAndMnemonic=Katalog
+FileChooser.newFolderError.textAndMnemonic=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=Alla filer
-FileChooser.cancelButtonText=Avbryt
-FileChooser.saveButtonText=Spara
-FileChooser.openButtonText=\u00D6ppna
-FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00D6ppna
-FileChooser.updateButtonText=Uppdatera
-FileChooser.helpButtonText=Hj\u00E4lp
-FileChooser.directoryOpenButtonText=\u00D6ppna
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.cancelButton.textAndMnemonic=Avbryt
+FileChooser.saveButton.textAndMnemonic=Spara
+FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.updateButton.textAndMnemonic=Uppdatera
+FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=Spara
-FileChooser.openTitleText=\u00D6ppna
-FileChooser.newFolderExistsErrorText=Namnet finns redan
-FileChooser.chooseButtonText=V\u00E4lj
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Spara
+FileChooser.openTitle.textAndMnemonic=\u00D6ppna
+FileChooser.newFolderExistsError.textAndMnemonic=Namnet finns redan
+FileChooser.chooseButton.textAndMnemonic=V\u00E4lj
 
-FileChooser.newFolderButtonText=Ny mapp
-FileChooser.newFolderTitleText=Ny mapp
-FileChooser.fileNameLabelText=Fil:
-FileChooser.saveDialogFileNameLabelText=Spara som:
-FileChooser.filesOfTypeLabelText=Filformat:
+FileChooser.newFolderButton.textAndMnemonic=Ny mapp
+FileChooser.newFolderTitle.textAndMnemonic=Ny mapp
+FileChooser.fileNameLabel.textAndMnemonic=Fil:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Spara som:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
 
 FileChooser.desktopName=Klientdator
-FileChooser.newFolderPromptText=Namn p\u00E5 ny mapp:
+FileChooser.newFolderPrompt.textAndMnemonic=Namn p\u00E5 ny mapp:
 FileChooser.untitledFolderName=namnl\u00F6s mapp
 FileChooser.untitledFileName=namnl\u00F6s
-FileChooser.createButtonText=Skapa
+FileChooser.createButton.textAndMnemonic=Skapa
 
-FileChooser.byDateText=\u00C4ndringsdatum
-FileChooser.byNameText=Namn
+FileChooser.byDate.textAndMnemonic=\u00C4ndringsdatum
+FileChooser.by.textAndMnemonic=Namn
 FileChooser.newFolderAccessibleName=Ny mapp
 
 FileChooser.mac.newFolder=namnl\u00F6s mapp
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=F\u00F6rhandsgranska
-ColorChooser.okText=OK
-ColorChooser.cancelText=Avbryt
-ColorChooser.resetText=\u00C5terst\u00E4ll
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=84
-ColorChooser.sampleText=Exempeltext  Exempeltext
-ColorChooser.swatchesNameText=Prov
-ColorChooser.swatchesMnemonic=80
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=Senaste:
-ColorChooser.hsbNameText=HSB
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=R\u00F6d
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=Gr\u00F6n
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Bl\u00E5
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=F\u00F6rhandsgranska
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Avbryt
+ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
+ColorChooser.swatches.textAndMnemonic=&Prov
+ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
+ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=Ja
-OptionPane.yesButtonMnemonic=74
-OptionPane.noButtonText=Nej
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Avbryt
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=V\u00E4lj ett alternativ
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nej
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Avbryt
+OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Indata
+OptionPane.inputDialog.titleAndMnemonic=Indata
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Meddelande
+OptionPane.messageDialog.titleAndMnemonic=Meddelande
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Skriver ut
-PrintingDialog.titleAbortingText=Skriver ut (avbryter)
+PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
+PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
 
-PrintingDialog.contentInitialText=Utskrift p\u00E5g\u00E5r...
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Utskriven sida {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}...
 
-PrintingDialog.contentAbortingText=Utskriften avbryts...
+PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts...
 
-PrintingDialog.abortButtonText=Avbryt
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Avbryt utskrift
+PrintingDialog.abortButton.textAndMnemonic=&Avbryt
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimera
@@ -160,42 +138,42 @@
 InternalFrame.closeButtonToolTip=St\u00E4ng
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u00C5terst\u00E4ll
-InternalFrameTitlePane.moveButtonText=Flytta
-InternalFrameTitlePane.sizeButtonText=Storlek
-InternalFrameTitlePane.minimizeButtonText=Minimera
-InternalFrameTitlePane.maximizeButtonText=Maximera
-InternalFrameTitlePane.closeButtonText=St\u00E4ng
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
+InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
+InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Skicka fr\u00E5ga
-FormView.resetButtonText=\u00C5terst\u00E4ll
-FormView.browseFileButtonText=Bl\u00E4ddra...
+FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
+FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
+FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=format\u00E4ndring
-AbstractDocument.additionText=till\u00E4gg
-AbstractDocument.deletionText=borttagning
-AbstractDocument.undoText=\u00C5ngra
-AbstractDocument.redoText=G\u00F6r om
+AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
+AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.deletion.textAndMnemonic=borttagning
+AbstractDocument.undo.textAndMnemonic=\u00C5ngra
+AbstractDocument.redo.textAndMnemonic=G\u00F6r om
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=klicka
+AbstractButton.click.textAndMnemonic=klicka
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u00C5ngra
-AbstractUndoableEdit.redoText=G\u00F6r om
+AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
+AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=v\u00E4xlaPopup
+ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=P\u00E5g\u00E5r...
+ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=v\u00E4nster knapp
-SplitPane.rightButtonText=h\u00F6ger knapp
+SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp
+SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp
 # Used for Isindex
 IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
 
@@ -203,4 +181,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
 InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
index d312375..13ba51a 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\u901A\u7528\u6587\u4EF6
-FileChooser.directoryDescriptionText=\u76EE\u5F55
-FileChooser.newFolderErrorText=\u521B\u5EFA\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
+FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u6587\u4EF6\u5939\u65F6\u51FA\u9519
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.saveButtonText=\u4FDD\u5B58
-FileChooser.openButtonText=\u6253\u5F00
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u6253\u5F00
-FileChooser.updateButtonText=\u66F4\u65B0
-FileChooser.helpButtonText=\u5E2E\u52A9
-FileChooser.directoryOpenButtonText=\u6253\u5F00
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u6253\u5F00
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9
+FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\u4FDD\u5B58
-FileChooser.openTitleText=\u6253\u5F00
-FileChooser.newFolderExistsErrorText=\u8BE5\u540D\u79F0\u5DF2\u88AB\u4F7F\u7528
-FileChooser.chooseButtonText=\u9009\u62E9
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.newFolderExistsError.textAndMnemonic=\u8BE5\u540D\u79F0\u5DF2\u88AB\u4F7F\u7528
+FileChooser.chooseButton.textAndMnemonic=\u9009\u62E9
 
-FileChooser.newFolderButtonText=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderTitleText=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.fileNameLabelText=\u6587\u4EF6:
-FileChooser.saveDialogFileNameLabelText=\u53E6\u5B58\u4E3A:
-FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u683C\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u4E3A: 
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u683C\u5F0F:
 
 FileChooser.desktopName=\u684C\u9762
-FileChooser.newFolderPromptText=\u65B0\u6587\u4EF6\u5939\u7684\u540D\u79F0:
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u6587\u4EF6\u5939\u7684\u540D\u79F0:
 FileChooser.untitledFolderName=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
 FileChooser.untitledFileName=\u65E0\u6807\u9898
-FileChooser.createButtonText=\u521B\u5EFA
+FileChooser.createButton.textAndMnemonic=\u521B\u5EFA
 
-FileChooser.byDateText=\u4FEE\u6539\u65E5\u671F
-FileChooser.byNameText=\u540D\u79F0
+FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.by.textAndMnemonic=\u540D\u79F0
 FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
 
 FileChooser.mac.newFolder=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u9884\u89C8
-ColorChooser.okText=\u786E\u5B9A
-ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u91CD\u7F6E(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatchesNameText=\u6837\u672C(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\u6700\u8FD1:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\u7EA2\u8272(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7EFF\u8272(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u84DD\u8272(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\u9884\u89C8
+ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
+ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
+ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u662F(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u8F93\u5165
+OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u6D88\u606F
+OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u6253\u5370
-PrintingDialog.titleAbortingText=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
 
-PrintingDialog.contentInitialText=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u5DF2\u6253\u5370\u9875 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
 
-PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u6253\u5370
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -160,47 +138,46 @@
 InternalFrame.closeButtonToolTip=\u5173\u95ED
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u8FD8\u539F
-InternalFrameTitlePane.moveButtonText=\u79FB\u52A8
-InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u5173\u95ED
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButtonText=\u91CD\u7F6E
-FormView.browseFileButtonText=\u6D4F\u89C8...
+FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
+FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
+FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u6837\u5F0F\u66F4\u6539
-AbstractDocument.additionText=\u6DFB\u52A0
-AbstractDocument.deletionText=\u5220\u9664
-AbstractDocument.undoText=\u64A4\u6D88
-AbstractDocument.redoText=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
+AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
+AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u5355\u51FB
+AbstractButton.click.textAndMnemonic=\u5355\u51FB
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u64A4\u6D88
-AbstractUndoableEdit.redoText=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u8FDB\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u952E
-SplitPane.rightButtonText=\u53F3\u952E
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
+SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
 # Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
+IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: 
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
-
diff --git a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
index da509b7..a886eda 100644
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
@@ -36,45 +36,45 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=\u4E00\u822C\u6A94\u6848
-FileChooser.directoryDescriptionText=\u76EE\u9304
-FileChooser.newFolderErrorText=\u5EFA\u7ACB\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
+FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
+FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.saveButtonText=\u5132\u5B58
-FileChooser.openButtonText=\u958B\u555F
-FileChooser.saveDialogTitleText=\u5132\u5B58
-FileChooser.openDialogTitleText=\u958B\u555F
-FileChooser.updateButtonText=\u66F4\u65B0
-FileChooser.helpButtonText=\u8AAA\u660E
-FileChooser.directoryOpenButtonText=\u958B\u555F
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u555F
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
 FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
-// Mac-specific strings
-FileChooser.saveTitleText=\u5132\u5B58
-FileChooser.openTitleText=\u958B\u555F
-FileChooser.newFolderExistsErrorText=\u8A72\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528
-FileChooser.chooseButtonText=\u9078\u64C7
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openTitle.textAndMnemonic=\u958B\u555F
+FileChooser.newFolderExistsError.textAndMnemonic=\u8A72\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528
+FileChooser.chooseButton.textAndMnemonic=\u9078\u64C7
 
-FileChooser.newFolderButtonText=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderTitleText=\u65B0\u8CC7\u6599\u593E
-FileChooser.fileNameLabelText=\u6A94\u6848:
-FileChooser.saveDialogFileNameLabelText=\u53E6\u5B58\u65B0\u6A94:
-FileChooser.filesOfTypeLabelText=\u6A94\u6848\u683C\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u65B0\u6A94:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u683C\u5F0F:
 
 FileChooser.desktopName=\u684C\u9762
-FileChooser.newFolderPromptText=\u65B0\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u8CC7\u6599\u593E\u540D\u7A31:
 FileChooser.untitledFolderName=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
 FileChooser.untitledFileName=\u672A\u547D\u540D
-FileChooser.createButtonText=\u5EFA\u7ACB
+FileChooser.createButton.textAndMnemonic=\u5EFA\u7ACB
 
-FileChooser.byDateText=\u4FEE\u6539\u65E5\u671F
-FileChooser.byNameText=\u540D\u7A31
+FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.by.textAndMnemonic=\u540D\u7A31
 FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
 
 FileChooser.mac.newFolder=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
@@ -82,76 +82,54 @@
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u9810\u89BD
-ColorChooser.okText=\u78BA\u5B9A
-ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u91CD\u8A2D(R)
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
-ColorChooser.swatchesNameText=\u8ABF\u8272\u677F(S)
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
-ColorChooser.swatchesRecentText=\u6700\u65B0\u9078\u64C7:
-ColorChooser.hsbNameText=HSB(H)
-# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
-# constant, and an index into the text to render the mnemonic as. The
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
-ColorChooser.rgbNameText=RGB(G)
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
-ColorChooser.rgbRedText=\u7D05(D)
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DA0(N)
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u85CD(B)
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.preview.textAndMnemonic=\u9810\u89BD
+ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
+ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
+ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
 
 ############ OPTION PANE STRINGS #############
-# Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u662F(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-#OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
-#OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u8F38\u5165
+OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u8A0A\u606F
+OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u5217\u5370\u4E2D
-PrintingDialog.titleAbortingText=\u5217\u5370 (\u4E2D\u6B62\u4E2D)
+PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370\u4E2D
+PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62\u4E2D)
 
-PrintingDialog.contentInitialText=\u6B63\u5728\u5217\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u5DF2\u5217\u5370\u7B2C {0} \u9801...
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7B2C {0} \u9801...
 
-PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u5217\u5370
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -160,47 +138,46 @@
 InternalFrame.closeButtonToolTip=\u95DC\u9589
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u5FA9\u539F
-InternalFrameTitlePane.moveButtonText=\u79FB\u52D5
-InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u95DC\u9589
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u9001\u51FA\u67E5\u8A62
-FormView.resetButtonText=\u91CD\u8A2D
-FormView.browseFileButtonText=\u700F\u89BD...
+FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
+FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
+FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u6A23\u5F0F\u8B8A\u66F4
-AbstractDocument.additionText=\u9644\u52A0
-AbstractDocument.deletionText=\u522A\u9664
-AbstractDocument.undoText=\u9084\u539F
-AbstractDocument.redoText=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
+AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
+AbstractDocument.undo.textAndMnemonic=\u9084\u539F
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u6309\u4E00\u4E0B
+AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u9084\u539F
-AbstractUndoableEdit.redoText=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u9032\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u6309\u9215
-SplitPane.rightButtonText=\u53F3\u6309\u9215
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
+SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
 # Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
+IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: 
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
-
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
index cad33b1..a775f98 100644
--- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
@@ -77,7 +77,7 @@
 armed=armado
 busy=ocupado
 checked=selecionado
-collapsed=recolhido
+collapsed=contra\u00EDdo
 editable=edit\u00E1vel
 expandable=expans\u00EDvel
 expanded=expandido
diff --git a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
index 755736a..0a11703 100644
--- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
@@ -27,8 +27,8 @@
 glasspane=\u73BB\u7483\u7A97\u683C
 filechooser=\u6587\u4EF6\u9009\u62E9\u5668
 filler=\u6F0F\u6597
-frame=\u5E27
-internalframe=\u5185\u90E8\u5E27
+frame=\u6846\u67B6
+internalframe=\u5185\u90E8\u6846\u67B6
 label=\u6807\u7B7E
 layeredpane=\u5206\u5C42\u7A97\u683C
 list=\u5217\u8868
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
index e2a242e..e783eee 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
@@ -11,11 +11,11 @@
 
 GTKColorChooserPanel.hue.textAndMnemonic=&Farbton:
 
-GTKColorChooserPanel.red.textAndMnemonic=&Rot:
+GTKColorChooserPanel.red.textAndMnemonic=R&ot:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=S\u00E4ttigung(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=&S\u00E4ttigung:
 
-GTKColorChooserPanel.green.textAndMnemonic=Gr\u00FCn(&G):
+GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00FCn:
 
 GTKColorChooserPanel.value.textAndMnemonic=&Wert:
 
@@ -32,7 +32,7 @@
 FileChooser.newFolderDialog.textAndMnemonic=Ordnername:
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler
 FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
-FileChooser.deleteFileButton.textAndMnemonic=Datei l\u00F6schen(&L)
+FileChooser.deleteFileButton.textAndMnemonic=Datei &l\u00F6schen
 FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen
 FileChooser.cancelButton.textAndMnemonic=&Abbrechen
 FileChooser.saveButton.textAndMnemonic=&OK
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Fehler
 FileChooser.renameFileError.textAndMnemonic=Fehler beim Umbenennen der Datei "{0}" in "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Abbrechen
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
index d94cc43..412938e 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
@@ -13,9 +13,9 @@
 
 GTKColorChooserPanel.red.textAndMnemonic=Ro&jo:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=Saturaci\u00F3n(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturaci\u00F3n:
 
-GTKColorChooserPanel.green.textAndMnemonic=V&erde:
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
 
 GTKColorChooserPanel.value.textAndMnemonic=&Valor:
 
@@ -33,13 +33,13 @@
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error
 FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error al crear el directorio "{0}": no existe dicho archivo o directorio
 FileChooser.deleteFileButton.textAndMnemonic=Su&primir Archivo
-FileChooser.renameFileButton.textAndMnemonic=Cambia&r Nombre de Archivo
+FileChooser.renameFileButton.textAndMnemonic=Cambiar Nomb&re de Archivo
 FileChooser.cancelButton.textAndMnemonic=&Cancelar
 FileChooser.saveButton.textAndMnemonic=&Aceptar
 FileChooser.openButton.textAndMnemonic=&Aceptar
 FileChooser.saveDialogTitle.textAndMnemonic=Guardar
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=Selecci\u00F3n(&S):
+FileChooser.pathLabel.textAndMnemonic=&Selecci\u00F3n:
 FileChooser.filterLabel.textAndMnemonic=Filtro:
 FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
 FileChooser.filesLabel.textAndMnemonic=&Archivos
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Error
 FileChooser.renameFileError.textAndMnemonic=Error al cambiar el nombre del archivo "{0}" a "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&Aceptar
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
index 8013731..380f3d4 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
@@ -6,16 +6,16 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs GTK(&G)
+GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs &GTK
 # mnemonic as a VK_ constant
 
 GTKColorChooserPanel.hue.textAndMnemonic=&Teinte :
 
-GTKColorChooserPanel.red.textAndMnemonic=Rouge\u00A0(&E):
+GTKColorChooserPanel.red.textAndMnemonic=Roug&e\u00A0:
 
 GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation :
 
-GTKColorChooserPanel.green.textAndMnemonic=V&ert :
+GTKColorChooserPanel.green.textAndMnemonic=&Vert :
 
 GTKColorChooserPanel.value.textAndMnemonic=&Valeur :
 
@@ -39,7 +39,7 @@
 FileChooser.openButton.textAndMnemonic=&OK
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.pathLabel.textAndMnemonic=S\u00E9lection (&S):
+FileChooser.pathLabel.textAndMnemonic=&S\u00E9lection :
 FileChooser.filterLabel.textAndMnemonic=Filtre :
 FileChooser.foldersLabel.textAndMnemonic=&Dossiers
 FileChooser.filesLabel.textAndMnemonic=&Fichiers
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Erreur
 FileChooser.renameFileError.textAndMnemonic=Erreur lors du changement de nom du fichier "{0}" en "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Annuler
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
index 01cdac3..c629de5 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
@@ -15,7 +15,7 @@
 
 GTKColorChooserPanel.saturation.textAndMnemonic=&Saturazione:
 
-GTKColorChooserPanel.green.textAndMnemonic=V&erde:
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
 
 GTKColorChooserPanel.value.textAndMnemonic=&Valore:
 
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Errore
 FileChooser.renameFileError.textAndMnemonic=Errore durante la ridenominazione del file "{0}" in "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Annulla
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
index 362f395..5f4343e 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
@@ -35,8 +35,8 @@
 FileChooser.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L)
 FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R)
 FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveButton.textAndMnemonic=OK(&O)
+FileChooser.openButton.textAndMnemonic=OK(&O)
 FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
 FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
 FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S):
@@ -52,4 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC
 FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
index 600a569..c3696a9 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
@@ -52,4 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958
 FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
index e06535f..383fd9f 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
@@ -13,9 +13,9 @@
 
 GTKColorChooserPanel.red.textAndMnemonic=V&ermelho:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=Satura\u00E7\u00E3o(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=&Satura\u00E7\u00E3o:
 
-GTKColorChooserPanel.green.textAndMnemonic=Ver&de:
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
 
 GTKColorChooserPanel.value.textAndMnemonic=&Valor:
 
@@ -39,7 +39,7 @@
 FileChooser.openButton.textAndMnemonic=&OK
 FileChooser.saveDialogTitle.textAndMnemonic=Salvar
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=Sele\u00E7\u00E3o(&S):
+FileChooser.pathLabel.textAndMnemonic=&Sele\u00E7\u00E3o:
 FileChooser.filterLabel.textAndMnemonic=Filtro:
 FileChooser.foldersLabel.textAndMnemonic=&Pastas
 FileChooser.filesLabel.textAndMnemonic=&Arquivos
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Erro
 FileChooser.renameFileError.textAndMnemonic=Erro ao renomear o arquivo "{0}" por "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
index 7137d9d..1737b57 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
@@ -6,22 +6,22 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK-f\u00E4rgv\u00E4ljaren(&G)
+GTKColorChooserPanel.textAndMnemonic=&GTK-f\u00E4rgv\u00E4ljaren
 # mnemonic as a VK_ constant
 
 GTKColorChooserPanel.hue.textAndMnemonic=&Nyans:
 
-GTKColorChooserPanel.red.textAndMnemonic=R\u00F6d(&R):
+GTKColorChooserPanel.red.textAndMnemonic=R&\u00F6d:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=M\u00E4ttnad(&M):
+GTKColorChooserPanel.saturation.textAndMnemonic=&M\u00E4ttnad:
 
-GTKColorChooserPanel.green.textAndMnemonic=Gr\u00F6n(&G):
+GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00F6n:
 
-GTKColorChooserPanel.value.textAndMnemonic=V\u00E4rde(&V):
+GTKColorChooserPanel.value.textAndMnemonic=&V\u00E4rde:
 
-GTKColorChooserPanel.blue.textAndMnemonic=Bl\u00E5(&B):
+GTKColorChooserPanel.blue.textAndMnemonic=&Bl\u00E5:
 
-GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rgnamn(&F):
+GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rg&namn:
 
 
 
@@ -33,7 +33,7 @@
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel
 FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
 FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil
-FileChooser.renameFileButton.textAndMnemonic=\u00C4ndra namn p\u00E5 filen(&R)
+FileChooser.renameFileButton.textAndMnemonic=&\u00C4ndra namn p\u00E5 filen
 FileChooser.cancelButton.textAndMnemonic=&Avbryt
 FileChooser.saveButton.textAndMnemonic=&OK
 FileChooser.openButton.textAndMnemonic=&OK
@@ -41,7 +41,7 @@
 FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
 FileChooser.pathLabel.textAndMnemonic=&Urval:
 FileChooser.filterLabel.textAndMnemonic=Filter:
-FileChooser.foldersLabel.textAndMnemonic=Ma&ppar
+FileChooser.foldersLabel.textAndMnemonic=Map&par
 FileChooser.filesLabel.textAndMnemonic=&Filer
 
 FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare.
@@ -52,8 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=Fel
 FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
 
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Avbryt
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
index 0955509..9e00fe1 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
@@ -29,7 +29,7 @@
 
 FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
 FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
+FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D: 
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF
 FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
 FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L)
@@ -40,7 +40,7 @@
 FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
 FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
 FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S):
-FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668:
+FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668: 
 FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D)
 FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F)
 
@@ -52,4 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF
 FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
 
-
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
index 37c2aa5..9ee492a 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
@@ -9,7 +9,7 @@
 GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G)
 # mnemonic as a VK_ constant
 
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H)\uFF1A
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H):
 
 GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E):
 
@@ -52,4 +52,3 @@
 FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4
 FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
 
-
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index ff90116..41e23d7 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
index bd19773..683429d 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
index ed45642..7793e88 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
index b3267c4..916db67 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index 90e0133..7580131 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
index 9394d43..3dd9ee0 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -85,7 +85,7 @@
 webrowsetimpl.invalidrd = \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+filteredrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. 
 filteredrowsetimpl.absolute = \uC808\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
 filteredrowsetimpl.notallowed = \uC774 \uAC12\uC740 \uD544\uD130\uB97C \uD1B5\uACFC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
index 951dede..cc80e06 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -140,7 +140,7 @@
 #WebRowSetXmlReader exception
 wrsxmlreader.invalidcp = Fim de RowSet atingido. Posi\u00E7\u00E3o inv\u00E1lida do cursor
 wrsxmlreader.readxml = readXML : {0}
-wrsxmlreader.parseerr = ** Erro de Parse : {0} , linha : {1} , uri : {2}
+wrsxmlreader.parseerr = ** Erro de Parsing : {0} , linha : {1} , uri : {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException : {0}
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
index 298503d..089dc28 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index f850f15..596d8ab 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
index 111a11d..cb71246 100644
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
index 1b5fc0d..f3c65bb 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
-FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
-FileChooser.newFolderError.textAndMnemonic=Fehler beim Erstellen eines neuen Ordners
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Ordner kann nicht erstellt werden
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden.
-FileChooser.renameErrorTitle.textAndMnemonic=Fehler beim Umbenennen von Datei oder Ordner
-FileChooser.renameError.textAndMnemonic={0} kann nicht umbenannt werden
-FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
-FileChooser.cancelButton.textAndMnemonic=&Abbrechen
-FileChooser.saveButton.textAndMnemonic=&Speichern
-FileChooser.openButton.textAndMnemonic=\u00D6ffnen(&F)
-FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
-FileChooser.updateButton.textAndMnemonic=A&ktualisieren
-FileChooser.helpButton.textAndMnemonic=&Hilfe
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen(&F)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Neuer Ordner
-FileChooser.win32.newFolder.subsequent=Neuer Ordner ({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen
-FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern
-FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen
-FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Vorschau
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=Abbrechen
-ColorChooser.reset.textAndMnemonic=Zur\u00FCcksetzen(&Z)
-ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
-ColorChooser.swatches.textAndMnemonic=&Swatches
-ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Farbton
-ColorChooser.hsvSaturation.textAndMnemonic=S\u00E4ttigung
-ColorChooser.hsvValue.textAndMnemonic=Wert
-ColorChooser.hsvTransparency.textAndMnemonic=Transparenz
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Farbton
-ColorChooser.hslSaturation.textAndMnemonic=S\u00E4ttigung
-ColorChooser.hslLightness.textAndMnemonic=Helligkeit
-ColorChooser.hslTransparency.textAndMnemonic=Transparenz
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=Ro&t
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FCn(&N)
-ColorChooser.rgbBlue.textAndMnemonic=&Blau
-ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Zyan
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Gelb
-ColorChooser.cmykBlack.textAndMnemonic=Schwarz
-ColorChooser.cmykAlpha.textAndMnemonic=Alpha
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&Ja
-OptionPane.noButton.textAndMnemonic=&Nein
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Abbrechen
-OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Eingabe
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Meldung
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Drucken
-PrintingDialog.titleAborting.textAndMnemonic=Drucken (Abbruch)
-
-PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt...
-
-PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen...
-
-PrintingDialog.abortButton.textAndMnemonic=&Abbruch
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=Minimieren
-InternalFrame.maxButtonToolTip=Maximieren
-InternalFrame.restoreButtonToolTip=Wiederherstellen
-InternalFrame.closeButtonToolTip=Schlie\u00DFen
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
-InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
-InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
-FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
-FormView.browseFileButton.textAndMnemonic=Durchsuchen...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
-AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
-AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
-AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
-AbstractDocument.redo.textAndMnemonic=Wiederherstellen
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=Klicken
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
-AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Fortschritt...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
-SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
-# Used for Isindex
-IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
-InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
-InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
+FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
+FileChooser.newFolderError.textAndMnemonic=Fehler beim Erstellen eines neuen Ordners
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Ordner kann nicht erstellt werden
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden.
+FileChooser.renameErrorTitle.textAndMnemonic=Fehler beim Umbenennen von Datei oder Ordner
+FileChooser.renameError.textAndMnemonic={0} kann nicht umbenannt werden
+FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an. 
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.cancelButton.textAndMnemonic=Abbrechen
+FileChooser.saveButton.textAndMnemonic=Speichern
+FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.updateButton.textAndMnemonic=A&ktualisieren
+FileChooser.helpButton.textAndMnemonic=&Hilfe
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6&ffnen
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Neuer Ordner
+FileChooser.win32.newFolder.subsequent=Neuer Ordner ({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen
+FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Vorschau
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Abbrechen
+ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
+ColorChooser.swatches.textAndMnemonic=&Swatches
+ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Farbton
+ColorChooser.hsvSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hsvValue.textAndMnemonic=Wert
+ColorChooser.hsvTransparency.textAndMnemonic=Transparenz
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Farbton
+ColorChooser.hslSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hslLightness.textAndMnemonic=Helligkeit
+ColorChooser.hslTransparency.textAndMnemonic=Transparenz
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&t
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blau
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Zyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Gelb
+ColorChooser.cmykBlack.textAndMnemonic=Schwarz
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nein
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Abbrechen
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Eingabe
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Meldung
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Drucken
+PrintingDialog.titleAborting.textAndMnemonic=Drucken (Abbruch)
+
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt...
+
+PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abbruch
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimieren
+InternalFrame.maxButtonToolTip=Maximieren
+InternalFrame.restoreButtonToolTip=Wiederherstellen
+InternalFrame.closeButtonToolTip=Schlie\u00DFen
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
+InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
+FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.browseFileButton.textAndMnemonic=Durchsuchen...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
+AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
+AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
+AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.redo.textAndMnemonic=Wiederherstellen
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=Klicken
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Fortschritt...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
+# Used for Isindex
+IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
+InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
index 4164b1e..c19c5fa 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
-FileChooser.directoryDescription.textAndMnemonic=Directorio
-FileChooser.newFolderError.textAndMnemonic=Error al crear una nueva carpeta
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=No se ha podido crear la carpeta
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada.
-FileChooser.renameErrorTitle.textAndMnemonic=Error al cambiar el nombre del archivo o carpeta
-FileChooser.renameError.textAndMnemonic=No se puede cambiar el nombre de {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
-FileChooser.cancelButton.textAndMnemonic=&Cancelar
-FileChooser.saveButton.textAndMnemonic=&Guardar
-FileChooser.openButton.textAndMnemonic=A&brir
-FileChooser.saveDialogTitle.textAndMnemonic=Guardar
-FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.updateButton.textAndMnemonic=Act&ualizar
-FileChooser.helpButton.textAndMnemonic=A&yuda
-FileChooser.directoryOpenButton.textAndMnemonic=&Abrir
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Nueva Carpeta
-FileChooser.win32.newFolder.subsequent=Nueva Carpeta ({0})
-FileChooser.other.newFolder=Nueva Carpeta
-FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de di\u00E1logo para abortar el selector de archivos
-FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado
-FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado
-FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios
-FileChooser.helpButtonToolTip.textAndMnemonic=Ayuda del Selector de Archivos
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir directorio seleccionado
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Presentaci\u00F3n Preliminar
-ColorChooser.ok.textAndMnemonic=Aceptar
-ColorChooser.cancel.textAndMnemonic=Cancelar
-ColorChooser.reset.textAndMnemonic=&Restablecer
-ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
-ColorChooser.swatches.textAndMnemonic=Mue&stras
-ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Matiz
-ColorChooser.hsvSaturation.textAndMnemonic=Saturaci\u00F3n
-ColorChooser.hsvValue.textAndMnemonic=Valor
-ColorChooser.hsvTransparency.textAndMnemonic=Transparencia
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Matiz
-ColorChooser.hslSaturation.textAndMnemonic=Saturaci\u00F3n
-ColorChooser.hslLightness.textAndMnemonic=Iluminaci\u00F3n
-ColorChooser.hslTransparency.textAndMnemonic=Transparencia
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=Ro&jo
-ColorChooser.rgbGreen.textAndMnemonic=&Verde
-ColorChooser.rgbBlue.textAndMnemonic=A&zul
-ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo de Color(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Cian
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Amarillo
-ColorChooser.cmykBlack.textAndMnemonic=Negro
-ColorChooser.cmykAlpha.textAndMnemonic=Alfa
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=S\u00ED(&S)
-OptionPane.noButton.textAndMnemonic=&No
-OptionPane.okButton.textAndMnemonic=Aceptar(&O)
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Entrada
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Mensaje
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
-PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
-
-PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impresa {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
-
-PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=Minimizar
-InternalFrame.maxButtonToolTip=Maximizar
-InternalFrame.restoreButtonToolTip=Restaurar
-InternalFrame.closeButtonToolTip=Cerrar
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
-InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
-InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Enviar Consulta
-FormView.resetButton.textAndMnemonic=Restablecer
-FormView.browseFileButton.textAndMnemonic=Examinar...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
-AbstractDocument.addition.textAndMnemonic=agregaci\u00F3n
-AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
-AbstractDocument.undo.textAndMnemonic=Deshacer
-AbstractDocument.redo.textAndMnemonic=Rehacer
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=hacer clic
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
-AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Progreso...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00F3n izquierdo
-SplitPane.rightButton.textAndMnemonic=bot\u00F3n derecho
-# Used for Isindex
-IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
-InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
-InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Directorio
+FileChooser.newFolderError.textAndMnemonic=Error al crear una nueva carpeta
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=No se ha podido crear la carpeta
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada.
+FileChooser.renameErrorTitle.textAndMnemonic=Error al cambiar el nombre del archivo o carpeta
+FileChooser.renameError.textAndMnemonic=No se puede cambiar el nombre de {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo. 
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Guardar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Act&ualizar
+FileChooser.helpButton.textAndMnemonic=A&yuda
+FileChooser.directoryOpenButton.textAndMnemonic=&Abrir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Nueva Carpeta
+FileChooser.win32.newFolder.subsequent=Nueva Carpeta ({0})
+FileChooser.other.newFolder=Nueva Carpeta
+FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de di\u00E1logo para abortar el selector de archivos
+FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado
+FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios
+FileChooser.helpButtonToolTip.textAndMnemonic=Ayuda del Selector de Archivos
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir directorio seleccionado
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Vista Previa
+ColorChooser.ok.textAndMnemonic=Aceptar
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Restablecer
+ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
+ColorChooser.swatches.textAndMnemonic=Mue&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Matiz
+ColorChooser.hsvSaturation.textAndMnemonic=Saturaci\u00F3n
+ColorChooser.hsvValue.textAndMnemonic=Valor
+ColorChooser.hsvTransparency.textAndMnemonic=Transparencia
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Matiz
+ColorChooser.hslSaturation.textAndMnemonic=Saturaci\u00F3n
+ColorChooser.hslLightness.textAndMnemonic=Iluminaci\u00F3n
+ColorChooser.hslTransparency.textAndMnemonic=Transparencia
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&jo
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=A&zul
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo de Color
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cian
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Amarillo
+ColorChooser.cmykBlack.textAndMnemonic=Negro
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=Aceptar
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entrada
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Mensaje
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
+PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimizar
+InternalFrame.maxButtonToolTip=Maximizar
+InternalFrame.restoreButtonToolTip=Restaurar
+InternalFrame.closeButtonToolTip=Cerrar
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Enviar Consulta
+FormView.resetButton.textAndMnemonic=Restablecer
+FormView.browseFileButton.textAndMnemonic=Examinar...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
+AbstractDocument.addition.textAndMnemonic=agregaci\u00F3n
+AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.undo.textAndMnemonic=Deshacer
+AbstractDocument.redo.textAndMnemonic=Rehacer
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=hacer clic
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
+AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Progreso...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bot\u00F3n izquierdo
+SplitPane.rightButton.textAndMnemonic=bot\u00F3n derecho
+# Used for Isindex
+IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
+InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
index ba0b304..35bae00 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
-FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
-FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de cr\u00E9er le dossier
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
-FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier
-FileChooser.renameError.textAndMnemonic=Impossible de renommer {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
-FileChooser.cancelButton.textAndMnemonic=&Annuler
-FileChooser.saveButton.textAndMnemonic=Enregi&strer
-FileChooser.openButton.textAndMnemonic=&Ouvrir
-FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
-FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour(&U)
-FileChooser.helpButton.textAndMnemonic=&Aide
-FileChooser.directoryOpenButton.textAndMnemonic=&Ouvrir
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Nouveau dossier
-FileChooser.win32.newFolder.subsequent=Nouveau dossier ({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers
-FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9
-FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9
-FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires
-FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Aper\u00E7u
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=Annuler
-ColorChooser.reset.textAndMnemonic=R\u00E9initialiser(&R)
-ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
-ColorChooser.swatches.textAndMnemonic=&Echantillons
-ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
-ColorChooser.hsv.textAndMnemonic=&TSV
-ColorChooser.hsvHue.textAndMnemonic=Teinte
-ColorChooser.hsvSaturation.textAndMnemonic=Saturation
-ColorChooser.hsvValue.textAndMnemonic=Valeur
-ColorChooser.hsvTransparency.textAndMnemonic=Transparence
-ColorChooser.hsl.textAndMnemonic=TS&L
-ColorChooser.hslHue.textAndMnemonic=Teinte
-ColorChooser.hslSaturation.textAndMnemonic=Saturation
-ColorChooser.hslLightness.textAndMnemonic=Lumi\u00E8re
-ColorChooser.hslTransparency.textAndMnemonic=Transparence
-ColorChooser.rgb.textAndMnemonic=R&VB
-ColorChooser.rgbRed.textAndMnemonic=R&ouge
-ColorChooser.rgbGreen.textAndMnemonic=&Vert
-ColorChooser.rgbBlue.textAndMnemonic=&Bleu
-ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=&Code couleur
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Cyan
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Jaune
-ColorChooser.cmykBlack.textAndMnemonic=Noir
-ColorChooser.cmykAlpha.textAndMnemonic=Alpha
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&Oui
-OptionPane.noButton.textAndMnemonic=&Non
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Annuler
-OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Message
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impression
-PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
-
-PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
-
-PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
-
-PrintingDialog.abortButton.textAndMnemonic=&Abandonner
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=R\u00E9duire
-InternalFrame.maxButtonToolTip=Agrandir
-InternalFrame.restoreButtonToolTip=Restaurer
-InternalFrame.closeButtonToolTip=Fermer
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
-InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
-InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
-FormView.resetButton.textAndMnemonic=R\u00E9initialiser
-FormView.browseFileButton.textAndMnemonic=Parcourir...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=modification de style
-AbstractDocument.addition.textAndMnemonic=ajout
-AbstractDocument.deletion.textAndMnemonic=suppression
-AbstractDocument.undo.textAndMnemonic=Annuler
-AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=cliquer
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=Annuler
-AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Progression...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bouton gauche
-SplitPane.rightButton.textAndMnemonic=bouton droit
-# Used for Isindex
-IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
-InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
-InternalFrameTitlePane.closeButtonAccessibleName=Fermer
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
+FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de cr\u00E9er le dossier
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
+FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier
+FileChooser.renameError.textAndMnemonic=Impossible de renommer {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre. 
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.cancelButton.textAndMnemonic=Annuler
+FileChooser.saveButton.textAndMnemonic=Enregistrer
+FileChooser.openButton.textAndMnemonic=Ouvrir
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jo&ur
+FileChooser.helpButton.textAndMnemonic=&Aide
+FileChooser.directoryOpenButton.textAndMnemonic=&Ouvrir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Nouveau dossier
+FileChooser.win32.newFolder.subsequent=Nouveau dossier ({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9
+FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires
+FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annuler
+ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
+ColorChooser.swatches.textAndMnemonic=&Echantillons
+ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
+ColorChooser.hsv.textAndMnemonic=&TSV
+ColorChooser.hsvHue.textAndMnemonic=Teinte
+ColorChooser.hsvSaturation.textAndMnemonic=Saturation
+ColorChooser.hsvValue.textAndMnemonic=Valeur
+ColorChooser.hsvTransparency.textAndMnemonic=Transparence
+ColorChooser.hsl.textAndMnemonic=TS&L
+ColorChooser.hslHue.textAndMnemonic=Teinte
+ColorChooser.hslSaturation.textAndMnemonic=Saturation
+ColorChooser.hslLightness.textAndMnemonic=Lumi\u00E8re
+ColorChooser.hslTransparency.textAndMnemonic=Transparence
+ColorChooser.rgb.textAndMnemonic=R&VB
+ColorChooser.rgbRed.textAndMnemonic=R&ouge
+ColorChooser.rgbGreen.textAndMnemonic=&Vert
+ColorChooser.rgbBlue.textAndMnemonic=&Bleu
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=&Code couleur
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Jaune
+ColorChooser.cmykBlack.textAndMnemonic=Noir
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Oui
+OptionPane.noButton.textAndMnemonic=&Non
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Annuler
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Message
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impression
+PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abandonner
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=R\u00E9duire
+InternalFrame.maxButtonToolTip=Agrandir
+InternalFrame.restoreButtonToolTip=Restaurer
+InternalFrame.closeButtonToolTip=Fermer
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
+InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
+FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.browseFileButton.textAndMnemonic=Parcourir...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=modification de style
+AbstractDocument.addition.textAndMnemonic=ajout
+AbstractDocument.deletion.textAndMnemonic=suppression
+AbstractDocument.undo.textAndMnemonic=Annuler
+AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=cliquer
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Annuler
+AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Progression...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bouton gauche
+SplitPane.rightButton.textAndMnemonic=bouton droit
+# Used for Isindex
+IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
+InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
+InternalFrameTitlePane.closeButtonAccessibleName=Fermer
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
index e728d65..75cf317 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=File generico
-FileChooser.directoryDescription.textAndMnemonic=Directory
-FileChooser.newFolderError.textAndMnemonic=Errore durante la creazione della nuova cartella
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossibile creare la cartella
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
-FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella
-FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
-FileChooser.cancelButton.textAndMnemonic=&Annulla
-FileChooser.saveButton.textAndMnemonic=Sal&va
-FileChooser.openButton.textAndMnemonic=A&pri
-FileChooser.saveDialogTitle.textAndMnemonic=Salva
-FileChooser.openDialogTitle.textAndMnemonic=Apri
-FileChooser.updateButton.textAndMnemonic=A&ggiorna
-FileChooser.helpButton.textAndMnemonic=?(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=&Apri
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Nuova cartella
-FileChooser.win32.newFolder.subsequent=Nuova cartella ({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file
-FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato
-FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato
-FileChooser.updateButtonToolTip.textAndMnemonic=Aggiorna la lista directory
-FileChooser.helpButtonToolTip.textAndMnemonic=Guida FileChooser
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Apre la directory selezionata
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Anteprima
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=Annulla
-ColorChooser.reset.textAndMnemonic=&Reimposta
-ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
-ColorChooser.swatches.textAndMnemonic=Colori cam&pione
-ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Tonalit\u00E0
-ColorChooser.hsvSaturation.textAndMnemonic=Saturazione
-ColorChooser.hsvValue.textAndMnemonic=Valore
-ColorChooser.hsvTransparency.textAndMnemonic=Trasparenza
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Tonalit\u00E0
-ColorChooser.hslSaturation.textAndMnemonic=Saturazione
-ColorChooser.hslLightness.textAndMnemonic=Luminosit\u00E0
-ColorChooser.hslTransparency.textAndMnemonic=Trasparenza
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=Ro&sso
-ColorChooser.rgbGreen.textAndMnemonic=Ver&de
-ColorChooser.rgbBlue.textAndMnemonic=&Blu
-ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=&Codice colori
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Ciano
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Giallo
-ColorChooser.cmykBlack.textAndMnemonic=Nero
-ColorChooser.cmykAlpha.textAndMnemonic=Alfa
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=S\u00EC(&S)
-OptionPane.noButton.textAndMnemonic=&No
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Annulla
-OptionPane.title.textAndMnemonic=Selezionare una opzione
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Input
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Messaggio
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
-PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
-
-PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa...
-
-PrintingDialog.abortButton.textAndMnemonic=I&nterrompi
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompi la stampa
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=Riduci a icona
-InternalFrame.maxButtonToolTip=Ingrandisci
-InternalFrame.restoreButtonToolTip=Ripristina
-InternalFrame.closeButtonToolTip=Chiudi
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
-InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensioni
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
-InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Sottometti query
-FormView.resetButton.textAndMnemonic=Reimposta
-FormView.browseFileButton.textAndMnemonic=Sfoglia...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=modifica di stile
-AbstractDocument.addition.textAndMnemonic=aggiunta
-AbstractDocument.deletion.textAndMnemonic=eliminazione
-AbstractDocument.undo.textAndMnemonic=Annulla
-AbstractDocument.redo.textAndMnemonic=Ripeti
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=fare clic
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=Annulla
-AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Avanzamento...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=tasto sinistro
-SplitPane.rightButton.textAndMnemonic=tasto destro
-# Used for Isindex
-IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
-InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
-InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=File generico
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Errore durante la creazione della nuova cartella
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossibile creare la cartella
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
+FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella
+FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome. 
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.cancelButton.textAndMnemonic=Annulla
+FileChooser.saveButton.textAndMnemonic=Salva
+FileChooser.openButton.textAndMnemonic=Apri
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.updateButton.textAndMnemonic=Ag&giorna
+FileChooser.helpButton.textAndMnemonic=&?
+FileChooser.directoryOpenButton.textAndMnemonic=&Apri
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Nuova cartella
+FileChooser.win32.newFolder.subsequent=Nuova cartella ({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file
+FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato
+FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato
+FileChooser.updateButtonToolTip.textAndMnemonic=Aggiorna la lista directory
+FileChooser.helpButtonToolTip.textAndMnemonic=Guida FileChooser
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Apre la directory selezionata
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Anteprima
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annulla
+ColorChooser.reset.textAndMnemonic=&Reimposta
+ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
+ColorChooser.swatches.textAndMnemonic=Colori cam&pione
+ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hsvSaturation.textAndMnemonic=Saturazione
+ColorChooser.hsvValue.textAndMnemonic=Valore
+ColorChooser.hsvTransparency.textAndMnemonic=Trasparenza
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hslSaturation.textAndMnemonic=Saturazione
+ColorChooser.hslLightness.textAndMnemonic=Luminosit\u00E0
+ColorChooser.hslTransparency.textAndMnemonic=Trasparenza
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&sso
+ColorChooser.rgbGreen.textAndMnemonic=Ver&de
+ColorChooser.rgbBlue.textAndMnemonic=&Blu
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=&Codice colori
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Ciano
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Giallo
+ColorChooser.cmykBlack.textAndMnemonic=Nero
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Annulla
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=Selezionare una opzione
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Input
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Messaggio
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
+PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
+
+PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa...
+
+PrintingDialog.abortButton.textAndMnemonic=I&nterrompi
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompi la stampa
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Riduci a icona
+InternalFrame.maxButtonToolTip=Ingrandisci
+InternalFrame.restoreButtonToolTip=Ripristina
+InternalFrame.closeButtonToolTip=Chiudi
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
+InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensioni
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
+InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Sottometti query
+FormView.resetButton.textAndMnemonic=Reimposta
+FormView.browseFileButton.textAndMnemonic=Sfoglia...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=modifica di stile
+AbstractDocument.addition.textAndMnemonic=aggiunta
+AbstractDocument.deletion.textAndMnemonic=eliminazione
+AbstractDocument.undo.textAndMnemonic=Annulla
+AbstractDocument.redo.textAndMnemonic=Ripeti
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=fare clic
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Annulla
+AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Avanzamento...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=tasto sinistro
+SplitPane.rightButton.textAndMnemonic=tasto destro
+# Used for Isindex
+IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
+InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
+InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
index a9b9a2d..a8eea48 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
-FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-FileChooser.newFolderError.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
-FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
-FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S)
-FileChooser.openButton.textAndMnemonic=\u958B\u304F(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F(&O)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.win32.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0({0})
-FileChooser.other.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059
-FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059
-FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
-FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
-ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8
-ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u5024
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8
-ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
-ColorChooser.rgbHexCode.textAndMnemonic=\u8272\u30B3\u30FC\u30C9(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u30B7\u30A2\u30F3
-ColorChooser.cmykMagenta.textAndMnemonic=\u30DE\u30BC\u30F3\u30BF
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC4
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED2
-ColorChooser.cmykAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
-OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
-
-PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
-
-PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
-
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u5143
-InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
-AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
-# Used for Isindex
-IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
+FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+FileChooser.newFolderError.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+FileChooser.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
+FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
+FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u304F
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F(&O)
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.win32.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0({0})
+FileChooser.other.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059
+FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059
+FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
+FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
+ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
+ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8
+ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u5024
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
+ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8
+ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
+ColorChooser.rgbHexCode.textAndMnemonic=\u8272\u30B3\u30FC\u30C9(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u30B7\u30A2\u30F3
+ColorChooser.cmykMagenta.textAndMnemonic=\u30DE\u30BC\u30F3\u30BF
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC4
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED2
+ColorChooser.cmykAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
+OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+
+PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u5FA9\u5143
+InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
+FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
+FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
+AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
+AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
+SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
+# Used for Isindex
+IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
index ab966d9..3e30fe0 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
-FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
-FileChooser.newFolderError.textAndMnemonic=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.renameErrorTitle.textAndMnemonic=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD
-FileChooser.renameError.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.renameErrorFileExists.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
-FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C)
-FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5(&S)
-FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U)
-FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\uC0C8 \uD3F4\uB354
-FileChooser.win32.newFolder.subsequent=\uC0C8 \uD3F4\uB354({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
-FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
-FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
-FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.ok.textAndMnemonic=\uD655\uC778
-ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
-ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
-ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870
-ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4
-ColorChooser.hsvValue.textAndMnemonic=\uAC12
-ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870
-ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4
-ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30
-ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=\uC54C\uD30C
-ColorChooser.rgbHexCode.textAndMnemonic=\uC0C9\uC0C1 \uCF54\uB4DC(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\uCCAD\uB85D\uC0C9
-ColorChooser.cmykMagenta.textAndMnemonic=\uC9C4\uD64D\uC0C9
-ColorChooser.cmykYellow.textAndMnemonic=\uB178\uB780\uC0C9
-ColorChooser.cmykBlack.textAndMnemonic=\uAC80\uC815\uC0C9
-ColorChooser.cmykAlpha.textAndMnemonic=\uC54C\uD30C
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
-OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
-OptionPane.okButton.textAndMnemonic=\uD655\uC778(&O)
-OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
-OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
-PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
-
-PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
-
-PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
-InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654
-InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
-InternalFrame.closeButtonToolTip=\uB2EB\uAE30
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
-InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
-FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
-AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
-AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
-# Used for Isindex
-IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
-InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
+FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
+FileChooser.newFolderError.textAndMnemonic=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+FileChooser.renameErrorTitle.textAndMnemonic=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD
+FileChooser.renameError.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+FileChooser.renameErrorFileExists.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
+FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
+FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U)
+FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O)
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=\uC0C8 \uD3F4\uB354
+FileChooser.win32.newFolder.subsequent=\uC0C8 \uD3F4\uB354({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
+FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
+FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
+FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
+ColorChooser.ok.textAndMnemonic=\uD655\uC778
+ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
+ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
+ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
+ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
+ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870
+ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4
+ColorChooser.hsvValue.textAndMnemonic=\uAC12
+ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
+ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870
+ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4
+ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30
+ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=\uC54C\uD30C
+ColorChooser.rgbHexCode.textAndMnemonic=\uC0C9\uC0C1 \uCF54\uB4DC(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\uCCAD\uB85D\uC0C9
+ColorChooser.cmykMagenta.textAndMnemonic=\uC9C4\uD64D\uC0C9
+ColorChooser.cmykYellow.textAndMnemonic=\uB178\uB780\uC0C9
+ColorChooser.cmykBlack.textAndMnemonic=\uAC80\uC815\uC0C9
+ColorChooser.cmykAlpha.textAndMnemonic=\uC54C\uD30C
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
+OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
+PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+
+PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+
+PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
+InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654
+InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
+InternalFrame.closeButtonToolTip=\uB2EB\uAE30
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
+InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
+FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
+FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
+AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
+AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
+AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
+SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
+# Used for Isindex
+IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
+InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
index 5f8de98..d688a78 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
-FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
-FileChooser.newFolderError.textAndMnemonic=Erro ao criar nova pasta
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado.
-FileChooser.renameErrorTitle.textAndMnemonic=Erro ao Renomear o Arquivo ou a Pasta
-FileChooser.renameError.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
-FileChooser.cancelButton.textAndMnemonic=&Cancelar
-FileChooser.saveButton.textAndMnemonic=&Salvar
-FileChooser.openButton.textAndMnemonic=A&brir
-FileChooser.saveDialogTitle.textAndMnemonic=Salvar
-FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.updateButton.textAndMnemonic=At&ualizar
-FileChooser.helpButton.textAndMnemonic=Aj&uda
-FileChooser.directoryOpenButton.textAndMnemonic=A&brir
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Nova Pasta
-FileChooser.win32.newFolder.subsequent=Nova Pasta ({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos
-FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado
-FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado
-FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios
-FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Visualizar
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=Cancelar
-ColorChooser.reset.textAndMnemonic=&Redefinir
-ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
-ColorChooser.swatches.textAndMnemonic=Amo&stras
-ColorChooser.swatchesRecent.textAndMnemonic=Recente:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Matiz
-ColorChooser.hsvSaturation.textAndMnemonic=Satura\u00E7\u00E3o
-ColorChooser.hsvValue.textAndMnemonic=Valor
-ColorChooser.hsvTransparency.textAndMnemonic=Transpar\u00EAncia
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Matiz
-ColorChooser.hslSaturation.textAndMnemonic=Satura\u00E7\u00E3o
-ColorChooser.hslLightness.textAndMnemonic=Clareza
-ColorChooser.hslTransparency.textAndMnemonic=Transpar\u00EAncia
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=&Vermelho
-ColorChooser.rgbGreen.textAndMnemonic=&Verde
-ColorChooser.rgbBlue.textAndMnemonic=&Azul
-ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo da Cor(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Ciano
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Amarelo
-ColorChooser.cmykBlack.textAndMnemonic=Preto
-ColorChooser.cmykAlpha.textAndMnemonic=Alfa
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&Sim
-OptionPane.noButton.textAndMnemonic=N\u00E3o(&N)
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Entrada
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Mensagem
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
-PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
-
-PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
-
-PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=Minimizar
-InternalFrame.maxButtonToolTip=Maximizar
-InternalFrame.restoreButtonToolTip=Restaurar
-InternalFrame.closeButtonToolTip=Fechar
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
-InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
-InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Submeter Consulta
-FormView.resetButton.textAndMnemonic=Redefinir
-FormView.browseFileButton.textAndMnemonic=Procurar...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
-AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
-AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
-AbstractDocument.undo.textAndMnemonic=Desfazer
-AbstractDocument.redo.textAndMnemonic=Refazer
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=clicar
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
-AbstractUndoableEdit.redo.textAndMnemonic=Refazer
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Progresso...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
-SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
-# Used for Isindex
-IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify
-InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
-InternalFrameTitlePane.closeButtonAccessibleName=Fechar
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.newFolderError.textAndMnemonic=Erro ao criar nova pasta
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado.
+FileChooser.renameErrorTitle.textAndMnemonic=Erro ao Renomear o Arquivo ou a Pasta
+FileChooser.renameError.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Salvar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=At&ualizar
+FileChooser.helpButton.textAndMnemonic=Aj&uda
+FileChooser.directoryOpenButton.textAndMnemonic=A&brir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Nova Pasta
+FileChooser.win32.newFolder.subsequent=Nova Pasta ({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos
+FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado
+FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios
+FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Visualizar
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Redefinir
+ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
+ColorChooser.swatches.textAndMnemonic=Amo&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Recente:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Matiz
+ColorChooser.hsvSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hsvValue.textAndMnemonic=Valor
+ColorChooser.hsvTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Matiz
+ColorChooser.hslSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hslLightness.textAndMnemonic=Clareza
+ColorChooser.hslTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Vermelho
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=&Azul
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo da Cor
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Ciano
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Amarelo
+ColorChooser.cmykBlack.textAndMnemonic=Preto
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Sim
+OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entrada
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Mensagem
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
+PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimizar
+InternalFrame.maxButtonToolTip=Maximizar
+InternalFrame.restoreButtonToolTip=Restaurar
+InternalFrame.closeButtonToolTip=Fechar
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Submeter Consulta
+FormView.resetButton.textAndMnemonic=Redefinir
+FormView.browseFileButton.textAndMnemonic=Procurar...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
+AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
+AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
+AbstractDocument.undo.textAndMnemonic=Desfazer
+AbstractDocument.redo.textAndMnemonic=Refazer
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=clicar
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
+AbstractUndoableEdit.redo.textAndMnemonic=Refazer
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Andamento...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
+SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
+# Used for Isindex
+IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
+InternalFrameTitlePane.closeButtonAccessibleName=Fechar
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
index 51cc7fe..8628d55 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Generisk fil
-FileChooser.directoryDescription.textAndMnemonic=Katalog
-FileChooser.newFolderError.textAndMnemonic=Fel uppstod n\u00E4r ny mapp skapades
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Kan inte skapa mappen
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
-FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
-FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
-FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
-FileChooser.cancelButton.textAndMnemonic=&Avbryt
-FileChooser.saveButton.textAndMnemonic=&Spara
-FileChooser.openButton.textAndMnemonic=\u00D6ppna(&P)
-FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
-FileChooser.updateButton.textAndMnemonic=Upp&datera
-FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna(&P)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=Ny mapp
-FileChooser.win32.newFolder.subsequent=Ny mapp ({0})
-FileChooser.other.newFolder=Ny mapp
-FileChooser.other.newFolder.subsequent=Ny mapp.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt filvalsdialogruta
-FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
-FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
-FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan
-FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp - Filv\u00E4ljare
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Granska
-ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=Avbryt
-ColorChooser.reset.textAndMnemonic=\u00C5terst\u00E4ll(&T)
-ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
-ColorChooser.swatches.textAndMnemonic=&Prov
-ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Nyans
-ColorChooser.hsvSaturation.textAndMnemonic=M\u00E4ttnad
-ColorChooser.hsvValue.textAndMnemonic=V\u00E4rde
-ColorChooser.hsvTransparency.textAndMnemonic=Transparens
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Nyans
-ColorChooser.hslSaturation.textAndMnemonic=M\u00E4ttnad
-ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka
-ColorChooser.hslTransparency.textAndMnemonic=Transparens
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=R\u00F6d(&D)
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6n(&N)
-ColorChooser.rgbBlue.textAndMnemonic=Bl\u00E5(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=F\u00E4rgkod(&F)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=Cyan
-ColorChooser.cmykMagenta.textAndMnemonic=Magenta
-ColorChooser.cmykYellow.textAndMnemonic=Gul
-ColorChooser.cmykBlack.textAndMnemonic=Svart
-ColorChooser.cmykAlpha.textAndMnemonic=Alfa
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&Ja
-OptionPane.noButton.textAndMnemonic=&Nej
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Avbryt
-OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Indata
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=Meddelande
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
-PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
-
-PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts...
-
-PrintingDialog.abortButton.textAndMnemonic=&Avbryt
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=Minimera
-InternalFrame.maxButtonToolTip=Maximera
-InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
-InternalFrame.closeButtonToolTip=St\u00E4ng
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
-InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
-InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
-FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
-FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
-AbstractDocument.addition.textAndMnemonic=till\u00E4gg
-AbstractDocument.deletion.textAndMnemonic=borttagning
-AbstractDocument.undo.textAndMnemonic=\u00C5ngra
-AbstractDocument.redo.textAndMnemonic=G\u00F6r om
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=klicka
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
-AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp
-SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp
-# Used for Isindex
-IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
-InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
-InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Generisk fil
+FileChooser.directoryDescription.textAndMnemonic=Katalog
+FileChooser.newFolderError.textAndMnemonic=Fel uppstod n\u00E4r ny mapp skapades
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Kan inte skapa mappen
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
+FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
+FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn. 
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.cancelButton.textAndMnemonic=Avbryt
+FileChooser.saveButton.textAndMnemonic=Spara
+FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.updateButton.textAndMnemonic=Upp&datera
+FileChooser.helpButton.textAndMnemonic=&Hj\u00E4lp
+FileChooser.directoryOpenButton.textAndMnemonic=&\u00D6ppna
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=Ny mapp
+FileChooser.win32.newFolder.subsequent=Ny mapp ({0})
+FileChooser.other.newFolder=Ny mapp
+FileChooser.other.newFolder.subsequent=Ny mapp.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt filvalsdialogruta
+FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
+FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
+FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan
+FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp - Filv\u00E4ljare
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Granska
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Avbryt
+ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
+ColorChooser.swatches.textAndMnemonic=&Prov
+ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Nyans
+ColorChooser.hsvSaturation.textAndMnemonic=M\u00E4ttnad
+ColorChooser.hsvValue.textAndMnemonic=V\u00E4rde
+ColorChooser.hsvTransparency.textAndMnemonic=Transparens
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Nyans
+ColorChooser.hslSaturation.textAndMnemonic=M\u00E4ttnad
+ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka
+ColorChooser.hslTransparency.textAndMnemonic=Transparens
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
+ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=&F\u00E4rgkod
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Gul
+ColorChooser.cmykBlack.textAndMnemonic=Svart
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nej
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Avbryt
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Indata
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Meddelande
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
+PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
+
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts...
+
+PrintingDialog.abortButton.textAndMnemonic=&Avbryt
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimera
+InternalFrame.maxButtonToolTip=Maximera
+InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
+InternalFrame.closeButtonToolTip=St\u00E4ng
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
+InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
+InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
+FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
+FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
+AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.deletion.textAndMnemonic=borttagning
+AbstractDocument.undo.textAndMnemonic=\u00C5ngra
+AbstractDocument.redo.textAndMnemonic=G\u00F6r om
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=klicka
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
+AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp
+SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp
+# Used for Isindex
+IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
+InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
index 064b9af..4cd6bdf 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u666E\u901A\u7684\u6587\u4EF6
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
-FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519
-FileChooser.renameError.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}
-FileChooser.renameErrorFileExists.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S)
-FileChooser.openButton.textAndMnemonic=\u6253\u5F00(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00(&O)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.win32.newFolder.subsequent=\u65B0\u5EFA\u6587\u4EF6\u5939 ({0})
-FileChooser.other.newFolder=NewFolder
-FileChooser.other.newFolder.subsequent=NewFolder.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846
-FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6
-FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9884\u89C8
-ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
-ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatches.textAndMnemonic=\u793A\u4F8B(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03
-ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u503C
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03
-ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=\u989C\u8272\u4EE3\u7801(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u9752\u8272
-ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7EA2\u8272
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC4\u8272
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
-ColorChooser.cmykAlpha.textAndMnemonic=Alpha
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u786E\u5B9A(&O)
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
-PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
-
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
-
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u8FD8\u539F
-InternalFrame.closeButtonToolTip=\u5173\u95ED
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButton.textAndMnemonic=\u91CD\u8BBE
-FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
-AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
-AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u5355\u51FB
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=togglePopup
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
-SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
-# Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
+FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002
+FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.renameError.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}
+FileChooser.renameErrorFileExists.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u6253\u5F00
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00(&O)
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.win32.newFolder.subsequent=\u65B0\u5EFA\u6587\u4EF6\u5939 ({0})
+FileChooser.other.newFolder=NewFolder
+FileChooser.other.newFolder.subsequent=NewFolder.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846
+FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6
+FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6
+FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u9884\u89C8
+ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
+ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
+ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03
+ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u503C
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
+ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03
+ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=\u989C\u8272\u4EE3\u7801(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u9752\u8272
+ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7EA2\u8272
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC4\u8272
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u8FD8\u539F
+InternalFrame.closeButtonToolTip=\u5173\u95ED
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
+FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
+FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
+AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
+AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u5355\u51FB
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
+SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
+# Used for Isindex
+IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: 
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
index 2932421..5826be3 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
@@ -1,184 +1,185 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in Swing
-# Currently, the following components need this for support:
-#
-#    ColorChooser
-#    FileChooser
-#    OptionPane
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-#                        MNEMONIC NOTE:
-# Many of strings in this file are used by widgets that have a
-# mnemonic, for example:
-#   ColorChooser.rgbNameTextAndMnemonic=R&GB
-#
-# Indicates that the tab in the ColorChooser for RGB colors will have
-# the text 'RGB', further the mnemonic character will be 'g' and that
-# a decoration will be provided under the 'G'. This will typically
-# look like:  RGB
-#              -
-#
-# One important thing to remember is that the mnemonic MUST exist in
-# the String, if it does not exist you should add text that makes it
-# exist. This will typically take the form 'XXXX (M)' where M is the
-# character for the mnemonic.
-#
-# @author Steve Wilson
-
-############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
-FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
-FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002
-FileChooser.renameError.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=\u5132\u5B58(&S)
-FileChooser.openButton.textAndMnemonic=\u958B\u555F(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F(&O)
-
-# File Size Units
-FileChooser.fileSizeKiloBytes={0} KB
-FileChooser.fileSizeMegaBytes={0} MB
-FileChooser.fileSizeGigaBytes={0} GB
-
-# These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u8CC7\u6599\u593E
-FileChooser.win32.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E ({0})
-FileChooser.other.newFolder=\u65B0\u8CC7\u6599\u593E
-FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0}
-
-
-## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A
-FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
-FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
-
-############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9810\u89BD
-ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
-ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
-ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
-ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF
-ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF
-ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=\u984F\u8272\u4EE3\u78BC(&C)
-ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u85CD\u7DA0\u8272
-ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7D05\u8272
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC3\u8272
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
-ColorChooser.cmykAlpha.textAndMnemonic=Alpha
-
-############ OPTION PANE STRINGS #############
-# We only define mnemonics for YES/NO, but for completeness you can
-# define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A(&O)
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
-# Title for the dialog for the showInputDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
-# Title for the dialog for the showMessageDialog methods. Only used if
-# the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
-
-############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370
-PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62)
-
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
-
-# The following string will be formatted by a MessageFormat
-# and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}...
-
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
-
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
-
-############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u539F
-InternalFrame.closeButtonToolTip=\u95DC\u9589
-
-############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
-
-############ Text strings #############
-# Used for html forms
-FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
-FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
-FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
-
-############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
-AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
-AbstractDocument.undo.textAndMnemonic=\u9084\u539F
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
-
-############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
-
-############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
-
-############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
-
-############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
-
-############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
-SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
-# Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
-
-############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, the following components need this for support:
+#
+#    ColorChooser
+#    FileChooser
+#    OptionPane
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+#                        MNEMONIC NOTE:
+# Many of strings in this file are used by widgets that have a
+# mnemonic, for example:
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
+# Indicates that the tab in the ColorChooser for RGB colors will have
+# the text 'RGB', further the mnemonic character will be 'g' and that
+# a decoration will be provided under the 'G'. This will typically
+# look like:  RGB
+#              -
+#
+# One important thing to remember is that the mnemonic MUST exist in
+# the String, if it does not exist you should add text that makes it
+# exist. This will typically take the form 'XXXX (M)' where M is the
+# character for the mnemonic.
+#
+# @author Steve Wilson
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
+FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
+FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002
+FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002
+FileChooser.renameError.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u555F
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F(&O)
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# These strings are platform dependent not look and feel dependent.
+FileChooser.win32.newFolder=\u65B0\u8CC7\u6599\u593E
+FileChooser.win32.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E ({0})
+FileChooser.other.newFolder=\u65B0\u8CC7\u6599\u593E
+FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0}
+
+
+## file chooser tooltips ###
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A
+FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848
+FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848
+FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
+FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u9810\u89BD
+ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
+ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
+ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF
+ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
+ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF
+ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=\u984F\u8272\u4EE3\u78BC(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u85CD\u7DA0\u8272
+ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7D05\u8272
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC3\u8272
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
+OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62)
+
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u5FA9\u539F
+InternalFrame.closeButtonToolTip=\u95DC\u9589
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
+FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
+FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
+AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
+AbstractDocument.undo.textAndMnemonic=\u9084\u539F
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
+SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
+# Used for Isindex
+IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: 
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
index a1be685..e5dd7cd 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Suchen in:
-FileChooser.saveInLabel.textAndMnemonic=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=Dateiname:
-FileChooser.folderNameLabel.textAndMnemonic=Ordnername:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
-FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
-FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
-FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabel.textAndMnemonic=Details
-FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
-FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
-FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
-FileChooser.fileAttrHeader.textAndMnemonic=Attribute
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen
-MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren
-MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren
-MetalTitlePane.close.titleAndMnemonic=Schlie\u00DFen(&S)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Suchen in:
+FileChooser.saveInLabel.textAndMnemonic=Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic=Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic=Ordnername:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp:
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderAccessibleName=Nach oben
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
+FileChooser.newFolderAccessibleName=Neuer Ordner
+FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
+FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
+FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileAttrHeader.textAndMnemonic=Attribute
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen
+MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren
+MetalTitlePane.close.titleAndMnemonic=&Schlie\u00DFen
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
index 344b5d2..21c4866 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Buscar en:
-FileChooser.saveInLabel.textAndMnemonic=Guardar en:
-FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo:
-FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
-FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
-FileChooser.homeFolderAccessibleName=Inicio
-FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
-FileChooser.newFolderAccessibleName=Nueva Carpeta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
-FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
-FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
-FileChooser.viewMenuLabel.textAndMnemonic=Ver
-FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&Restaurar
-MetalTitlePane.iconify.titleAndMnemonic=Minimi&zar
-MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
-MetalTitlePane.close.titleAndMnemonic=&Cerrar
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Buscar en:
+FileChooser.saveInLabel.textAndMnemonic=Guardar en:
+FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo:
+FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
+FileChooser.upFolderAccessibleName=Arriba
+FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
+FileChooser.homeFolderAccessibleName=Inicio
+FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
+FileChooser.newFolderAccessibleName=Nueva Carpeta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
+FileChooser.detailsViewButtonAccessibleName=Detalles
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
+FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
+FileChooser.viewMenuLabel.textAndMnemonic=Ver
+FileChooser.fileNameHeader.textAndMnemonic=Nombre
+FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&Restaurar
+MetalTitlePane.iconify.titleAndMnemonic=Minimi&zar
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
+MetalTitlePane.close.titleAndMnemonic=&Cerrar
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
index 3b57546..45e54fc 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Rechercher dans :
-FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
-FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier :
-FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier :
-FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type :
-FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
-FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
-FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
-FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
-FileChooser.viewMenuLabel.textAndMnemonic=Affichage
-FileChooser.fileNameHeader.textAndMnemonic=Nom
-FileChooser.fileSizeHeader.textAndMnemonic=Taille
-FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
-FileChooser.fileAttrHeader.textAndMnemonic=Attributs
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&Restaurer
-MetalTitlePane.iconify.titleAndMnemonic=R\u00E9duire(&D)
-MetalTitlePane.maximize.titleAndMnemonic=&Agrandir
-MetalTitlePane.close.titleAndMnemonic=&Fermer
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Rechercher dans :
+FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
+FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier :
+FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type :
+FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+FileChooser.upFolderAccessibleName=Monter
+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
+FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.newFolderAccessibleName=Nouveau dossier
+FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
+FileChooser.viewMenuLabel.textAndMnemonic=Affichage
+FileChooser.fileNameHeader.textAndMnemonic=Nom
+FileChooser.fileSizeHeader.textAndMnemonic=Taille
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileAttrHeader.textAndMnemonic=Attributs
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&Restaurer
+MetalTitlePane.iconify.titleAndMnemonic=R\u00E9&duire
+MetalTitlePane.maximize.titleAndMnemonic=&Agrandir
+MetalTitlePane.close.titleAndMnemonic=&Fermer
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
index 4a3a110..4dafd22 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Cerca in:
-FileChooser.saveInLabel.textAndMnemonic=Salva in:
-FileChooser.fileNameLabel.textAndMnemonic=Nome file:
-FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file:
-FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
-FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
-FileChooser.newFolderAccessibleName=Nuova cartella
-FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
-FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
-FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
-FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificato
-FileChooser.fileAttrHeader.textAndMnemonic=Attributi
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&Ripristina
-MetalTitlePane.iconify.titleAndMnemonic=Rid&uci a icona
-MetalTitlePane.maximize.titleAndMnemonic=In&grandisci
-MetalTitlePane.close.titleAndMnemonic=&Chiudi
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Cerca in:
+FileChooser.saveInLabel.textAndMnemonic=Salva in:
+FileChooser.fileNameLabel.textAndMnemonic=Nome file:
+FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file:
+FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
+FileChooser.upFolderAccessibleName=Superiore
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
+FileChooser.newFolderAccessibleName=Nuova cartella
+FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
+FileChooser.detailsViewButtonAccessibleName=Dettagli
+FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
+FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
+FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificato
+FileChooser.fileAttrHeader.textAndMnemonic=Attributi
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&Ripristina
+MetalTitlePane.iconify.titleAndMnemonic=Rid&uci a icona
+MetalTitlePane.maximize.titleAndMnemonic=In&grandisci
+MetalTitlePane.close.titleAndMnemonic=&Chiudi
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
index 21dd83f..a26302f 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167:
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D:
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u5FA9\u5143(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167:
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.upFolderAccessibleName=\u4E0A\u3078
+FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
+FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
+FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
+FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
+FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
+FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=\u5FA9\u5143(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C)
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
index f93247e..1cd5d9c 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58:
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984:
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615:
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\uBCF5\uC6D0(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X)
-MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984:
+FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615:
+FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.upFolderAccessibleName=\uC704\uB85C
+FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
+FileChooser.homeFolderAccessibleName=\uD648
+FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
+FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
+FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
+FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
+FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
+FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
+FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=\uBCF5\uC6D0(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X)
+MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C)
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
index 9b852dd..8a34916 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Consultar Em:
-FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
-FileChooser.fileNameLabel.textAndMnemonic=Nome do Arquivo:
-FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
-FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
-FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
-FileChooser.newFolderAccessibleName=Nova Pasta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
-FileChooser.detailsViewButtonAccessibleName=Detalhes
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
-FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
-FileChooser.viewMenuLabel.textAndMnemonic=Exibir
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&Restaurar
-MetalTitlePane.iconify.titleAndMnemonic=&Minimizar
-MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
-MetalTitlePane.close.titleAndMnemonic=&Fechar
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Consultar Em:
+FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
+FileChooser.fileNameLabel.textAndMnemonic=Nome do Arquivo:
+FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderAccessibleName=Acima
+FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
+FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
+FileChooser.newFolderAccessibleName=Nova Pasta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
+FileChooser.detailsViewButtonAccessibleName=Detalhes
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
+FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
+FileChooser.viewMenuLabel.textAndMnemonic=Exibir
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&Restaurar
+MetalTitlePane.iconify.titleAndMnemonic=&Minimizar
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
+MetalTitlePane.close.titleAndMnemonic=&Fechar
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
index 2b9d583..f2f6f87 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Leta i:
-FileChooser.saveInLabel.textAndMnemonic=Spara i:
-FileChooser.fileNameLabel.textAndMnemonic=Filnamn:
-FileChooser.folderNameLabel.textAndMnemonic=Mapp:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
-FileChooser.upFolderAccessibleName=Upp
-FileChooser.homeFolderToolTip.textAndMnemonic=Hem
-FileChooser.homeFolderAccessibleName=Hem
-FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
-FileChooser.newFolderAccessibleName=Ny mapp
-FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
-FileChooser.detailsViewButtonAccessibleName=Detaljer
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
-FileChooser.viewMenuLabel.textAndMnemonic=Vy
-FileChooser.fileNameHeader.textAndMnemonic=Namn
-FileChooser.fileSizeHeader.textAndMnemonic=Storlek
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
-FileChooser.fileAttrHeader.textAndMnemonic=Attribut
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u00C5terst\u00E4ll(&R)
-MetalTitlePane.iconify.titleAndMnemonic=Minim&era
-MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera
-MetalTitlePane.close.titleAndMnemonic=St\u00E4ng(&S)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Leta i:
+FileChooser.saveInLabel.textAndMnemonic=Spara i:
+FileChooser.fileNameLabel.textAndMnemonic=Filnamn:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderAccessibleName=Upp
+FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+FileChooser.homeFolderAccessibleName=Hem
+FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
+FileChooser.newFolderAccessibleName=Ny mapp
+FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
+FileChooser.detailsViewButtonAccessibleName=Detaljer
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
+FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.viewMenuLabel.textAndMnemonic=Vy
+FileChooser.fileNameHeader.textAndMnemonic=Namn
+FileChooser.fileSizeHeader.textAndMnemonic=Storlek
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileAttrHeader.textAndMnemonic=Attribut
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=&\u00C5terst\u00E4ll
+MetalTitlePane.iconify.titleAndMnemonic=Minim&era
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera
+MetalTitlePane.close.titleAndMnemonic=&St\u00E4ng
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
index 9afd0f7..f1bcc0d 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B:
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D:
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B:
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u8FD8\u539F(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: 
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: 
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: 
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: 
+FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.upFolderAccessibleName=\u5411\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
+FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
+FileChooser.listViewButtonAccessibleName=\u5217\u8868
+FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
+FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=\u8FD8\u539F(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C)
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
index e2285fc..356fe47 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
@@ -1,52 +1,51 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Metal Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62:
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31:
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B:
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
-
-############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u56DE\u5FA9(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C)
-
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Metal Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62:
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31:
+FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B:
+FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
+FileChooser.upFolderAccessibleName=\u5F80\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
+FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
+FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
+FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
+FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+
+############ Used by MetalTitlePane if rendering window decorations############
+MetalTitlePane.restore.titleAndMnemonic=\u56DE\u5FA9(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C)
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
index 7382c5e..f0ea8b8 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Suchen in:
-FileChooser.saveInLabel.textAndMnemonic=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=Dateiname:
-FileChooser.folderNameLabel.textAndMnemonic=Ordnername:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
-FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
-FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
-FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabel.textAndMnemonic=Details
-FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
-FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
-FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
-FileChooser.fileAttrHeader.textAndMnemonic=Attribute
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Suchen in:
+FileChooser.saveInLabel.textAndMnemonic=Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic=Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic=Ordnername:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp:
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderAccessibleName=Nach oben
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
+FileChooser.newFolderAccessibleName=Neuer Ordner
+FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
+FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
+FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileAttrHeader.textAndMnemonic=Attribute
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
index 4992c84..f011d42 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Buscar en:
-FileChooser.saveInLabel.textAndMnemonic=Guardar en:
-FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo:
-FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
-FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
-FileChooser.homeFolderAccessibleName=Inicio
-FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
-FileChooser.newFolderAccessibleName=Nueva Carpeta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
-FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
-FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
-FileChooser.viewMenuLabel.textAndMnemonic=Ver
-FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Buscar en:
+FileChooser.saveInLabel.textAndMnemonic=Guardar en:
+FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo:
+FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
+FileChooser.upFolderAccessibleName=Arriba
+FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
+FileChooser.homeFolderAccessibleName=Inicio
+FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
+FileChooser.newFolderAccessibleName=Nueva Carpeta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
+FileChooser.detailsViewButtonAccessibleName=Detalles
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
+FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
+FileChooser.viewMenuLabel.textAndMnemonic=Ver
+FileChooser.fileNameHeader.textAndMnemonic=Nombre
+FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
index 17774d9..ff129b8 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Rechercher dans :
-FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
-FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier :
-FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier :
-FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type :
-FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
-FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
-FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
-FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
-FileChooser.viewMenuLabel.textAndMnemonic=Affichage
-FileChooser.fileNameHeader.textAndMnemonic=Nom
-FileChooser.fileSizeHeader.textAndMnemonic=Taille
-FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
-FileChooser.fileAttrHeader.textAndMnemonic=Attributs
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Rechercher dans :
+FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
+FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier :
+FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type :
+FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+FileChooser.upFolderAccessibleName=Monter
+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
+FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.newFolderAccessibleName=Nouveau dossier
+FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
+FileChooser.viewMenuLabel.textAndMnemonic=Affichage
+FileChooser.fileNameHeader.textAndMnemonic=Nom
+FileChooser.fileSizeHeader.textAndMnemonic=Taille
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileAttrHeader.textAndMnemonic=Attributs
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
index b5c0139..1eb897b 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Cerca in:
-FileChooser.saveInLabel.textAndMnemonic=Salva in:
-FileChooser.fileNameLabel.textAndMnemonic=Nome file:
-FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file:
-FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
-FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
-FileChooser.newFolderAccessibleName=Nuova cartella
-FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
-FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
-FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
-FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificato
-FileChooser.fileAttrHeader.textAndMnemonic=Attributi
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Cerca in:
+FileChooser.saveInLabel.textAndMnemonic=Salva in:
+FileChooser.fileNameLabel.textAndMnemonic=Nome file:
+FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file:
+FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
+FileChooser.upFolderAccessibleName=Superiore
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
+FileChooser.newFolderAccessibleName=Nuova cartella
+FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
+FileChooser.detailsViewButtonAccessibleName=Dettagli
+FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
+FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
+FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificato
+FileChooser.fileAttrHeader.textAndMnemonic=Attributi
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
index af70cad..d6d6e56 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167:
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D:
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167:
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.upFolderAccessibleName=\u4E0A\u3078
+FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
+FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
+FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
+FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
+FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
+FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
index 2e06f37..691826d 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58:
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984:
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615:
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984:
+FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615:
+FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.upFolderAccessibleName=\uC704\uB85C
+FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
+FileChooser.homeFolderAccessibleName=\uD648
+FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
+FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
+FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
+FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
+FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
+FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
+FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
index d41c665..dc0b9a0 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Consultar Em:
-FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
-FileChooser.fileNameLabel.textAndMnemonic=Nome do Arquivo:
-FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
-FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
-FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
-FileChooser.newFolderAccessibleName=Nova Pasta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
-FileChooser.detailsViewButtonAccessibleName=Detalhes
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
-FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
-FileChooser.viewMenuLabel.textAndMnemonic=Exibir
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Consultar Em:
+FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
+FileChooser.fileNameLabel.textAndMnemonic=Nome do Arquivo:
+FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderAccessibleName=Acima
+FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
+FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
+FileChooser.newFolderAccessibleName=Nova Pasta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
+FileChooser.detailsViewButtonAccessibleName=Detalhes
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
+FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
+FileChooser.viewMenuLabel.textAndMnemonic=Exibir
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
index 6024500..76188e2 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Leta i:
-FileChooser.saveInLabel.textAndMnemonic=Spara i:
-FileChooser.fileNameLabel.textAndMnemonic=Filnamn:
-FileChooser.folderNameLabel.textAndMnemonic=Mapp:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
-FileChooser.upFolderAccessibleName=Upp
-FileChooser.homeFolderToolTip.textAndMnemonic=Hem
-FileChooser.homeFolderAccessibleName=Hem
-FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
-FileChooser.newFolderAccessibleName=Ny mapp
-FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
-FileChooser.detailsViewButtonAccessibleName=Detaljer
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
-FileChooser.viewMenuLabel.textAndMnemonic=Vy
-FileChooser.fileNameHeader.textAndMnemonic=Namn
-FileChooser.fileSizeHeader.textAndMnemonic=Storlek
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
-FileChooser.fileAttrHeader.textAndMnemonic=Attribut
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Leta i:
+FileChooser.saveInLabel.textAndMnemonic=Spara i:
+FileChooser.fileNameLabel.textAndMnemonic=Filnamn:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderAccessibleName=Upp
+FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+FileChooser.homeFolderAccessibleName=Hem
+FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
+FileChooser.newFolderAccessibleName=Ny mapp
+FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
+FileChooser.detailsViewButtonAccessibleName=Detaljer
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
+FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.viewMenuLabel.textAndMnemonic=Vy
+FileChooser.fileNameHeader.textAndMnemonic=Namn
+FileChooser.fileSizeHeader.textAndMnemonic=Storlek
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileAttrHeader.textAndMnemonic=Attribut
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
index 3128de0..b03c34c 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B:
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D:
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B:
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: 
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: 
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: 
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: 
+FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.upFolderAccessibleName=\u5411\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
+FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
+FileChooser.listViewButtonAccessibleName=\u5217\u8868
+FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
+FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
index 1988305..e5ed4bc 100644
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62:
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31:
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B:
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62:
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31:
+FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B:
+FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
+FileChooser.upFolderAccessibleName=\u5F80\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
+FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
+FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
+FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
+FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 1a82e3b..af8b1dc 100644
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 1bad495..9ffa34a 100644
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, 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
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
index fe61269..1bdb5b2 100644
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
@@ -38,7 +38,7 @@
             {"appletviewer.menuitem.stop", "\u505C\u6B62"},
             {"appletviewer.menuitem.save", "\u4FDD\u5B58..."},
             {"appletviewer.menuitem.start", "\u958B\u59CB"},
-            {"appletviewer.menuitem.clone", "\u30AF\u30ED\u30FC\u30F3\u306E\u4F5C\u6210..."},
+            {"appletviewer.menuitem.clone", "\u30AF\u30ED\u30FC\u30F3..."},
             {"appletviewer.menuitem.tag", "\u30BF\u30B0..."},
             {"appletviewer.menuitem.info", "\u60C5\u5831..."},
             {"appletviewer.menuitem.edit", "\u7DE8\u96C6"},
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
index 86f1a6b..806744f 100644
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
@@ -137,7 +137,7 @@
             {"appletpanel.fileexception", "exce\u00E7\u00E3o de {0} ao carregar: {1}"},
             {"appletpanel.filedeath", "{0} eliminado ao carregar: {1}"},
             {"appletpanel.fileerror", "erro de {0} ao carregar: {1}"},
-            {"appletpanel.badattribute.exception", "Parse de HTML: valor incorreto do atributo de largura/altura"},
+            {"appletpanel.badattribute.exception", "Parsing de HTML: valor incorreto do atributo de largura/altura"},
             {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requer um carregador n\u00E3o nulo"},
             {"appletprops.title", "Propriedades do AppletViewer"},
             {"appletprops.label.http.server", "Servidor proxy Http:"},
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
index 0426389..7247017 100644
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
@@ -98,11 +98,11 @@
             {"appletioexception.loadclass.throw.notloaded", "klass inte inl\u00E4st: {0}"},
             {"appletclassloader.loadcode.verbose", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
             {"appletclassloader.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletclassloader.fileformat", "Undantag av filformat vid l\u00E4sning av: {0}"},
-            {"appletclassloader.fileioexception", "I/O-undantag vid l\u00E4sning: {0}"},
-            {"appletclassloader.fileexception", "{0} undantag vid l\u00E4sning: {1}"},
-            {"appletclassloader.filedeath", "{0} avslutad vid l\u00E4sning: {1}"},
-            {"appletclassloader.fileerror", "{0} fel vid l\u00E4sning: {1}"},
+            {"appletclassloader.fileformat", "Undantag av filformat vid laddning av: {0}"},
+            {"appletclassloader.fileioexception", "I/O-undantag vid laddning: {0}"},
+            {"appletclassloader.fileexception", "{0} undantag vid laddning: {1}"},
+            {"appletclassloader.filedeath", "{0} avslutad vid laddning: {1}"},
+            {"appletclassloader.fileerror", "{0} fel vid laddning: {1}"},
             {"appletclassloader.findclass.verbose.openstream", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
             {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00F6r namnet: {0}"},
             {"appletclassloader.getresource.verbose.found", "Hittade resursen: {0} som systemresurs"},
@@ -132,11 +132,11 @@
             {"appletpanel.notdisposed", "Ladda: applet har inte kasserats."},
             {"appletpanel.bail", "Avbruten."},
             {"appletpanel.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletpanel.fileformat", "Undantag av filformat vid l\u00E4sning av: {0}"},
-            {"appletpanel.fileioexception", "I/O-undantag vid l\u00E4sning: {0}"},
-            {"appletpanel.fileexception", "{0} undantag vid l\u00E4sning: {1}"},
-            {"appletpanel.filedeath", "{0} avslutad vid l\u00E4sning: {1}"},
-            {"appletpanel.fileerror", "{0} fel vid l\u00E4sning: {1}"},
+            {"appletpanel.fileformat", "Undantag av filformat vid laddning av: {0}"},
+            {"appletpanel.fileioexception", "I/O-undantag vid laddning: {0}"},
+            {"appletpanel.fileexception", "{0} undantag vid laddning: {1}"},
+            {"appletpanel.filedeath", "{0} avslutad vid laddning: {1}"},
+            {"appletpanel.fileerror", "{0} fel vid laddning: {1}"},
             {"appletpanel.badattribute.exception", "HTML-tolkning: felaktigt v\u00E4rde f\u00F6r bredd-/h\u00F6jdattribut"},
             {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream kr\u00E4ver laddare med icke-null"},
             {"appletprops.title", "AppletViewer-egenskaper"},
diff --git a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
index 035b46a..581163b 100644
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
@@ -154,7 +154,7 @@
             {"appletprops.choice.unsignedapplet.yes", "\u662F"},
             {"appletprops.button.apply", "\u5E94\u7528"},
             {"appletprops.button.cancel", "\u53D6\u6D88"},
-            {"appletprops.button.reset", "\u91CD\u8BBE"},
+            {"appletprops.button.reset", "\u91CD\u7F6E"},
             {"appletprops.apply.exception", "\u65E0\u6CD5\u4FDD\u5B58\u5C5E\u6027: {0}"},
             /* 4066432 */
             {"appletprops.title.invalidproxy", "\u6761\u76EE\u65E0\u6548"},
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_de.properties b/jdk/src/share/classes/sun/awt/resources/awt_de.properties
index 93ef0a1..83e9b66 100644
--- a/jdk/src/share/classes/sun/awt/resources/awt_de.properties
+++ b/jdk/src/share/classes/sun/awt/resources/awt_de.properties
@@ -105,7 +105,7 @@
 AWT.colon=Doppelpunkt
 AWT.circumflex=Zirkumflex
 AWT.dollar=Dollarzeichen
-AWT.euro=Euro-Zeichen
+AWT.euro=Euro
 AWT.exclamationMark=Ausrufezeichen
 AWT.invertedExclamationMark=Umgekehrtes Ausrufezeichen
 AWT.leftParenthesis=Linke Klammer
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_es.properties b/jdk/src/share/classes/sun/awt/resources/awt_es.properties
index 327046b..18b1693 100644
--- a/jdk/src/share/classes/sun/awt/resources/awt_es.properties
+++ b/jdk/src/share/classes/sun/awt/resources/awt_es.properties
@@ -4,7 +4,7 @@
 #
 
 # Modifier names
-AWT.shift=May\u00FAsculas
+AWT.shift=May\u00FAs
 AWT.control=Ctrl
 AWT.alt=Alt
 AWT.meta=Meta
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties b/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
index a3b38ca..00441e6 100644
--- a/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
+++ b/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
@@ -44,7 +44,7 @@
 AWT.subtract=Teclado Num\u00E9rico -
 AWT.decimal=Teclado Num\u00E9rico .
 AWT.divide=Teclado Num\u00E9rico /
-AWT.delete=Delete
+AWT.delete=Deletar
 AWT.numLock=Num Lock
 AWT.scrollLock=Scroll Lock
 AWT.f1=F1
diff --git a/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties b/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties
index feec527..8854d33 100644
--- a/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties
+++ b/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties
@@ -173,8 +173,8 @@
 AWT.CompositionWindowTitle=\u8F93\u5165\u7A97\u53E3
 AWT.InputMethodSelectionMenu=\u9009\u62E9\u8F93\u5165\u7A97\u53E3
 AWT.HostInputMethodDisplayName=\u7CFB\u7EDF\u8F93\u5165\u6CD5
-AWT.InputMethodLanguage.ja=\u65E5\u6587
-AWT.InputMethodLanguage.ko=\u97E9\u6587
+AWT.InputMethodLanguage.ja=\u65E5\u8BED
+AWT.InputMethodLanguage.ko=\u97E9\u8BED
 AWT.InputMethodLanguage.zh=\u4E2D\u6587
 AWT.InputMethodLanguage.zh_CN=\u7B80\u4F53\u4E2D\u6587
 AWT.InputMethodLanguage.zh_TW=\u7E41\u4F53\u4E2D\u6587
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties
index 87829bc..846a934 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties
@@ -34,13 +34,13 @@
 java.launcher.ergo.message2  =\                  weil die Ausf\u00FChrung auf einem Server-Class-Rechner erfolgt.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <Class-Suchpfad von Verzeichnissen und .zip-/.jar-Dateien>\n\    -classpath <Class-Suchpfad von Verzeichnissen und .zip-/.jar-Dateien>\n\                  Eine durch {0} getrennte Liste mit Verzeichnissen, .jar-Archiven\n\                  und .zip-Archiven zur Suche nach Klassendateien.\n\    -D<name>=<value>\n\                  Setzt eine Systemeigenschaft\n\    -verbose[:class|gc|jni]\n\                  Aktiviert die Verbose-Ausgabe\n\    -version      Druckt Produktversion und beendet das Programm\n\    -version:<value>\n\                  Erfordert die angegebene Version zur Ausf\u00FChrung\n\    -showversion  Druckt Produktversion und f\u00E4hrt fort\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n\    -? -help      Druckt diese Hilfemeldung\n\    -X            Druckt Hilfe zu Nicht-Standardoptionen\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  Aktiviert Assertionen mit angegebener Granularit\u00E4t\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n\    -esa | -enablesystemassertions\n\                  Aktiviert Systemassertionen\n\    -dsa | -disablesystemassertions\n\                  Deaktiviert Systemassertionen\n\    -agentlib:<libname>[=<options>]\n\                  L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n\                  siehe auch, -agentlib:jdwp=help und -agentlib:hprof=help\n\    -agentpath:<pathname>[=<options>]\n\                  L\u00E4dt native Agent Library nach vollem Pfadnamen\n\    -javaagent:<jarpath>[=<options>]\n\                  L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n\    -splash:<imagepath>\n\                  Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+java.launcher.opt.footer     =\    -cp <Class-Suchpfad von Verzeichnissen und .zip-/.jar-Dateien>\n\\    -classpath <Class-Suchpfad von Verzeichnissen und .zip-/.jar-Dateien>\n\\                  Eine durch {0} getrennte Liste mit Verzeichnissen, .jar-Archiven\n\\                  und .zip-Archiven zur Suche nach Klassendateien.\n\\    -D<name>=<value>\n\\                  Setzt eine Systemeigenschaft\n\\    -verbose[:class|gc|jni]\n\\                  Aktiviert die Verbose-Ausgabe\n\\    -version      Druckt Produktversion und beendet das Programm\n\\    -version:<value>\n\\                  Erfordert die angegebene Version zur Ausf\u00FChrung\n\\    -showversion  Druckt Produktversion und f\u00E4hrt fort\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n\\    -? -help      Druckt diese Hilfemeldung\n\\    -X            Druckt Hilfe zu Nicht-Standardoptionen\n\\    -ea[:<packagename>...|:<classname>]\n\\    -enableassertions[:<packagename>...|:<classname>]\n\\                  Aktiviert Assertionen mit angegebener Granularit\u00E4t\n\\    -da[:<packagename>...|:<classname>]\n\\    -disableassertions[:<packagename>...|:<classname>]\n\\                  Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n\\    -esa | -enablesystemassertions\n\\                  Aktiviert Systemassertionen\n\\    -dsa | -disablesystemassertions\n\\                  Deaktiviert Systemassertionen\n\\    -agentlib:<libname>[=<options>]\n\\                  L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n\\                  siehe auch, -agentlib:jdwp=help und -agentlib:hprof=help\n\\    -agentpath:<pathname>[=<options>]\n\\                  L\u00E4dt native Agent Library nach vollem Pfadnamen\n\\    -javaagent:<jarpath>[=<options>]\n\\                  L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n\\    -splash:<imagepath>\n\\                  Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://java.sun.com/javase/reference.
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n\    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n\    -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n\    -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      H\u00E4ngt an das Ende des Bootstrap Classpath an\n\    -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      Stellt Bootstrap Classpath voran\n\    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n\    -Xnoclassgc       Deaktiviert Klassen-Garbage Collection\n\    -Xincgc           Aktiviert inkrementelle Garbage Collection\n\    -Xloggc:<file>    Loggt GC-Status in einer Datei mit Zeitstempeln\n\    -Xbatch           Deaktiviert Hintergrundkompilierung\n\    -Xms<size>        Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n\    -Xmx<size>        Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n\    -Xss<size>        Legt Java-Thread-Stack-Gr\u00F6\u00DFe fest\n\    -Xprof            Gibt CPU-Profiling-Daten aus\n\    -Xfuture          Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n\    -Xrs              Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n\    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n\    -Xshare:off       Kein Versuch, gemeinsame Klassendaten zu verwenden\n\    -Xshare:auto      Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n\    -Xshare:on        Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n\    -XshowSettings    Zeigt alle Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:all\n\                      Zeigt alle Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:properties\n\                      Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n\    -XshowSettings:locale\n\                      Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n\    -XstartOnFirstThread\n\                      f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n\    -Xdock:name=<Anwendungsname>"\n\                      \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n\    -Xdock:icon=<Pfad zu Symboldatei>\n\                      \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n\\    -XstartOnFirstThread\n\\                      f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n\\    -Xdock:name=<Anwendungsname>"\n\\                      \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n\\    -Xdock:icon=<Pfad zu Symboldatei>\n\\                      \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden
 java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n\   public static void main(String[] args)
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties
index c826e33..7308233 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties
@@ -34,13 +34,13 @@
 java.launcher.ergo.message2  =\                  porque la ejecuci\u00F3n se est\u00E1 llevando a cabo en una m\u00E1quina de clase de servidor.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\    -classpath <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\                  Lista separada por {0} de directorios, archivos JAR\n\                  y archivos ZIP para buscar archivos de clase.\n\    -D<nombre>=<valor>\n\                  definir una propiedad del sistema\n\    -verbose[:class|gc|jni]\n\                  activar la salida verbose\n\    -version      imprimir la versi\u00F3n del producto y salir\n\    -version:<valor>\n\                  es necesario que se ejecute la versi\u00F3n especificada\n\    -showversion  imprimir la versi\u00F3n del producto y continuar\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  incluir/excluir JRE privados de usuario en la b\u00FAsqueda de versi\u00F3n\n\    -? -help      imprimir este mensaje de ayuda\n\    -X            imprimir la ayuda sobre las opciones que no sean est\u00E1ndar\n\    -ea[:<nombre_paquete>...|:<nombre_clase>]\n\    -enableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\                  activar afirmaciones con la granularidad especificada\n\    -da[:<nombre_paquete>...|:<nombre_clase>]\n\    -disableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\                  desactivar afirmaciones con la granularidad especificada\n\    -esa | -enablesystemassertions\n\                  activar afirmaciones del sistema\n\    -dsa | -disablesystemassertions\n\                  desactivar afirmaciones del sistema\n\    -agentlib:<nombre_bib>[=<opciones>]\n\                  cargar la biblioteca de agente nativa <nombre_bib>, como -agentlib:hprof\n\                  v\u00E9ase tambi\u00E9n -agentlib:jdwp=help y -agentlib:hprof=help\n\    -agentpath:<nombre_ruta_acceso>[=<opciones>]\n\                  cargar biblioteca de agente nativa con el nombre de la ruta de acceso completa\n\    -javaagent:<ruta_acceso_jar>[=<opciones>]\n\                  cargar agente de lenguaje de programaci\u00F3n Java, v\u00E9ase java.lang.instrument\n\    -splash:<ruta_acceso_imagen>\n\                  mostrar una pantalla de presentaci\u00F3n con la imagen especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obtener m\u00E1s informaci\u00F3n.
+java.launcher.opt.footer     =\    -cp <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\\    -classpath <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\\                  Lista separada por {0} de directorios, archivos JAR\n\\                  y archivos ZIP para buscar archivos de clase.\n\\    -D<nombre>=<valor>\n\\                  definir una propiedad del sistema\n\\    -verbose[:class|gc|jni]\n\\                  activar la salida verbose\n\\    -version      imprimir la versi\u00F3n del producto y salir\n\\    -version:<valor>\n\\                  es necesario que se ejecute la versi\u00F3n especificada\n\\    -showversion  imprimir la versi\u00F3n del producto y continuar\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  incluir/excluir JRE privados de usuario en la b\u00FAsqueda de versi\u00F3n\n\\    -? -help      imprimir este mensaje de ayuda\n\\    -X            imprimir la ayuda sobre las opciones que no sean est\u00E1ndar\n\\    -ea[:<nombre_paquete>...|:<nombre_clase>]\n\\    -enableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\\                  activar afirmaciones con la granularidad especificada\n\\    -da[:<nombre_paquete>...|:<nombre_clase>]\n\\    -disableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\\                  desactivar afirmaciones con la granularidad especificada\n\\    -esa | -enablesystemassertions\n\\                  activar afirmaciones del sistema\n\\    -dsa | -disablesystemassertions\n\\                  desactivar afirmaciones del sistema\n\\    -agentlib:<nombre_bib>[=<opciones>]\n\\                  cargar la biblioteca de agente nativa <nombre_bib>, como -agentlib:hprof\n\\                  v\u00E9ase tambi\u00E9n -agentlib:jdwp=help y -agentlib:hprof=help\n\\    -agentpath:<nombre_ruta_acceso>[=<opciones>]\n\\                  cargar biblioteca de agente nativa con el nombre de la ruta de acceso completa\n\\    -javaagent:<ruta_acceso_jar>[=<opciones>]\n\\                  cargar agente de lenguaje de programaci\u00F3n Java, v\u00E9ase java.lang.instrument\n\\    -splash:<ruta_acceso_imagen>\n\\                  mostrar una pantalla de presentaci\u00F3n con la imagen especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obtener m\u00E1s informaci\u00F3n.
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\    -Xmixed           ejecuci\u00F3n de modo mixto (por defecto)\n\    -Xint             s\u00F3lo ejecuci\u00F3n de modo interpretado\n\    -Xbootclasspath:<directorios y archivos zip/jar separados por {0}>\n\                      definir la ruta de acceso de b\u00FAsqueda para los recursos y clases de inicializaci\u00F3n de datos\n\    -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n\                      agregar al final de la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\    -Xbootclasspath/p:<directorios y archivos zip/jar separados por {0}>\n\                      anteponer a la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\    -Xdiag            mostrar mensajes de diagn\u00F3stico adicionales\n\    -Xnoclassgc       desactivar la recolecci\u00F3n de basura de clases\n\    -Xincgc           activar la recolecci\u00F3n de basura de clases\n\    -Xloggc:<archivo>    registrar el estado de GC en un archivo con registros de hora\n\    -Xbatch           desactivar compilaci\u00F3n en segundo plano\n\    -Xms<tama\u00F1o>        definir tama\u00F1o de pila Java inicial\n\    -Xmx<tama\u00F1o>        definir tama\u00F1o de pila Java m\u00E1ximo\n\    -Xss<tama\u00F1o>        definir tama\u00F1o de la pila del thread de Java\n\    -Xprof            datos de salida de creaci\u00F3n de perfil de CPU\n\    -Xfuture          activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n\    -Xrs              reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n\    -Xcheck:jni       realizar comprobaciones adicionales para las funciones de JNI\n\    -Xshare:off       no intentar usar datos de clase compartidos\n\    -Xshare:auto      usar datos de clase compartidos si es posible (valor por defecto)\n\    -Xshare:on        es obligatorio el uso de datos de clase compartidos, de lo contrario se emitir\u00E1 un fallo.\n\    -XshowSettings    mostrar todos los valores y continuar\n\    -XshowSettings:all\n\                      mostrar todos los valores y continuar\n\    -XshowSettings:vm mostrar todos los valores de la VM y continuar\n\    -XshowSettings:properties\n\                      mostrar todos los valores de las propiedades y continuar\n\    -XshowSettings:locale\n\                      mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n\nLas opciones -X no son est\u00E1ndar, por lo que podr\u00EDan cambiarse sin previo aviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nLas siguientes opciones son espec\u00EDficas para Mac OS X:\n\    -XstartOnFirstThread\n\                      ejecuta el m\u00E9todo main() del primer thread (AppKit)\n\    -Xdock:name=<nombre de aplicaci\u00F3n>"\n\                      sustituye al nombre por defecto de la aplicaci\u00F3n que se muestra en el Dock\n\    -Xdock:icon=<ruta de acceso a archivo de icono>\n\                      sustituye al icono por defecto que se muestra en el Dock\n\n
+java.launcher.X.macosx.usage=\nLas siguientes opciones son espec\u00EDficas para Mac OS X:\n\\    -XstartOnFirstThread\n\\                      ejecuta el m\u00E9todo main() del primer thread (AppKit)\n\\    -Xdock:name=<nombre de aplicaci\u00F3n>"\n\\                      sustituye al nombre por defecto de la aplicaci\u00F3n que se muestra en el Dock\n\\    -Xdock:icon=<ruta de acceso a archivo de icono>\n\\                      sustituye al icono por defecto que se muestra en el Dock\n\n
 
 java.launcher.cls.error1=Error: no se ha encontrado o cargado la clase principal {0}
 java.launcher.cls.error2=Error: el m\u00E9todo principal no es {0} en la clase {1}, defina el m\u00E9todo principal del siguiente modo:\n\   public static void main(String[] args)
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties
index 3e19f27..fa9d6c8 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties
@@ -34,13 +34,13 @@
 java.launcher.ergo.message2  =\                  perch\u00E9 si utilizza un computer di classe server.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <classpath di ricerca di directory e file zip/jar>\n\    -classpath <classpath di ricerca di directory e file zip/jar>\n\                  Una lista separata da {0} di directory, archivi JAR\n\                  e archivi ZIP utilizzata per la ricerca di file di classe.\n\    -D<nome>=<valore>\n\                  imposta una propriet\u00E0 di sistema\n\    -verbose[:class|gc|jni]\n\                  abilita l''output descrittivo\n\    -version      stampa la versione del prodotto ed esce\n\    -version:<valore>\n\                  richiede l''esecuzione della versione specificata\n\    -showversion  stampa la versione del prodotto e continua\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  include/esclude gli ambienti JRE privati dell''utente nella ricerca della versione\n\    -? -help      stampa questo messaggio della Guida\n\    -X            stampa la Guida sulle opzioni non standard\n\    -ea[:<nomepackage>...|:<nomeclasse>]\n\    -enableassertions[:<nomepackage>...|:<nomeclasse>]\n\                  abilita le asserzioni con la granularit\u00E0 specificata\n\    -da[:<nomepackage>...|:<nomeclasse>]\n\    -disableassertions[:<nomepackage>...|:<nomeclasse>]\n\                  disabilita le asserzioni con la granularit\u00E0 specificata\n\    -esa | -enablesystemassertions\n\                  abilita le asserzioni di sistema\n\    -dsa | -disablesystemassertions\n\                  disabilita le asserzioni di sistema\n\    -agentlib:<nomelib>[=<opzioni>]\n\                  carica la libreria agenti nativa <nomelib>, ad esempio -agentlib:hprof\n\                  vedere anche -agentlib:jdwp=help and -agentlib:hprof=help\n\    -agentpath:<nomepercorso>[=<opzioni>]\n\                  carica la libreria agenti nativa con il percorso completo\n\    -javaagent:<percorsojar>[=<opzioni>]\n\                  carica l''agente del linguaggio di programmazione Java. Vedere java.lang.instrument\n\    -splash:<percorsoimmagine>\n\                  mostra la schermata iniziale con l''immagine specificata\nVedere http://www.oracle.com/technetwork/java/javase/documentation/index.html per ulteriori dettagli.
+java.launcher.opt.footer     =\    -cp <classpath di ricerca di directory e file zip/jar>\n\\    -classpath <classpath di ricerca di directory e file zip/jar>\n\\                  Una lista separata da {0} di directory, archivi JAR\n\\                  e archivi ZIP utilizzata per la ricerca di file di classe.\n\\    -D<nome>=<valore>\n\\                  imposta una propriet\u00E0 di sistema\n\\    -verbose[:class|gc|jni]\n\\                  abilita l''output descrittivo\n\\    -version      stampa la versione del prodotto ed esce\n\\    -version:<valore>\n\\                  richiede l''esecuzione della versione specificata\n\\    -showversion  stampa la versione del prodotto e continua\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  include/esclude gli ambienti JRE privati dell''utente nella ricerca della versione\n\\    -? -help      stampa questo messaggio della Guida\n\\    -X            stampa la Guida sulle opzioni non standard\n\\    -ea[:<nomepackage>...|:<nomeclasse>]\n\\    -enableassertions[:<nomepackage>...|:<nomeclasse>]\n\\                  abilita le asserzioni con la granularit\u00E0 specificata\n\\    -da[:<nomepackage>...|:<nomeclasse>]\n\\    -disableassertions[:<nomepackage>...|:<nomeclasse>]\n\\                  disabilita le asserzioni con la granularit\u00E0 specificata\n\\    -esa | -enablesystemassertions\n\\                  abilita le asserzioni di sistema\n\\    -dsa | -disablesystemassertions\n\\                  disabilita le asserzioni di sistema\n\\    -agentlib:<nomelib>[=<opzioni>]\n\\                  carica la libreria agenti nativa <nomelib>, ad esempio -agentlib:hprof\n\\                  vedere anche -agentlib:jdwp=help and -agentlib:hprof=help\n\\    -agentpath:<nomepercorso>[=<opzioni>]\n\\                  carica la libreria agenti nativa con il percorso completo\n\\    -javaagent:<percorsojar>[=<opzioni>]\n\\                  carica l''agente del linguaggio di programmazione Java. Vedere java.lang.instrument\n\\    -splash:<percorsoimmagine>\n\\                  mostra la schermata iniziale con l''immagine specificata\nVedere http://www.oracle.com/technetwork/java/javase/documentation/index.html per ulteriori dettagli.
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\    -Xmixed           esecuzione in modalit\u00E0 mista (impostazione predefinita)\n\    -Xint             esecuzione solo in modalit\u00E0 convertita\n\    -Xbootclasspath:<directory e file zip/jar separati da {0}>\n\                      imposta il percorso di ricerca per le classi e le risorse di bootstrap\n\    -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n\                      aggiunge alla fine del classpath di bootstrap\n\    -Xbootclasspath/p:<directory e file zip/jar separati da {0}>\n\                      antepone al classpath di bootstrap\n\    -Xdiag            mostra messaggi di diagnostica aggiuntivi\n\    -Xnoclassgc       disabilita la garbage collection della classe\n\    -Xincgc           abilita la garbage collection incrementale\n\    -Xloggc:<file>    registra lo stato GC in un file di log con indicatori orari\n\    -Xbatch           disabilita la compilazione in background\n\    -Xms<dimensione>        imposta la dimensione heap Java iniziale\n\    -Xmx<dimensione>        imposta la dimensione heap Java massima\n\    -Xss<dimensione>        imposta la dimensione dello stack di thread Java\n\    -Xprof            visualizza i dati di profilo della CPU\n\    -Xfuture          abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future\n\    -Xrs              riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione)\n\    -Xcheck:jni       esegue controlli aggiuntivi per le funzioni JNI\n\    -Xshare:off       non tenta di utilizzare i dati della classe condivisi\n\    -Xshare:auto      utilizza i dati di classe condivisi se possibile (impostazione predefinita)\n\    -Xshare:on        richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n\    -XshowSettings    mostra tutte le impostazioni e continua\n\    -XshowSettings:all\n\                      mostra tutte le impostazioni e continua\n\    -XshowSettings:vm mostra tutte le impostazioni correlate alla VM e continua\n\    -XshowSettings:properties\n\                      mostra tutte le impostazioni delle propriet\u00E0 e continua\n\    -XshowSettings:locale\n\                      mostra tutte le impostazioni correlate alle impostazioni nazionali e continua\n\nLe opzioni -X non sono opzioni standard e sono soggette a modifiche senza preavviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nLe opzioni riportate di seguito sono specifiche del sistema operativo Mac OS X:\n\    -XstartOnFirstThread\n\                      Esegue il metodo main() sul primo thread (AppKit).\n\    -Xdock:name=<nome applicazione>"\n\                      Sostituisce il nome applicazione predefinito visualizzato nel dock\n\    -Xdock:icon=<percorso file icona>\n\                      Sostituisce l'icona predefinita visualizzata nel dock\n\n
+java.launcher.X.macosx.usage=\nLe opzioni riportate di seguito sono specifiche del sistema operativo Mac OS X:\n\\    -XstartOnFirstThread\n\\                      Esegue il metodo main() sul primo thread (AppKit).\n\\    -Xdock:name=<nome applicazione>"\n\\                      Sostituisce il nome applicazione predefinito visualizzato nel dock\n\\    -Xdock:icon=<percorso file icona>\n\\                      Sostituisce l'icona predefinita visualizzata nel dock\n\n
 
 java.launcher.cls.error1=Errore: impossibile trovare o caricare la classe principale {0}
 java.launcher.cls.error2=Errore: il metodo principale non \u00E8 {0} nella classe {1}. Definire il metodo principale come:\n\   public static void main(String[] args)
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties
index b7fbc53..759680e 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties
@@ -34,13 +34,13 @@
 java.launcher.ergo.message2  =\                  \uC11C\uBC84\uAE09 \uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC2E4\uD589 \uC911\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\    -classpath <class search path of directories and zip/jar files>\n\                  \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n\                  JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n\    -D<name>=<value>\n\                  \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -verbose[:class|gc|jni]\n\                  \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -version      \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n\    -version:<value>\n\                  \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n\    -showversion  \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n\    -? -help      \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\    -X            \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -esa | -enablesystemassertions\n\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -dsa | -disablesystemassertions\n\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -agentlib:<libname>[=<options>]\n\                  <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n\                  -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\    -agentpath:<pathname>[=<options>]\n\                  \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n\    -javaagent:<jarpath>[=<options>]\n\                  Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\    -splash:<imagepath>\n\                  \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\\    -classpath <class search path of directories and zip/jar files>\n\\                  \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n\\                  JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n\\    -D<name>=<value>\n\\                  \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -verbose[:class|gc|jni]\n\\                  \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -version      \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n\\    -version:<value>\n\\                  \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n\\    -showversion  \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n\\    -? -help      \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\\    -X            \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\\    -ea[:<packagename>...|:<classname>]\n\\    -enableassertions[:<packagename>...|:<classname>]\n\\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -da[:<packagename>...|:<classname>]\n\\    -disableassertions[:<packagename>...|:<classname>]\n\\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -esa | -enablesystemassertions\n\\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -dsa | -disablesystemassertions\n\\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -agentlib:<libname>[=<options>]\n\\                  <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n\\                  -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\\    -agentpath:<pathname>[=<options>]\n\\                  \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n\\    -javaagent:<jarpath>[=<options>]\n\\                  Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\\    -splash:<imagepath>\n\\                  \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\    -Xmixed           \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\    -Xint             \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\    -Xdiag            \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\    -Xnoclassgc       \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xincgc           \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xloggc:<file>    \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n\    -Xbatch           \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xms<size>        \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xmx<size>        \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xss<size>        Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xprof            CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n\    -Xfuture          \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xrs              Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n\    -Xcheck:jni       JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n\    -Xshare:off       \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\    -Xshare:auto      \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\    -Xshare:on        \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n\    -XshowSettings    \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:all\n\                      \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:properties\n\                      \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:locale\n\                      \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n\    -XstartOnFirstThread\n\                      \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n\    -Xdock:name=<application name>"\n\                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\    -Xdock:icon=<path to icon file>\n\                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
+java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n\\    -XstartOnFirstThread\n\\                      \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n\\    -Xdock:name=<application name>"\n\\                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\\    -Xdock:icon=<path to icon file>\n\\                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
 
 java.launcher.cls.error1=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCC3E\uAC70\uB098 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 java.launcher.cls.error2=\uC624\uB958: {1} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uAC00 {0}\uC774(\uAC00) \uC544\uB2D9\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\   public static void main(String[] args)
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
index d7f315b..f1b73ca 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
@@ -34,13 +34,13 @@
 java.launcher.ergo.message2  =\                  porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\    -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\                  Uma lista separada por {0} de diret\u00F3rios, archives JAR\n\                  e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n\    -D<nome>=<valor>\n\                  define uma propriedade do sistema\n\    -verbose[:class|gc|jni]\n\                  ativa a sa\u00EDda detalhada\n\    -version      imprime a vers\u00E3o do produto e sai do programa\n\    -version:<valor>\n\                  requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n\    -showversion  imprime a vers\u00E3o do produto e continua\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n\    -? -help      imprime esta mensagem de ajuda\n\    -X            imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n\    -ea[:<nome do pacote>...|:<nome da classe>]\n\    -enableassertions[:<nome do pacote>...|:<nome da classe>]\n\                  ativa asser\u00E7\u00F5es com granularidade especificada\n\    -da[:<nome do pacote>...|:<nome da classe>]\n\    -disableassertions[:<nome do pacote>...|:<nome da classe>]\n\                  desativa asser\u00E7\u00F5es com granularidade especificada\n\    -esa | -enablesystemassertions\n\                  ativa asser\u00E7\u00F5es do sistema\n\    -dsa | -disablesystemassertions\n\                  desativa asser\u00E7\u00F5es do sistema\n\    -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5est>]\n\                  carrega a biblioteca de agentes nativa <nome da biblioteca>, e.g. -agentlib:hprof\n\                  consulte tamb\u00E9m, -agentlib:jdwp=help and -agentlib:hprof=help\n\    -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n\                  carrega a biblioteca de agentes nativa com base no nome do caminho completo\n\    -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n\                  carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n\    -splash:<caminho da imagem>\n\                  mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para ver mais detalhes.
+java.launcher.opt.footer     =\    -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\\    -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\\                  Uma lista separada por {0} de diret\u00F3rios, archives JAR\n\\                  e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n\\    -D<nome>=<valor>\n\\                  define uma propriedade do sistema\n\\    -verbose[:class|gc|jni]\n\\                  ativa a sa\u00EDda detalhada\n\\    -version      imprime a vers\u00E3o do produto e sai do programa\n\\    -version:<valor>\n\\                  requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n\\    -showversion  imprime a vers\u00E3o do produto e continua\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n\\    -? -help      imprime esta mensagem de ajuda\n\\    -X            imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n\\    -ea[:<nome do pacote>...|:<nome da classe>]\n\\    -enableassertions[:<nome do pacote>...|:<nome da classe>]\n\\                  ativa asser\u00E7\u00F5es com granularidade especificada\n\\    -da[:<nome do pacote>...|:<nome da classe>]\n\\    -disableassertions[:<nome do pacote>...|:<nome da classe>]\n\\                  desativa asser\u00E7\u00F5es com granularidade especificada\n\\    -esa | -enablesystemassertions\n\\                  ativa asser\u00E7\u00F5es do sistema\n\\    -dsa | -disablesystemassertions\n\\                  desativa asser\u00E7\u00F5es do sistema\n\\    -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5est>]\n\\                  carrega a biblioteca de agentes nativa <nome da biblioteca>, e.g. -agentlib:hprof\n\\                  consulte tamb\u00E9m, -agentlib:jdwp=help and -agentlib:hprof=help\n\\    -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n\\                  carrega a biblioteca de agentes nativa com base no nome do caminho completo\n\\    -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n\\                  carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n\\    -splash:<caminho da imagem>\n\\                  mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para ver mais detalhes.
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\    -Xmixed           execu\u00E7\u00E3o no modo misto (default)\n\    -Xint             execu\u00E7\u00E3o somente no modo interpretado\n\    -Xbootclasspath:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      define o caminho de pesquisa para classes e recursos de inicializa\u00E7\u00E3o\n\    -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      anexa no final do caminho da classe de inicializa\u00E7\u00E3o\n\    -Xbootclasspath/p:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      anexa no in\u00EDcio do caminho da classe de inicializa\u00E7\u00E3o\n\    -Xdiag            mostra mensagens de diagn\u00F3stico adicionais\n\    -Xnoclassgc       desativa a coleta de lixo da classe\n\    -Xincgc           ativa a coleta de lixo incremental\n\    -Xloggc:<arquivo>    registra o status do GC status em um arquivo com marca\u00E7\u00F5es de data e hor\u00E1rio\n\    -Xbatch           desativa a compila\u00E7\u00E3o em segundo plano\n\    -Xms<tamanho>        define o tamanho inicial do heap Java\n\    -Xmx<tamanho>        define o tamanho m\u00E1ximo do heap Java\n\    -Xss<tamanho>        define o tamanho da pilha de threads java\n\    -Xprof            produz dados de perfil da cpu\n\    -Xfuture          ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo de exig\u00EAncia, prevendo o valor default futuro\n\    -Xrs              reduz o uso de sinais do SO pelo(a) Java/VM (consulte a documenta\u00E7\u00E3o)\n\    -Xcheck:jni       executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es da JNI\n\    -Xshare:off       n\u00E3o tenta usar dados da classe compartilhada\n\    -Xshare:auto      se poss\u00EDvel, usa dados da classe compartilhada (default)\n\    -Xshare:on        requer o uso de dados da classe compartilhada, caso contr\u00E1rio haver\u00E1 falha.\n\    -XshowSettings    mostra todas as defini\u00E7\u00F5es e continua\n\    -XshowSettings:all\n\                      mostra todas as defini\u00E7\u00F5es e continua\n\    -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 vm e continua\n\    -XshowSettings:properties\n\                      mostra todas as defini\u00E7\u00F5es da propriedade e continua\n\    -XshowSettings:locale\n\                      mostra todas as defini\u00E7\u00F5es relativas \u00E0s configura\u00E7\u00F5es regionais e continua\n\nAs -X options n\u00E3o s\u00E3o padronizadas e est\u00E3o sujeitas a altera\u00E7\u00F5es sem aviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n\    -XstartOnFirstThread\n\                      executa o m\u00E9todo main() no primeiro thread (AppKit)\n\    -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n\                      substitui o nome da aplica\u00E7\u00E3o default exibido no encaixe\n\    -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n\                      substitui o \u00EDcone exibido no encaixe\n\n
+java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n\\    -XstartOnFirstThread\n\\                      executa o m\u00E9todo main() no primeiro thread (AppKit)\n\\    -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n\\                      substitui o nome da aplica\u00E7\u00E3o default exibido no encaixe\n\\    -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n\\                      substitui o \u00EDcone exibido no encaixe\n\n
 
 java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}
 java.launcher.cls.error2=Erro: O m\u00E9todo principal n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo principal como:\n\   public static void main(String[] args)
diff --git a/jdk/src/share/classes/sun/management/resources/agent_de.properties b/jdk/src/share/classes/sun/management/resources/agent_de.properties
index dd44159..41bc793 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_de.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -40,11 +40,12 @@
 
 agent.err.agentclass.notfound      = Management Agent-Klasse nicht gefunden
 agent.err.agentclass.failed        = Management Agent-Klasse nicht erfolgreich
-agent.err.premain.notfound         = premain(String) ist in Agentklasse nicht vorhanden
+agent.err.premain.notfound         = premain(String) ist in Agent-Klasse nicht vorhanden
 agent.err.agentclass.access.denied = Zugriff auf premain(String) wurde abgelehnt
 agent.err.invalid.agentclass       = Ung\u00FCltiger Eigenschaftswert f\u00FCr com.sun.management.agent.class
-
+agent.err.invalid.state            = Ung\u00FCltiger Agent-Zustand
 agent.err.invalid.jmxremote.port   = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.rmi.port
 
 agent.err.file.not.set               = Datei nicht angegeben
 agent.err.file.not.readable          = Datei nicht lesbar
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Fehler beim Starten des SNMP-Adaptors mit Adresse
 agent.err.snmp.mib.init.failed     = Initialisierung von SNMP-MIB nicht erfolgreich mit Fehler
 
-jmxremote.ConnectorBootstrap.initialize = JMX-Connector-Server starten:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Keine Authentifizierung
-jmxremote.ConnectorBootstrap.initialize.ready = JMX-Connector bereit unter: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden: {0}
+jmxremote.ConnectorBootstrap.starting = JMX-Connector-Server starten:
+jmxremote.ConnectorBootstrap.noAuthentication = Keine Authentifizierung
+jmxremote.ConnectorBootstrap.ready = JMX-Connector bereit unter: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL wird verarbeitet
 jmxremote.AdaptorBootstrap.getTargetList.adding = Ziel hinzuf\u00FCgen: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_es.properties b/jdk/src/share/classes/sun/management/resources/agent_es.properties
index 5802469..393aa68 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_es.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_es.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) no existe en la clase del agente
 agent.err.agentclass.access.denied = Acceso denegado a premain(String)
 agent.err.invalid.agentclass       = Valor de propiedad com.sun.management.agent.class no v\u00E1lido
-
+agent.err.invalid.state            = Estado del agente no v\u00E1lido
 agent.err.invalid.jmxremote.port   = N\u00FAmero com.sun.management.jmxremote.port no v\u00E1lido
+agent.err.invalid.jmxremote.rmi.port = N\u00FAmero com.sun.management.jmxremote.rmi.port no v\u00E1lido
 
 agent.err.file.not.set               = Archivo no especificado
 agent.err.file.not.readable          = Archivo ilegible
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Fallo al iniciar el adaptador de SNMP con la direcci\u00F3n
 agent.err.snmp.mib.init.failed     = Fallo al inicializar el MIB de SNMP con error
 
-jmxremote.ConnectorBootstrap.initialize = Iniciando servidor de conector JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Sin autenticaci\u00F3n
-jmxremote.ConnectorBootstrap.initialize.ready = Conector JMX listo en: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = El acceso de lectura al archivo debe ser restringido: {0}
+jmxremote.ConnectorBootstrap.starting = Iniciando servidor de conector JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Sin autenticaci\u00F3n
+jmxremote.ConnectorBootstrap.ready = Conector JMX listo en: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as: {0}
+jmxremote.ConnectorBootstrap.file.readonly = El acceso de lectura al archivo debe ser restringido: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Procesando ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Agregando destino: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_fr.properties b/jdk/src/share/classes/sun/management/resources/agent_fr.properties
index f8e3a6f..5a112f5 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_fr.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_fr.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) n'existe pas dans la classe d'agents
 agent.err.agentclass.access.denied = Acc\u00E8s \u00E0 premain(String) refus\u00E9
 agent.err.invalid.agentclass       = Valeur de propri\u00E9t\u00E9 com.sun.management.agent.class incorrecte
-
+agent.err.invalid.state            = Etat de l'agent non valide
 agent.err.invalid.jmxremote.port   = Num\u00E9ro com.sun.management.jmxremote.port incorrect
+agent.err.invalid.jmxremote.rmi.port = Num\u00E9ro com.sun.management.jmxremote.rmi.port non valide
 
 agent.err.file.not.set               = Fichier non sp\u00E9cifi\u00E9
 agent.err.file.not.readable          = Fichier illisible
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Impossible de d\u00E9marrer l'adaptateur SNMP avec l'adresse
 agent.err.snmp.mib.init.failed     = Impossible d'initialiser SNMP MIB avec l'erreur
 
-jmxremote.ConnectorBootstrap.initialize = D\u00E9marrage du serveur du connecteur JMX :
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Pas d'authentification
-jmxremote.ConnectorBootstrap.initialize.ready = Connecteur JMX pr\u00EAt \u00E0 : {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = L''acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9 : {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = L''acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9 : {0}
+jmxremote.ConnectorBootstrap.starting = D\u00E9marrage du serveur du connecteur JMX :
+jmxremote.ConnectorBootstrap.noAuthentication = Pas d'authentification
+jmxremote.ConnectorBootstrap.ready = Connecteur JMX pr\u00EAt \u00E0 : {0}
+jmxremote.ConnectorBootstrap.password.readonly = L''acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9 : {0}
+jmxremote.ConnectorBootstrap.file.readonly = L''acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9 : {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Traitement de la liste de contr\u00F4le d'acc\u00E8s (ACL)
 jmxremote.AdaptorBootstrap.getTargetList.adding = Ajout de la cible : {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_it.properties b/jdk/src/share/classes/sun/management/resources/agent_it.properties
index 5b03e3b..97fc2c2 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_it.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_it.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) non esiste nella classe agente
 agent.err.agentclass.access.denied = Accesso negato a premain(String)
 agent.err.invalid.agentclass       = Valore propriet\u00E0 com.sun.management.agent.class non valido
-
+agent.err.invalid.state            = Stato agente non valido
 agent.err.invalid.jmxremote.port   = Numero com.sun.management.jmxremote.port non valido
+agent.err.invalid.jmxremote.rmi.port = Numero com.sun.management.jmxremote.rmi.port non valido
 
 agent.err.file.not.set               = File non specificato
 agent.err.file.not.readable          = File non leggibile
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Impossibile avviare l'adattatore SNMP con indirizzo
 agent.err.snmp.mib.init.failed     = Impossibile inizializzare MIB SNMP con errore
 
-jmxremote.ConnectorBootstrap.initialize = Avvio del server connettore JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Nessuna autenticazione
-jmxremote.ConnectorBootstrap.initialize.ready = Connettore JMX pronto in: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Limitare l''accesso in lettura al password file: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Limitare l''accesso in lettura al file: {0}
+jmxremote.ConnectorBootstrap.starting = Avvio del server connettore JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Nessuna autenticazione
+jmxremote.ConnectorBootstrap.ready = Connettore JMX pronto in: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Limitare l''accesso in lettura al password file: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Limitare l''accesso in lettura al file: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Elaborazione ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Aggiunta destinazione: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_ja.properties b/jdk/src/share/classes/sun/management/resources/agent_ja.properties
index d04eb4f..04c2b4a 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_ja.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String)\u304C\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u306B\u5B58\u5728\u3057\u307E\u305B\u3093
 agent.err.agentclass.access.denied = premain(String)\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 agent.err.invalid.agentclass       = com.sun.management.agent.class\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u304C\u7121\u52B9\u3067\u3059
-
+agent.err.invalid.state            = \u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u72B6\u614B\u304C\u7121\u52B9\u3067\u3059
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
 
 agent.err.file.not.set               = \u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 agent.err.file.not.readable          = \u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u3053\u306E\u30A2\u30C9\u30EC\u30B9\u3067SNMP\u30A2\u30C0\u30D7\u30BF\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 agent.err.snmp.mib.init.failed     = \u30A8\u30E9\u30FC\u3067SNMP MIB\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 
-jmxremote.ConnectorBootstrap.initialize = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u8A8D\u8A3C\u306A\u3057
-jmxremote.ConnectorBootstrap.initialize.ready = JMX\u30B3\u30CD\u30AF\u30BF\u306E\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
+jmxremote.ConnectorBootstrap.starting = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059:
+jmxremote.ConnectorBootstrap.noAuthentication = \u8A8D\u8A3C\u306A\u3057
+jmxremote.ConnectorBootstrap.ready = JMX\u30B3\u30CD\u30AF\u30BF\u306E\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F: {0}
+jmxremote.ConnectorBootstrap.password.readonly = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL\u3092\u51E6\u7406\u3057\u3066\u3044\u307E\u3059
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_ko.properties b/jdk/src/share/classes/sun/management/resources/agent_ko.properties
index a19e54e..5af4f55 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_ko.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_ko.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \uC5D0\uC774\uC804\uD2B8 \uD074\uB798\uC2A4\uC5D0 premain(\uBB38\uC790\uC5F4)\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 agent.err.agentclass.access.denied = premain(\uBB38\uC790\uC5F4)\uC5D0 \uB300\uD55C \uC561\uC138\uC2A4\uAC00 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 agent.err.invalid.agentclass       = com.sun.management.agent.class \uC18D\uC131 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-
+agent.err.invalid.state            = \uBD80\uC801\uD569\uD55C \uC5D0\uC774\uC804\uD2B8 \uC0C1\uD0DC
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \uBC88\uD638\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+agent.err.invalid.jmxremote.rmi.port = \uBD80\uC801\uD569\uD55C com.sun.management.jmxremote.rmi.port \uBC88\uD638
 
 agent.err.file.not.set               = \uD30C\uC77C\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 agent.err.file.not.readable          = \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \uC8FC\uC18C\uAC00 \uC788\uB294 SNMP \uC5B4\uB311\uD130 \uC2DC\uC791\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 agent.err.snmp.mib.init.failed     = \uC624\uB958\uB85C \uC778\uD574 SNMP MIB \uCD08\uAE30\uD654\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 
-jmxremote.ConnectorBootstrap.initialize = JMX \uCEE4\uB125\uD130 \uC11C\uBC84\uB97C \uC2DC\uC791\uD558\uB294 \uC911:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \uC778\uC99D \uC5C6\uC74C
-jmxremote.ConnectorBootstrap.initialize.ready = {0}\uC5D0\uC11C JMX \uCEE4\uB125\uD130\uAC00 \uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
+jmxremote.ConnectorBootstrap.starting = JMX \uCEE4\uB125\uD130 \uC11C\uBC84\uB97C \uC2DC\uC791\uD558\uB294 \uC911:
+jmxremote.ConnectorBootstrap.noAuthentication = \uC778\uC99D \uC5C6\uC74C
+jmxremote.ConnectorBootstrap.ready = {0}\uC5D0\uC11C JMX \uCEE4\uB125\uD130\uAC00 \uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+jmxremote.ConnectorBootstrap.password.readonly = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL\uC744 \uCC98\uB9AC\uD558\uB294 \uC911
 jmxremote.AdaptorBootstrap.getTargetList.adding = \uB300\uC0C1\uC744 \uCD94\uAC00\uD558\uB294 \uC911: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties b/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties
index b7750fc..c7ca0ef 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) n\u00E3o existe na classe do agente
 agent.err.agentclass.access.denied = Acesso negado a premain(String)
 agent.err.invalid.agentclass       = Valor inv\u00E1lido da propriedade com.sun.management.agent.class
-
+agent.err.invalid.state            = Estado de agente inv\u00E1lido
 agent.err.invalid.jmxremote.port   = N\u00FAmero inv\u00E1lido de com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = N\u00FAmero inv\u00E1lido do com.sun.management.jmxremote.rmi.port
 
 agent.err.file.not.set               = Arquivo n\u00E3o especificado
 agent.err.file.not.readable          = Arquivo ileg\u00EDvel
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Falha ao iniciar o adaptador SNMP com endere\u00E7o
 agent.err.snmp.mib.init.failed     = Falha ao inicializar o MIB SNMP com erro
 
-jmxremote.ConnectorBootstrap.initialize = Iniciando o Servidor do Conector JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Sem autentica\u00E7\u00E3o
-jmxremote.ConnectorBootstrap.initialize.ready = Conector JMX pronto em: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0}
+jmxremote.ConnectorBootstrap.starting = Iniciando o Servidor do Conector JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Sem autentica\u00E7\u00E3o
+jmxremote.ConnectorBootstrap.ready = Conector JMX pronto em: {0}
+jmxremote.ConnectorBootstrap.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0}
+jmxremote.ConnectorBootstrap.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Processando ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Adicionando destino: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_sv.properties b/jdk/src/share/classes/sun/management/resources/agent_sv.properties
index 6174daf..96b4e01 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_sv.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_sv.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) finns inte i agentklassen
 agent.err.agentclass.access.denied = \u00C5tkomst till premain(String) nekad
 agent.err.invalid.agentclass       = Ogiltigt egenskapsv\u00E4rde f\u00F6r com.sun.management.agent.class
-
+agent.err.invalid.state            = Ogiltig agentstatus
 agent.err.invalid.jmxremote.port   = Ogiltigt com.sun.management.jmxremote.port-nummer
+agent.err.invalid.jmxremote.rmi.port = Ogiltigt com.sun.management.jmxremote.rmi.port-nummer
 
 agent.err.file.not.set               = Filen \u00E4r inte angiven
 agent.err.file.not.readable          = Filen \u00E4r inte l\u00E4sbar
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Kunde inte starta SNMP-adaptern med adressen
 agent.err.snmp.mib.init.failed     = Kunde inte initiera SNMP MIB. Returnerade felet
 
-jmxremote.ConnectorBootstrap.initialize = Startar server f\u00F6r JMX-anslutning:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Ingen autentisering
-jmxremote.ConnectorBootstrap.initialize.ready = JMX-anslutning redo p\u00E5: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = L\u00E4sbeh\u00F6righeten f\u00F6r l\u00F6senordsfilen m\u00E5ste begr\u00E4nsas: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas {0}
+jmxremote.ConnectorBootstrap.starting = Startar server f\u00F6r JMX-anslutning:
+jmxremote.ConnectorBootstrap.noAuthentication = Ingen autentisering
+jmxremote.ConnectorBootstrap.ready = JMX-anslutning redo p\u00E5: {0}
+jmxremote.ConnectorBootstrap.password.readonly = L\u00E4sbeh\u00F6righeten f\u00F6r l\u00F6senordsfilen m\u00E5ste begr\u00E4nsas: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL bearbetas
 jmxremote.AdaptorBootstrap.getTargetList.adding = M\u00E5l l\u00E4ggs till: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties b/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties
index a323ada..61b7671 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \u4EE3\u7406\u7C7B\u4E2D\u4E0D\u5B58\u5728 premain(String)
 agent.err.agentclass.access.denied = \u62D2\u7EDD\u8BBF\u95EE premain(String)
 agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C5E\u6027\u503C\u65E0\u6548
-
+agent.err.invalid.state            = \u4EE3\u7406\u72B6\u6001\u65E0\u6548
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u7F16\u53F7\u65E0\u6548
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u7F16\u53F7\u65E0\u6548
 
 agent.err.file.not.set               = \u672A\u6307\u5B9A\u6587\u4EF6
 agent.err.file.not.readable          = \u6587\u4EF6\u4E0D\u53EF\u8BFB\u53D6
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u65E0\u6CD5\u542F\u52A8\u5E26\u6709\u5730\u5740\u7684 SNMP \u9002\u914D\u5668
 agent.err.snmp.mib.init.failed     = \u65E0\u6CD5\u521D\u59CB\u5316\u5E26\u6709\u9519\u8BEF\u7684 SNMP MIB
 
-jmxremote.ConnectorBootstrap.initialize = \u6B63\u5728\u542F\u52A8 JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668: 
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u65E0\u9A8C\u8BC1
-jmxremote.ConnectorBootstrap.initialize.ready = \u4F4D\u4E8E{0}\u7684 JMX \u8FDE\u63A5\u5668\u5DF2\u5C31\u7EEA
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
+jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u542F\u52A8 JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668: 
+jmxremote.ConnectorBootstrap.noAuthentication = \u65E0\u9A8C\u8BC1
+jmxremote.ConnectorBootstrap.ready = \u4F4D\u4E8E{0}\u7684 JMX \u8FDE\u63A5\u5668\u5DF2\u5C31\u7EEA
+jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = \u6B63\u5728\u5904\u7406 ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u6B63\u5728\u6DFB\u52A0\u76EE\u6807: {0}
diff --git a/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties b/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties
index 189f654..22fec8d 100644
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, 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
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \u4EE3\u7406\u7A0B\u5F0F\u985E\u5225\u4E2D\u4E0D\u5B58\u5728 premain(String)
 agent.err.agentclass.access.denied = \u5B58\u53D6 premain(String) \u906D\u5230\u62D2\u7D55
 agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C6C\u6027\u503C\u7121\u6548
-
+agent.err.invalid.state            = \u7121\u6548\u7684\u4EE3\u7406\u7A0B\u5F0F\u72C0\u614B
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u865F\u78BC\u7121\u6548
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u865F\u78BC\u7121\u6548
 
 agent.err.file.not.set               = \u672A\u6307\u5B9A\u6A94\u6848
 agent.err.file.not.readable          = \u6A94\u6848\u7121\u6CD5\u8B80\u53D6
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u7121\u6CD5\u4F7F\u7528\u4F4D\u5740\u555F\u52D5 SNMP \u914D\u63A5\u5361
 agent.err.snmp.mib.init.failed     = \u7121\u6CD5\u521D\u59CB\u5316 SNMP MIB\uFF0C\u51FA\u73FE\u932F\u8AA4
 
-jmxremote.ConnectorBootstrap.initialize = \u6B63\u5728\u555F\u52D5 JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u7121\u8A8D\u8B49
-jmxremote.ConnectorBootstrap.initialize.ready = JMX \u9023\u63A5\u5668\u5C31\u7DD2\uFF0C\u4F4D\u65BC: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A: {0}
+jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u555F\u52D5 JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668:
+jmxremote.ConnectorBootstrap.noAuthentication = \u7121\u8A8D\u8B49
+jmxremote.ConnectorBootstrap.ready = JMX \u9023\u63A5\u5668\u5C31\u7DD2\uFF0C\u4F4D\u65BC: {0}
+jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = \u6B63\u5728\u8655\u7406 ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u6B63\u5728\u65B0\u589E\u76EE\u6A19: {0}
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_de.java b/jdk/src/share/classes/sun/misc/resources/Messages_de.java
index c7f0cc7..9f063e8 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_de.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_es.java b/jdk/src/share/classes/sun/misc/resources/Messages_es.java
index d97049b..d46419e 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_es.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_es.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_fr.java b/jdk/src/share/classes/sun/misc/resources/Messages_fr.java
index 6b8ce07..9ed71c9 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_fr.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_fr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_it.java b/jdk/src/share/classes/sun/misc/resources/Messages_it.java
index ee108e8..956caaa 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_it.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_it.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_ja.java b/jdk/src/share/classes/sun/misc/resources/Messages_ja.java
index d697029..95c7990 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_ja.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_ko.java b/jdk/src/share/classes/sun/misc/resources/Messages_ko.java
index f2014f7..60b4ef0 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_ko.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_ko.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java b/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java
index 819f698..e588028 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_sv.java b/jdk/src/share/classes/sun/misc/resources/Messages_sv.java
index 90975b9..c6770c2 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_sv.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_sv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java b/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java
index 7ed0f7c..5ee47f9 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java b/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java
index 336a257..7b39584 100644
--- a/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, 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
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties
index 67d06a33..c7a48fc 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties
@@ -16,9 +16,9 @@
 button.print=Drucken
 button.properties=E&igenschaften...
 #
-checkbox.collate=So&rtieren
+checkbox.collate=&Sortieren
 checkbox.jobsheets=&Bannerseite
-checkbox.printtofile=A&usgabe in Datei
+checkbox.printtofile=Ausgabe in &Datei
 #
 dialog.printtitle=Drucken
 dialog.pstitle=Seite einrichten
@@ -35,42 +35,42 @@
 label.psname=&Name:
 label.pstype=Typ:
 label.rangeto=Bis
-label.size=Gr\u00F6\u00DF&e:
-label.source=Q&uelle:
+label.size=G&r\u00F6\u00DFe:
+label.source=&Quelle:
 label.status=Status:
-label.username=Ben&utzername:
+label.username=&Benutzername:
 label.millimetres=(mm)
 label.inches=(Zoll)
 label.topmargin=&oben
-label.bottommargin=u&nten
+label.bottommargin=&unten
 label.leftmargin=&links
 label.rightmargin=&rechts
 #
 radiobutton.color=&Farbe
 radiobutton.draftq=Ent&wurf
-radiobutton.duplex=Du&plex
+radiobutton.duplex=&Duplex
 radiobutton.highq=&Hoch
 radiobutton.landscape=&Querformat
 radiobutton.monochrome=&Monochrom
 radiobutton.normalq=&Normal
 radiobutton.oneside=&Einseitig
-radiobutton.portrait=&Hochformat
+radiobutton.portrait=Hochfor&mat
 radiobutton.rangeall=A&lle
 radiobutton.rangepages=S&eiten
-radiobutton.revlandscape=U&mgekehrtes Querformat
-radiobutton.revportrait=Umge&kehrtes Hochformat
+radiobutton.revlandscape=Umgekehrtes Q&uerformat
+radiobutton.revportrait=Umgekehrtes &Hochformat
 radiobutton.tumble=&Kalenderdruck
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Darstellung
 tab.general=&Allgemein
-tab.pagesetup=&Seite einrichten
+tab.pagesetup=Seite &einrichten
 #
 error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
 error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Kassette
 Form-Source=Formularquelle
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Jobs annehmen
 not-accepting-jobs=Jobs nicht annehmen
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties
index f92f58e..70c31fe 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties
@@ -17,7 +17,7 @@
 button.properties=P&ropiedades...
 #
 checkbox.collate=Inter&calar
-checkbox.jobsheets=P\u00E1gina d&e R\u00F3tulo
+checkbox.jobsheets=P\u00E1gina de R\u00F3tu&lo
 checkbox.printtofile=I&mprimir en Archivo
 #
 dialog.printtitle=Imprimir
@@ -29,19 +29,19 @@
 dialog.writeerror=No se puede escribir en el archivo:
 #
 label.info=Informaci\u00F3n:
-label.jobname=Nombre del &Trabajo:
-label.numcopies=N\u00FAmer&o de Copias:
-label.priority=Pr&ioridad:
+label.jobname=&Nombre del Trabajo:
+label.numcopies=N\u00FAmero de C&opias:
+label.priority=Prior&idad:
 label.psname=&Nombre:
 label.pstype=Tipo:
 label.rangeto=A
-label.size=&Tama\u00F1o:
-label.source=Origen:
+label.size=Tama&\u00F1o:
+label.source=Ori&gen:
 label.status=Estado:
-label.username=U&suario:
+label.username=&Usuario:
 label.millimetres=(mm)
 label.inches=(pulg.)
-label.topmargin=superior
+label.topmargin=&superior
 label.bottommargin=in&ferior
 label.leftmargin=iz&quierdo
 label.rightmargin=d&erecho
@@ -49,16 +49,16 @@
 radiobutton.color=&Color
 radiobutton.draftq=Bo&rrador
 radiobutton.duplex=&D\u00FAplex
-radiobutton.highq=A&lta
+radiobutton.highq=&Alta
 radiobutton.landscape=Hori&zontal
 radiobutton.monochrome=&Monocromo
 radiobutton.normalq=&Normal
-radiobutton.oneside=&Una Cara
+radiobutton.oneside=Una Ca&ra
 radiobutton.portrait=&Vertical
 radiobutton.rangeall=&Todo
 radiobutton.rangepages=P\u00E1&ginas
 radiobutton.revlandscape=&Horizontal Inverso
-radiobutton.revportrait=Ve&rtical Inverso
+radiobutton.revportrait=Vertical Inver&so
 radiobutton.tumble=Cam&bio de Cara
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
@@ -70,7 +70,7 @@
 error.destination=Nombre de archivo no v\u00E1lido; int\u00E9ntelo de nuevo
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Casete
 Form-Source=Origen de Formulario
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Aceptando trabajos
 not-accepting-jobs=No aceptando trabajos
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties
index 2b7b160..a09df3e 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties
@@ -30,7 +30,7 @@
 #
 label.info=Infos :
 label.jobname=Nom du &travail :
-label.numcopies=N&ombre de copies :
+label.numcopies=Nombre de c&opies :
 label.priority=P&riorit\u00E9 :
 label.psname=&Nom :
 label.pstype=Type :
@@ -38,7 +38,7 @@
 label.size=Tai&lle :
 label.source=Sour&ce :
 label.status=Statut :
-label.username=N&om utilisateur :
+label.username=Nom &utilisateur :
 label.millimetres=(mm)
 label.inches=(po)
 label.topmargin=&haut
@@ -46,11 +46,11 @@
 label.leftmargin=&gauche
 label.rightmargin=&droite
 #
-radiobutton.color=&Couleur
+radiobutton.color=Coule&ur
 radiobutton.draftq=Broui&llon
 radiobutton.duplex=&Duplex
 radiobutton.highq=Ma&x.
-radiobutton.landscape=Pa&ysage
+radiobutton.landscape=Pay&sage
 radiobutton.monochrome=&Monochrome
 radiobutton.normalq=&Normal
 radiobutton.oneside=&Un c\u00F4t\u00E9
@@ -58,7 +58,7 @@
 radiobutton.rangeall=&Tout
 radiobutton.rangepages=Pag&es
 radiobutton.revlandscape=Paysage i&nvers\u00E9
-radiobutton.revportrait=Portra&it invers\u00E9
+radiobutton.revportrait=Portrait &invers\u00E9
 radiobutton.tumble=&T\u00EAte-b\u00EAche
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
@@ -70,7 +70,7 @@
 error.destination=Nom de fichier non valide ; recommencez
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassette
 Form-Source=Source du formulaire
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Acceptation des t\u00E2ches
 not-accepting-jobs=Refus des t\u00E2ches
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties
index a824ef1..b5f5382 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties
@@ -17,7 +17,7 @@
 button.properties=P&ropriet\u00E0...
 #
 checkbox.collate=Fascico&la
-checkbox.jobsheets=&Pagina banner
+checkbox.jobsheets=Pagina &banner
 checkbox.printtofile=Stampa su &file
 #
 dialog.printtitle=Stampa
@@ -30,8 +30,8 @@
 #
 label.info=Informazioni:
 label.jobname=Nome &job:
-label.numcopies=Numer&o di copie:
-label.priority=Pr&iorit\u00E0:
+label.numcopies=Numero di c&opie:
+label.priority=P&riorit\u00E0:
 label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=A
@@ -51,7 +51,7 @@
 radiobutton.duplex=F&ronte retro
 radiobutton.highq=A&lta
 radiobutton.landscape=Orizzonta&le
-radiobutton.monochrome=&Monocromatico
+radiobutton.monochrome=Monocrom&atico
 radiobutton.normalq=&Normale
 radiobutton.oneside=Un lat&o
 radiobutton.portrait=&Verticale
@@ -70,7 +70,7 @@
 error.destination=Nome file non valido; riprovare
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassetta
 Form-Source=Origine modulo
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Accettazione job
 not-accepting-jobs=Rifiuto job
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties b/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties
index a6dbd38..bca2dc0 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties
@@ -70,7 +70,7 @@
 error.destination=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u30AB\u30BB\u30C3\u30C8
 Form-Source=\u30D5\u30A9\u30FC\u30E0\u30FB\u30BD\u30FC\u30B9
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u3066\u3044\u307E\u3059
 not-accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u307E\u305B\u3093
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties b/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties
index e0db7aa..962a2ba 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties
@@ -70,7 +70,7 @@
 error.destination=\uBD80\uC801\uD569\uD55C \uD30C\uC77C \uC774\uB984: \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\uCE74\uC138\uD2B8
 Form-Source=\uC591\uC2DD \uC18C\uC2A4
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\uC791\uC5C5 \uC2B9\uC778
 not-accepting-jobs=\uC791\uC5C5 \uC2B9\uC778 \uC548\uD568
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
index fbd00aa..437b432 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
@@ -14,9 +14,9 @@
 button.cancel=Cancelar
 button.ok=OK
 button.print=Imprimir
-button.properties=Proprie&dades...
+button.properties=P&ropriedades...
 #
-checkbox.collate=Ag&rupar
+checkbox.collate=&Agrupar
 checkbox.jobsheets=P\u00E1gina com &Banner
 checkbox.printtofile=&Imprimir em Arquivo
 #
@@ -31,7 +31,7 @@
 label.info=Informa\u00E7\u00F5es:
 label.jobname=Nome do &Job:
 label.numcopies=N\u00FAmer&o de c\u00F3pias:
-label.priority=&Prioridade:
+label.priority=P&rioridade:
 label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=At\u00E9
@@ -44,33 +44,33 @@
 label.topmargin=&superior
 label.bottommargin=&inferior
 label.leftmargin=es&querda:
-label.rightmargin=&direita
+label.rightmargin=di&reita
 #
 radiobutton.color=C&or
 radiobutton.draftq=&Rascunho
 radiobutton.duplex=&Duplex
-radiobutton.highq=Al&ta
+radiobutton.highq=&Alta
 radiobutton.landscape=&Paisagem
 radiobutton.monochrome=&Monocrom\u00E1tico
 radiobutton.normalq=&Normal
-radiobutton.oneside=Um &Lado
+radiobutton.oneside=Um Lad&o
 radiobutton.portrait=&Retrato
 radiobutton.rangeall=T&udo
 radiobutton.rangepages=&P\u00E1ginas
 radiobutton.revlandscape=Paisagem I&nvertida
-radiobutton.revportrait=R&etrato Invertido
+radiobutton.revportrait=Retrato &Invertido
 radiobutton.tumble=&Virar
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Apar\u00EAncia
 tab.general=&Geral
-tab.pagesetup=&Configura\u00E7\u00E3o de P\u00E1gina
+tab.pagesetup=Configura\u00E7\u00E3o de &P\u00E1gina
 #
 error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
 error.destination=Nome de arquivo inv\u00E1lido; tente novamente
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassete
 Form-Source=Origem do Formul\u00E1rio
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Aceitando jobs
 not-accepting-jobs=N\u00E3o aceitando jobs
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties
index 35ae374..16f04f6 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties
@@ -14,11 +14,11 @@
 button.cancel=Avbryt
 button.ok=OK
 button.print=Skriv ut
-button.properties=Egenskape&r...
+button.properties=&Egenskaper...
 #
-checkbox.collate=Sor&tera
-checkbox.jobsheets=F\u00F6&rs\u00E4ttsblad
-checkbox.printtofile=S&kriv ut till fil
+checkbox.collate=&Sortera
+checkbox.jobsheets=&F\u00F6rs\u00E4ttsblad
+checkbox.printtofile=Skriv ut till &fil
 #
 dialog.printtitle=Skriv ut
 dialog.pstitle=Utskriftsformat
@@ -35,42 +35,42 @@
 label.psname=&Namn:
 label.pstype=Typ:
 label.rangeto=Till
-label.size=St&orlek:
-label.source=&K\u00E4lla:
+label.size=Stor&lek:
+label.source=K\u00E4l&la:
 label.status=Status:
 label.username=A&nv\u00E4ndarnamn:
 label.millimetres=(mm)
 label.inches=(tum)
-label.topmargin=\u00F6ve&rkant
+label.topmargin=&\u00F6verkant
 label.bottommargin=&nederkant
-label.leftmargin=&v\u00E4nster
+label.leftmargin=v&\u00E4nster
 label.rightmargin=&h\u00F6ger
 #
-radiobutton.color=F\u00E4r&g
-radiobutton.draftq=Ut&kast
+radiobutton.color=&F\u00E4rg
+radiobutton.draftq=Utka&st
 radiobutton.duplex=&Dubbelsidig
 radiobutton.highq=&H\u00F6g
 radiobutton.landscape=&Liggande
 radiobutton.monochrome=&Monokrom
-radiobutton.normalq=N&ormal
+radiobutton.normalq=&Normal
 radiobutton.oneside=&Ensidig
-radiobutton.portrait=St\u00E5en&de
+radiobutton.portrait=&St\u00E5ende
 radiobutton.rangeall=A&lla
-radiobutton.rangepages=Si&dor
+radiobutton.rangepages=Sid&or
 radiobutton.revlandscape=Omv\u00E4nt li&ggande
-radiobutton.revportrait=O&mv\u00E4nt st\u00E5ende
+radiobutton.revportrait=Omv\u00E4nt st\u00E5en&de
 radiobutton.tumble=&V\u00E4nd
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Format
 tab.general=&Allm\u00E4nt
-tab.pagesetup=Ut&skriftsformat
+tab.pagesetup=Utskrifts&format
 #
 error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
 error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Kassett
 Form-Source=Formul\u00E4rk\u00E4lla
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Accepterar jobb
 not-accepting-jobs=Accepterar inte jobb
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties b/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties
index 2d2f91b..5c14221 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties
@@ -28,16 +28,16 @@
 dialog.noprintermsg=\u627E\u4E0D\u5230\u6253\u5370\u670D\u52A1\u3002
 dialog.writeerror=\u65E0\u6CD5\u5199\u5165\u6587\u4EF6:
 #
-label.info=\u4FE1\u606F:
+label.info=\u4FE1\u606F: 
 label.jobname=\u4F5C\u4E1A\u540D(&J):
 label.numcopies=\u6253\u5370\u4EFD\u6570(&O):
 label.priority=\u4F18\u5148\u7EA7(&R):
 label.psname=\u540D\u79F0(&N):
-label.pstype=\u7C7B\u578B:
+label.pstype=\u7C7B\u578B: 
 label.rangeto=\u81F3
 label.size=\u5927\u5C0F(&Z):
 label.source=\u6765\u6E90(&C):
-label.status=\u72B6\u6001:
+label.status=\u72B6\u6001: 
 label.username=\u7528\u6237\u540D(&U):
 label.millimetres=(\u6BEB\u7C73)
 label.inches=(\u82F1\u5BF8)
@@ -70,7 +70,7 @@
 error.destination=\u65E0\u6548\u7684\u6587\u4EF6\u540D; \u8BF7\u91CD\u8BD5
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u7EB8\u76D2
 Form-Source=\u8868\u683C\u6765\u6E90
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u63A5\u53D7\u4F5C\u4E1A
 not-accepting-jobs=\u4E0D\u63A5\u53D7\u4F5C\u4E1A
-
diff --git a/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties b/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties
index 41ce68c..f2e4019 100644
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties
@@ -28,16 +28,16 @@
 dialog.noprintermsg=\u627E\u4E0D\u5230\u5217\u5370\u670D\u52D9\u3002
 dialog.writeerror=\u7121\u6CD5\u5BEB\u5165\u81F3\u6A94\u6848:
 #
-label.info=\u8CC7\u8A0A:
+label.info=\u8CC7\u8A0A: 
 label.jobname=\u5DE5\u4F5C\u540D\u7A31(&J):
-label.numcopies=\u5217\u5370\u4EFD\u6578(&O):
+label.numcopies=\u5217\u5370\u4EFD\u6578(&O): 
 label.priority=\u512A\u5148\u6B0A(&R):
 label.psname=\u540D\u7A31(&N):
-label.pstype=\u985E\u578B:
+label.pstype=\u985E\u578B: 
 label.rangeto=\u81F3
 label.size=\u5927\u5C0F(&Z):
-label.source=\u4F86\u6E90(&C):
-label.status=\u72C0\u614B:
+label.source=\u4F86\u6E90(&C): 
+label.status=\u72C0\u614B: 
 label.username=\u4F7F\u7528\u8005\u540D\u7A31(&U):
 label.millimetres=(mm)
 label.inches=(in)
@@ -70,7 +70,7 @@
 error.destination=\u7121\u6548\u7684\u6A94\u540D; \u8ACB\u518D\u8A66\u4E00\u6B21
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u5361\u5F0F\u78C1\u5E36\u6A5F
 Form-Source=\u8868\u683C\u4F86\u6E90
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u63A5\u53D7\u7684\u5DE5\u4F5C
 not-accepting-jobs=\u4E0D\u63A5\u53D7\u7684\u5DE5\u4F5C
-
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
index 7c4d9e2..51068bf 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
index 524a0ff..9192c09 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
index efd94dc..f806368 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
index 4e57cda..7afb47c 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Utilizzo: {0} <opzioni> <porta>\n\ndove <opzioni> include:\n  -J<flag fase di esecuzione> Passa l''argomento all''interprete java
+rmiregistry.usage=Uso: {0} <opzioni> <porta>\n\ndove <opzioni> include:\n  -J<flag fase di esecuzione> Passa l''argomento all''interprete java
 rmiregistry.port.badnumber=l''argomento della porta, {0}, non \u00E8 un numero.
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
index fbb3388..46261e6 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
index 87b1308..3464c4e 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
index 50db21a..9659c3b 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
index 19a2b7b..e853e97 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
index 29a9cdc..9a5a2bf 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
index b6a217d..256fb2c 100644
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, 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
diff --git a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
index 2faf79a..7e5d0e7 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
diff --git a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
index 3a9e7d2..db847f5 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties
index 376a97e..8013169 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties
index c11adac..075a5e6 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties
index 1f846c6..5b719bf 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties
index 090b4b9..55a0871 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
@@ -75,7 +75,7 @@
 
 # "rmid", "-port", "-log", "-stop", "-C" and "-J" should not be translated,
 # because they are syntax
-rmid.usage=Utilizzo: {0} <opzioni>\n\ndove <opzioni> include:\n  -port <porta>       Specifica la porta usata da rmid\n  -log <directory>    Specifica la directory in cui rmid scrive il log\n  -stop              Arresta l''invocazione corrente di rmid (per la porta specificata)\n  -C<flag fase di esecuzione>    Passa l''argomento a ciascun processo figlio (gruppo di attivazione)\n  -J<flag fase di esecuzione>    Passa l''argomento all''interprete java\n
+rmid.usage=Uso: {0} <opzioni>\n\ndove <opzioni> include:\n  -port <porta>       Specifica la porta usata da rmid\n  -log <directory>    Specifica la directory in cui rmid scrive il log\n  -stop              Arresta l''invocazione corrente di rmid (per la porta specificata)\n  -C<flag fase di esecuzione>    Passa l''argomento a ciascun processo figlio (gruppo di attivazione)\n  -J<flag fase di esecuzione>    Passa l''argomento all''interprete java\n
 # This means "The currently running activation daemon has been shut down,
 # and is about to exit".
 rmid.daemon.shutdown=daemon di attivazione terminato
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties
index 0bee437..b0742af 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties
index 2323282..e744d9c 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
index f4dd523..eac4239 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties
index c6877da..67b9ffd 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
index 61d29f0..920bde7 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
index a55a47f..684645e 100644
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, 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
diff --git a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
index 48b6c73..34c62cb 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
+++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
@@ -53,9 +53,9 @@
         {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
                  "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
         {"Usage.jarsigner.options.jar.file.alias",
-                "\u7528\u6CD5: jarsigner [\u9009\u9879] jar\u6587\u4EF6 \u522B\u540D"},
+                "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"},
         {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [\u9009\u9879] jar\u6587\u4EF6 [\u522B\u540D...]"},
+                "       jarsigner -verify [options] jar-file [alias...]"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -65,7 +65,7 @@
         {".keypass.password.password.for.private.key.if.different.",
                 "[-keypass <\u53E3\u4EE4>]           \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
         {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <\u6587\u4EF6>]         \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
+                "[-certchain <file>]         \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"},
         {".sigfile.file.name.of.SF.DSA.file",
                 "[-sigfile <\u6587\u4EF6>]           .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
         {".signedjar.file.name.of.signed.JAR.file",
@@ -77,7 +77,7 @@
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:\u5B50\u9009\u9879]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
+                "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
                 "                            \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"},
         {".certs.display.certificates.when.verbose.and.verifying",
@@ -106,7 +106,7 @@
                 "[-strict]                   \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"},
         {"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"},
         {"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner -help \u4EE5\u4E86\u89E3\u7528\u6CD5"},
-        {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jar \u6587\u4EF6\u7684\u540D\u79F0"},
+        {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"},
         {"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"},
         {"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"},
         {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
@@ -153,11 +153,11 @@
         {"unable.to.instantiate.keystore.class.",
                 "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5BC6\u94A5\u5E93\u7C7B: "},
         {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u94FE\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u79C1\u6709\u5BC6\u94A5\u548C\u76F8\u5E94\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u94FE\u7684\u6709\u6548 KeyStore \u5BC6\u94A5\u6761\u76EE\u3002"},
+                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u94FE\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u79C1\u6709\u5BC6\u94A5\u548C\u76F8\u5E94\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u94FE\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u5BC6\u94A5\u6761\u76EE\u3002"},
         {"File.specified.by.certchain.does.not.exist",
                 "\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"},
         {"Cannot.restore.certchain.from.file.specified",
-                "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F\u8BC1\u4E66\u94FE"},
+                "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"},
         {"Certificate.chain.not.found.in.the.file.specified.",
                 "\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"},
         {"found.non.X.509.certificate.in.signer.s.chain",
@@ -184,7 +184,7 @@
                 "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "},
         {"or", "\u6216"},
         {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548 KeyStore \u6761\u76EE\u3002"},
+                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u6761\u76EE\u3002"},
         {"using.an.alternative.signing.mechanism",
                 "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"},
         {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
index f6ececa..638dda4 100644
--- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
@@ -99,7 +99,7 @@
         /***    EVERYTHING BELOW IS DEPRECATED  ***/
 
         // com.sun.security.auth.PolicyFile
-        {".error.parsing.", ": erro de parse "},
+        {".error.parsing.", ": erro de parsing "},
         {"COLON", ": "},
         {".error.adding.Permission.", ": erro ao adicionar a Permiss\u00E3o "},
         {"SPACE", " "},
diff --git a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
index e31e29d..8ec2ebd 100644
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
@@ -94,7 +94,7 @@
         {"Kerberos.username.defUsername.",
                 "Kerberos \u4F7F\u7528\u8005\u540D\u7A31 [{0}]: "},
         {"Kerberos.password.for.username.",
-                "Kerberos \u5BC6\u78BC [{0}]: "},
+                "Kerberos \u5BC6\u78BC {0}: "},
 
         /***    EVERYTHING BELOW IS DEPRECATED  ***/
 
diff --git a/jdk/src/share/classes/sun/security/util/Resources_ko.java b/jdk/src/share/classes/sun/security/util/Resources_ko.java
index 0d055da..a9714a4 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_ko.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_ko.java
@@ -179,7 +179,7 @@
                  "\uCCA0\uD68C\uD560 \uC778\uC99D\uC11C\uC758 \uC77C\uB828 ID"}, //-id
         // keytool: Running part
         {"keytool.error.", "keytool \uC624\uB958: "},
-        {"Illegal.option.", "\uC798\uBABB\uB41C \uC635\uC158:   "},
+        {"Illegal.option.", "\uC798\uBABB\uB41C \uC635\uC158:  "},
         {"Illegal.value.", "\uC798\uBABB\uB41C \uAC12: "},
         {"Unknown.password.type.", "\uC54C \uC218 \uC5C6\uB294 \uBE44\uBC00\uBC88\uD638 \uC720\uD615: "},
         {"Cannot.find.environment.variable.",
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties
index e6fba1e..d044d5a 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties
index d051e2f..d54b19a 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties
index d0915b0..755bc9c 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties
index bbe7388..a9bc529 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
@@ -44,4 +44,4 @@
 out.inflated=\ \\decompresso: {0}
 out.size=(in = {0}) (out = {1})
 
-usage=Utilizzo: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n\ \   -c  crea un nuovo archivio\n\ \   -t  visualizza l'indice dell'archivio\n\ \   -x  estrae i file con nome (o tutti i file) dall'archivio\n\ \   -u  aggiorna l'archivio esistente\n\ \   -v  genera output commentato dall'output standard\n\ \   -f  specifica il nome file dell'archivio\n\ \   -m  include informazioni manifest dal file manifest specificato\n\ \   -e  specifica il punto di ingresso per l'applicazione stand-alone \n\ \       inclusa nel file jar eseguibile\n\ \   -0  solo memorizzazione; senza compressione ZIP\n\ \   -M  consente di non creare un file manifest per le voci\n\ \   -i  genera informazioni sull'indice per i file jar specificati\n\ \   -C  imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n\ \          file della directory foo/ in 'classes.jar': \n\ \      jar cvfm classes.jar mymanifest -C foo/.\n
+usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n\ \   -c  crea un nuovo archivio\n\ \   -t  visualizza l'indice dell'archivio\n\ \   -x  estrae i file con nome (o tutti i file) dall'archivio\n\ \   -u  aggiorna l'archivio esistente\n\ \   -v  genera output commentato dall'output standard\n\ \   -f  specifica il nome file dell'archivio\n\ \   -m  include informazioni manifest dal file manifest specificato\n\ \   -e  specifica il punto di ingresso per l'applicazione stand-alone \n\ \       inclusa nel file jar eseguibile\n\ \   -0  solo memorizzazione; senza compressione ZIP\n\ \   -M  consente di non creare un file manifest per le voci\n\ \   -i  genera informazioni sull'indice per i file jar specificati\n\ \   -C  imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n\ \          file della directory foo/ in 'classes.jar': \n\ \      jar cvfm classes.jar mymanifest -C foo/.\n
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties
index d77f9c4..ae88945 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties
index ec8b8ea..f4fbd3e 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
index 734080b..6ef4746 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties
index f6dd206..645df26 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 2b5eb55..e8ae646 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
index 3a08c70..7956535 100644
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, 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
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties
new file mode 100644
index 0000000..6ca39df
--- /dev/null
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties
@@ -0,0 +1,313 @@
+ONE_DAY=\ 1\u65E5
+ONE_HOUR=\ 1\u6642\u9593
+ONE_MIN=\ 1\u5206
+ONE_MONTH=\ 1\u304B\u6708
+ONE_YEAR=\ 1\u5E74
+TWO_HOURS=\ 2\u6642\u9593
+THREE_HOURS=\ 3\u6642\u9593
+THREE_MONTHS=\ 3\u304B\u6708
+FIVE_MIN=\ 5\u5206
+SIX_HOURS=\ 6\u6642\u9593
+SIX_MONTHS=\ 6\u304B\u6708
+SEVEN_DAYS=\ 7\u65E5
+TEN_MIN=10\u5206
+TWELVE_HOURS=12\u6642\u9593
+THIRTY_MIN=30\u5206
+LESS_THAN=<
+LOT_LESS_THAN=<<
+GREATER_THAN=>
+ACTION_CAPITALIZED=ACTION
+ACTION_INFO_CAPITALIZED=ACTION_INFO
+ALL=\u3059\u3079\u3066
+APPLY=\u9069\u7528
+ARCHITECTURE=\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3
+ARRAY_OPEN_TYPE=\u914D\u5217\u3001OpenType
+ARRAY_OPEN_TYPE_NUMERIC_VALUE_VIEWER=\u914D\u5217\u3001OpenType\u3001\u6570\u5024\u30D3\u30E5\u30FC\u30A2
+ATTRIBUTE=\u5C5E\u6027
+ATTRIBUTE_VALUE=\u5C5E\u6027\u5024
+ATTRIBUTE_VALUES=\u5C5E\u6027\u5024
+ATTRIBUTES=\u5C5E\u6027
+BLANK=\u30D6\u30E9\u30F3\u30AF
+BLOCKED_COUNT_WAITED_COUNT=\u30D6\u30ED\u30C3\u30AF\u6E08\u5408\u8A08: {0}  \u5F85\u6A5F\u6E08\u5408\u8A08: {1}\n
+BOOT_CLASS_PATH=\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u8868\u793A\u3059\u308B\u60C5\u5831\u91CF\u3092\u5897\u6E1B\u3059\u308B\u30C8\u30B0\u30EB
+CPU_USAGE=CPU\u4F7F\u7528\u7387
+CPU_USAGE_FORMAT=CPU\u4F7F\u7528\u7387: {0}%
+CANCEL=\u53D6\u6D88
+CASCADE=\u91CD\u306D\u3066\u8868\u793A(&C)
+CHART_COLON=\u30C1\u30E3\u30FC\u30C8(&C):
+CLASS_PATH=\u30AF\u30E9\u30B9\u30D1\u30B9
+CLASS=\u30AF\u30E9\u30B9
+CLASS_NAME=ClassName
+CLASS_TAB_INFO_LABEL_FORMAT=<html>\u30ED\u30FC\u30C9\u6E08: {0}    \u672A\u30ED\u30FC\u30C9: {1}    \u5408\u8A08: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+CLASSES=\u30AF\u30E9\u30B9
+CLOSE=\u9589\u3058\u308B
+COLUMN_NAME=\u540D\u524D
+COLUMN_PID=PID
+COMMITTED_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u30E1\u30E2\u30EA\u30FC
+COMMITTED_VIRTUAL_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u4EEE\u60F3\u30E1\u30E2\u30EA\u30FC
+COMMITTED=\u30B3\u30DF\u30C3\u30C8\u6E08
+COMPILER=\u30B3\u30F3\u30D1\u30A4\u30E9
+COMPOSITE_DATA=CompositeData
+CONFIG=\u69CB\u6210
+CONNECT=\u63A5\u7D9A(&C)
+CONNECT_ELLIPSIS=\u63A5\u7D9A...
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306B\u63A5\u7D9A
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u30ED\u30FC\u30AB\u30EB\u307E\u305F\u306F\u30EA\u30E2\u30FC\u30C8\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\u65B0\u898F\u63A5\u7D9A\u3092\u884C\u3046\u30C0\u30A4\u30A2\u30ED\u30B0
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
+CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u898F\u63A5\u7D9A
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC
+CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002
+CONNECTION_FAILED=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+CONNECTION=\u63A5\u7D9A(&C)
+CONNECTION_NAME=\u63A5\u7D9A\u540D
+CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65AD\u6E08)
+CONSTRUCTOR=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+CURRENT_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u306E\u73FE\u5728\u306E\u30AF\u30E9\u30B9
+CURRENT_HEAP_SIZE=\u73FE\u5728\u306E\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
+CURRENT_VALUE=\u73FE\u5728\u5024: {0}
+CREATE=\u4F5C\u6210
+DAEMON_THREADS=\u30C7\u30FC\u30E2\u30F3\u30FB\u30B9\u30EC\u30C3\u30C9
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5207\u65AD\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u63A5\u7D9A\u3057\u307E\u3059\u3002
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u5C55\u958B\u307E\u305F\u306F\u7E2E\u5C0F\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
+DOUBLE_CLICK_TO_VISUALIZE=\u8996\u899A\u5316\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
+DESCRIPTION=\u8AAC\u660E
+DESCRIPTION_COLON_=\u8AAC\u660E:
+DESCRIPTOR=\u8A18\u8FF0\u5B50
+DETAILS=\u8A73\u7D30
+DETECT_DEADLOCK=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u306E\u691C\u51FA(&D)
+DETECT_DEADLOCK_TOOLTIP=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u6E08\u30B9\u30EC\u30C3\u30C9\u306E\u691C\u51FA
+DIMENSION_IS_NOT_SUPPORTED_COLON=\u6B21\u5143\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
+DISCARD_CHART=\u30C1\u30E3\u30FC\u30C8\u306E\u7834\u68C4
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer}\u65E5|1.0<{0,number,integer}\u65E5}{1,choice,0<{1,number,integer}\u6642\u9593|1#{1,number,integer}\u6642\u9593|1<{1,number,integer}\u6642\u9593}{2,choice,0<{2,number,integer}\u5206|1#{2,number,integer}\u5206|1.0<{2,number,integer}\u5206}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer}\u6642\u9593|1<{0,number,integer}\u6642\u9593}{1,choice,0<{1,number,integer}\u5206|1#{1,number,integer}\u5206|1.0<{1,number,integer}\u5206}
+DURATION_MINUTES={0,choice,1#{0,number,integer}\u5206|1.0<{0,number,integer}\u5206}
+DURATION_SECONDS={0}\u79D2
+EMPTY_ARRAY=\u7A7A\u306E\u914D\u5217
+EMPTY_OPENTYPE_VIEWER=\u7A7A\u306Eopentype\u30D3\u30E5\u30FC\u30A2
+ERROR=\u30A8\u30E9\u30FC
+ERROR_COLON_MBEANS_ALREADY_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
+ERROR_COLON_MBEANS_DO_NOT_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+ERROR_COLON=\u30A8\u30E9\u30FC:
+EVENT=\u30A4\u30D9\u30F3\u30C8
+EXIT=\u7D42\u4E86(&X)
+FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059:<br>{0}<br>\u7F6E\u63DB\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7F6E\u63DB
+FILE_CHOOSER_FILE_EXISTS_TITLE=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+FILE_CHOOSER_SAVED_FILE=<html>\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3057\u305F:<br>{0}<br>({1}\u30D0\u30A4\u30C8)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+FREE_PHYSICAL_MEMORY=\u7A7A\u304D\u7269\u7406\u30E1\u30E2\u30EA\u30FC
+FREE_SWAP_SPACE=\u7A7A\u304D\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
+GARBAGE_COLLECTOR=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30BF
+GTK_CAPITALIZED=GTK
+GC_INFO=\u540D\u524D= ''{0}''\u3001\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3= {1,choice,-1#\u3042\u308A\u307E\u305B\u3093|0#{1,number,integer}\u500B}\u3001\u5408\u8A08\u6D88\u8CBB\u6642\u9593= {2}
+GC_TIME=GC\u6642\u9593
+GC_TIME_DETAILS={1}\u3067{0} ({2}\u500B\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3)
+HEAP_MEMORY_USAGE=\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
+HEAP=\u30D2\u30FC\u30D7
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=JConsole\u3068JDK\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u542B\u3080\u30C0\u30A4\u30A2\u30ED\u30B0
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
+HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0}
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
+HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
+HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U)
+HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H)
+HOTSPOT_MBEANS_ELLIPSIS=Hotspot MBeans(&H)...
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Hotspot MBeans\u306E\u7BA1\u7406\u7528\u30C0\u30A4\u30A2\u30ED\u30B0
+IMPACT=\u5F71\u97FF
+INFO=\u60C5\u5831
+INFO_CAPITALIZED=INFO
+INVALID_PLUGIN_PATH=\u8B66\u544A: \u7121\u52B9\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9: {0}
+INVALID_URL=\u7121\u52B9\u306AURL: {0}
+IS=\u6B21\u306B\u4E00\u81F4\u3059\u308B
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java Monitoring && Management Console
+JCONSOLE_COLON_=JConsole: {0}
+JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java Monitoring && Management Console
+JIT_COMPILER=JIT\u30B3\u30F3\u30D1\u30A4\u30E9
+JAVA_VIRTUAL_MACHINE=Java\u4EEE\u60F3\u30DE\u30B7\u30F3
+JAVA=Java
+LIBRARY_PATH=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FB\u30D1\u30B9
+LISTENERS=\u30EA\u30B9\u30CA\u30FC
+LIVE_THREADS=\u5B9F\u884C\u4E2D\u306E\u30B9\u30EC\u30C3\u30C9
+LOADED=\u30ED\u30FC\u30C9\u6E08
+LOCAL_PROCESS_COLON=\u30ED\u30FC\u30AB\u30EB\u30FB\u30D7\u30ED\u30BB\u30B9(&L):
+LOOK_AND_FEEL=\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB
+MASTHEAD_FONT=Dialog-PLAIN-25
+MANAGEMENT_NOT_ENABLED=<b>\u6CE8\u610F</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u306F\u6709\u52B9\u5316\u3055\u308C\u307E\u305B\u3093\u3002
+MANAGEMENT_WILL_BE_ENABLED=<b>\u6CE8\u610F</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
+MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
+MBEAN_INFO=MBeanInfo
+MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
+MBEAN_OPERATION_INFO=MBeanOperationInfo
+MBEANS=MBeans
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u30AF\u30EA\u30A2(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u306E\u30AF\u30EA\u30A2
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5C5E\u6027\u306E\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u958B\u59CB
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u89E3\u9664(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u505C\u6B62
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot MBeans\u306E\u7BA1\u7406:
+MAX=\u6700\u5927
+MAXIMUM_HEAP_SIZE=\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
+MEMORY=\u30E1\u30E2\u30EA\u30FC
+MEMORY_POOL_LABEL=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB"{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u4F7F\u7528\u6E08: {0}    \u30B3\u30DF\u30C3\u30C8\u6E08: {1}    \u6700\u5927: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0A\u3067\u3059\u3002\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0B\u3067\u3059\u3002\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MESSAGE=\u30E1\u30C3\u30BB\u30FC\u30B8
+METHOD_SUCCESSFULLY_INVOKED=\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F
+MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5C0F\u5316(&M)
+MINUS_VERSION=\u3053\u308C\u306F{0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3{1}\u3067\u3059
+MONITOR_LOCKED=\ \ \ - \u30ED\u30C3\u30AF\u6E08{0}\n
+MOTIF=Motif
+NAME_BUILD_AND_MODE={0} (\u30D3\u30EB\u30C9{1}, {2})
+NAME_AND_BUILD={0} (\u30D3\u30EB\u30C9{1})
+NAME=\u540D\u524D
+NAME_COLON_=\u540D\u524D:
+NAME_STATE=\u540D\u524D: {0}\n\u72B6\u614B: {1}\n
+NAME_STATE_LOCK_NAME=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\u3001\u6240\u6709\u8005: {3}\n
+NEW_CONNECTION_ELLIPSIS=\u65B0\u898F\u63A5\u7D9A(&N)...
+NEW_VALUE_APPLIED=\u9069\u7528\u3055\u308C\u305F\u65B0\u898F\u5024
+NO_ATTRIBUTE_SELECTED=\u5C5E\u6027\u304C\u9078\u629E\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+NO_DEADLOCK_DETECTED=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+NO_VALUE_SELECTED=\u5024\u304C\u9078\u629E\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+NON_HEAP_MEMORY_USAGE=\u975E\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
+NON_HEAP=\u975E\u30D2\u30FC\u30D7
+NOT_YET_IMPLEMENTED=\u307E\u3060\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+NOT_A_VALID_EVENT_BROADCASTER=\u6709\u52B9\u306A\u30A4\u30D9\u30F3\u30C8\u30FB\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30BF\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+NOTIFICATION=\u901A\u77E5
+NOTIFICATION_BUFFER=\u901A\u77E5\u30D0\u30C3\u30D5\u30A1
+NOTIFICATIONS=\u901A\u77E5
+NOTIF_TYPES=NotifTypes
+NUMBER_OF_THREADS=\u30B9\u30EC\u30C3\u30C9\u6570
+NUMBER_OF_LOADED_CLASSES=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u6570
+NUMBER_OF_PROCESSORS=\u30D7\u30ED\u30BB\u30C3\u30B5\u6570
+OBJECT_NAME=ObjectName
+OPERATING_SYSTEM=\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0
+OPERATION=\u64CD\u4F5C
+OPERATION_INVOCATION=\u64CD\u4F5C\u306E\u547C\u51FA\u3057
+OPERATION_RETURN_VALUE=\u64CD\u4F5C\u306E\u623B\u308A\u5024
+OPERATIONS=\u64CD\u4F5C
+OVERVIEW=\u6982\u8981
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+PARAMETER=\u30D1\u30E9\u30E1\u30FC\u30BF
+PASSWORD_COLON_=\u30D1\u30B9\u30EF\u30FC\u30C9(&P):
+PASSWORD_ACCESSIBLE_NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
+PEAK=\u30D4\u30FC\u30AF
+PERFORM_GC=GC\u306E\u5B9F\u884C(&G)
+PERFORM_GC_TOOLTIP=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8
+PLOTTER_ACCESSIBLE_NAME=\u30C1\u30E3\u30FC\u30C8
+PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u30C7\u30FC\u30BF\u304C\u30D7\u30ED\u30C3\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
+PLOTTER_SAVE_AS_MENU_ITEM=\u540D\u524D\u3092\u4ED8\u3051\u3066\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58(&A)...
+PLOTTER_TIME_RANGE_MENU=\u6642\u9593\u7BC4\u56F2(&T)
+PROBLEM_ADDING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u8FFD\u52A0\u4E2D\u306E\u554F\u984C
+PROBLEM_DISPLAYING_MBEAN=MBean\u8868\u793A\u4E2D\u306E\u554F\u984C
+PROBLEM_INVOKING=\u547C\u51FA\u3057\u4E2D\u306E\u554F\u984C
+PROBLEM_REMOVING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u524A\u9664\u4E2D\u306E\u554F\u984C
+PROBLEM_SETTING_ATTRIBUTE=\u5C5E\u6027\u8A2D\u5B9A\u4E2D\u306E\u554F\u984C
+PROCESS_CPU_TIME=\u30D7\u30ED\u30BB\u30B9CPU\u6642\u9593
+R_FORWARD_SLASH_W_CAPITALIZED=R/W
+READABLE=\u8AAD\u53D6\u308A\u53EF\u80FD
+RECEIVED=\u53D7\u4FE1\u6E08
+RECONNECT=\u518D\u63A5\u7D9A
+REMOTE_PROCESS_COLON=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9
+REMOVE=\u524A\u9664
+RESTORE_ALL=\u3059\u3079\u3066\u5FA9\u5143(&R)
+RETURN_VALUE=\u623B\u308A\u5024
+RETURN_TYPE=ReturnType
+SEQ_NUM=SeqNum
+SIZE_BYTES={0,number,integer}\u30D0\u30A4\u30C8
+SIZE_GB={0} Gb
+SIZE_KB={0} Kb
+SIZE_MB={0} Mb
+SOURCE=\u30BD\u30FC\u30B9
+STACK_TRACE=\n\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9: \n
+SUCCESS_COLON=\u6210\u529F:
+SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306E\u30DA\u30F3\u30C7\u30A3\u30F3\u30B0
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u500B\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
+SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
+SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
+TABULAR_DATA_ARE_NOT_SUPPORTED=TabularData \u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+THREADS=\u30B9\u30EC\u30C3\u30C9
+THREAD_TAB_INFO_LABEL_FORMAT=<html>\u5B9F\u884C\u4E2D: {0}    \u30D4\u30FC\u30AF: {1}    \u5408\u8A08: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+THRESHOLD=\u3057\u304D\u3044\u5024
+TILE=\u4E26\u3079\u3066\u8868\u793A(&T)
+TIME_RANGE_COLON=\u6642\u9593\u7BC4\u56F2(&T):
+TIME=\u6642\u9593
+TIME_STAMP=TimeStamp
+TOTAL_LOADED=\u30ED\u30FC\u30C9\u6E08\u5408\u8A08
+TOTAL_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
+TOTAL_CLASSES_UNLOADED=\u30A2\u30F3\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
+TOTAL_COMPILE_TIME=\u5408\u8A08\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u9593
+TOTAL_PHYSICAL_MEMORY=\u5408\u8A08\u7269\u7406\u30E1\u30E2\u30EA\u30FC
+TOTAL_THREADS_STARTED=\u958B\u59CB\u6E08\u5408\u8A08\u30B9\u30EC\u30C3\u30C9
+TOTAL_SWAP_SPACE=\u5408\u8A08\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
+TYPE=\u30BF\u30A4\u30D7
+UNAVAILABLE=\u5229\u7528\u4E0D\u53EF
+UNKNOWN_CAPITALIZED=UNKNOWN
+UNKNOWN_HOST=\u4E0D\u660E\u306A\u30DB\u30B9\u30C8: {0}
+UNREGISTER=\u767B\u9332\u89E3\u9664
+UPTIME=\u7A3C\u50CD\u6642\u9593
+UPTIME_COLON_=\u7A3C\u50CD\u6642\u9593:
+USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
+REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt;\u307E\u305F\u306Fservice:jmx:&lt;protocol&gt;:&lt;sap&gt;
+USED=\u4F7F\u7528\u6E08
+USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
+USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+USER_DATA=UserData
+VIRTUAL_MACHINE=\u4EEE\u60F3\u30DE\u30B7\u30F3
+VM_ARGUMENTS=VM\u5F15\u6570
+VM_CAPITALIZED=VM
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30FC\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
+VALUE=\u5024
+VENDOR=\u30D9\u30F3\u30C0\u30FC
+VERBOSE_OUTPUT=\u8A73\u7D30\u51FA\u529B
+VERBOSE_OUTPUT_TOOLTIP=\u30AF\u30E9\u30B9\u8AAD\u8FBC\u307F\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B
+VIEW_VALUE=\u5024\u306E\u8868\u793A
+VIEW=\u8868\u793A
+WINDOW=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+WINDOWS=\u30A6\u30A3\u30F3\u30C9\u30A6
+WRITABLE=\u66F8\u8FBC\u307F\u53EF\u80FD
+YOU_CANNOT_DROP_A_CLASS_HERE=\u30AF\u30E9\u30B9\u3092\u3053\u3053\u306B\u30C9\u30ED\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
+COLLAPSE=\u7E2E\u5C0F
+CONNECTION_FAILED1=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
+CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u307E\u3059\u304B\u3002
+CONNECTION_LOST1=\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F: \u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
+CONNECTION_LOST2=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u304C\u7D42\u4E86\u3057\u305F\u305F\u3081{0}\u3078\u306E\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F\u3002<br>\u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
+CONNECTING_TO1={0}\u306B\u63A5\u7D9A\u4E2D
+CONNECTING_TO2={0}\u306B\u73FE\u5728\u63A5\u7D9A\u4E2D\u3067\u3059\u3002<br>\u3053\u308C\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002
+DEADLOCK_ALL_TAB=\u3059\u3079\u3066
+DEADLOCK_TAB=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF
+DEADLOCK_TAB_N=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF{0}
+EXPAND=\u5C55\u958B
+KBYTES={0} KB
+OPERATION_LOWERCASE=\u64CD\u4F5C
+PLOT=\u30D7\u30ED\u30C3\u30C8
+VISUALIZE=\u8996\u899A\u5316
+ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n  -notile     \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n  -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n  -version    \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n  host        \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n  port        \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n  -J          JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n              \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
diff --git a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
new file mode 100644
index 0000000..6868028
--- /dev/null
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
@@ -0,0 +1,313 @@
+ONE_DAY=\ 1 \u5929
+ONE_HOUR=\ 1 \u5C0F\u65F6
+ONE_MIN=\ 1 \u5206\u949F
+ONE_MONTH=\ 1 \u4E2A\u6708
+ONE_YEAR=\ 1 \u5E74
+TWO_HOURS=\ 2 \u5C0F\u65F6
+THREE_HOURS=\ 3 \u5C0F\u65F6
+THREE_MONTHS=\ 3 \u4E2A\u6708
+FIVE_MIN=\ 5 \u5206\u949F
+SIX_HOURS=\ 6 \u5C0F\u65F6
+SIX_MONTHS=\ 6 \u4E2A\u6708
+SEVEN_DAYS=\ 7 \u5929
+TEN_MIN=10 \u5206\u949F
+TWELVE_HOURS=12 \u5C0F\u65F6
+THIRTY_MIN=30 \u5206\u949F
+LESS_THAN=<
+LOT_LESS_THAN=<<
+GREATER_THAN=>
+ACTION_CAPITALIZED=ACTION
+ACTION_INFO_CAPITALIZED=ACTION_INFO
+ALL=\u5168\u90E8
+APPLY=\u5E94\u7528
+ARCHITECTURE=\u4F53\u7CFB\u7ED3\u6784
+ARRAY_OPEN_TYPE=\u6570\u7EC4, OpenType
+ARRAY_OPEN_TYPE_NUMERIC_VALUE_VIEWER=\u6570\u7EC4, OpenType, \u6570\u503C\u67E5\u770B\u5668
+ATTRIBUTE=\u5C5E\u6027
+ATTRIBUTE_VALUE=\u5C5E\u6027\u503C
+ATTRIBUTE_VALUES=\u5C5E\u6027\u503C
+ATTRIBUTES=\u5C5E\u6027
+BLANK=\u7A7A\u767D
+BLOCKED_COUNT_WAITED_COUNT=\u603B\u963B\u6B62\u6570: {0}, \u603B\u7B49\u5F85\u6570: {1}\n
+BOOT_CLASS_PATH=\u5F15\u5BFC\u7C7B\u8DEF\u5F84
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u5207\u6362\u4EE5\u663E\u793A\u66F4\u591A\u6216\u66F4\u5C11\u4FE1\u606F
+CPU_USAGE=CPU \u5360\u7528\u7387
+CPU_USAGE_FORMAT=CPU \u5360\u7528\u7387: {0}%
+CANCEL=\u53D6\u6D88
+CASCADE=\u5C42\u53E0(&C)
+CHART_COLON=\u56FE\u8868(&C):
+CLASS_PATH=\u7C7B\u8DEF\u5F84
+CLASS=\u7C7B
+CLASS_NAME=ClassName
+CLASS_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u52A0\u8F7D: {0}    \u5DF2\u5378\u8F7D: {1}    \u603B\u8BA1: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u5DF2\u52A0\u8F7D\u7C7B\u7684\u56FE\u8868\u3002
+CLASSES=\u7C7B
+CLOSE=\u5173\u95ED
+COLUMN_NAME=\u540D\u79F0
+COLUMN_PID=PID
+COMMITTED_MEMORY=\u63D0\u4EA4\u7684\u5185\u5B58
+COMMITTED_VIRTUAL_MEMORY=\u63D0\u4EA4\u7684\u865A\u62DF\u5185\u5B58
+COMMITTED=\u5DF2\u63D0\u4EA4
+COMPILER=\u7F16\u8BD1\u5668
+COMPOSITE_DATA=CompositeData
+CONFIG=\u914D\u7F6E
+CONNECT=\u8FDE\u63A5(&C)
+CONNECT_ELLIPSIS=\u8FDE\u63A5...
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=\u8FDE\u63A5\u5230 Java \u865A\u62DF\u673A
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u4E0E\u672C\u5730\u6216\u8FDC\u7A0B Java \u865A\u62DF\u673A\u5EFA\u7ACB\u65B0\u8FDE\u63A5\u7684\u5BF9\u8BDD\u6846
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
+CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u5EFA\u8FDE\u63A5
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u72B6\u6001\u680F
+CONNECT_DIALOG_TITLE=JConsole: \u65B0\u5EFA\u8FDE\u63A5
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u5DF2\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u65AD\u5F00\u8FDE\u63A5\u3002
+CONNECTION_FAILED=\u8FDE\u63A5\u5931\u8D25
+CONNECTION=\u8FDE\u63A5(&C)
+CONNECTION_NAME=\u8FDE\u63A5\u540D\u79F0
+CONNECTION_NAME__DISCONNECTED_={0} (\u5DF2\u65AD\u5F00\u8FDE\u63A5)
+CONSTRUCTOR=\u6784\u9020\u5668
+CURRENT_CLASSES_LOADED=\u5DF2\u52A0\u88C5\u5F53\u524D\u7C7B
+CURRENT_HEAP_SIZE=\u5F53\u524D\u5806\u5927\u5C0F
+CURRENT_VALUE=\u5F53\u524D\u503C: {0}
+CREATE=\u521B\u5EFA
+DAEMON_THREADS=\u5B88\u62A4\u7A0B\u5E8F\u7EBF\u7A0B
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5DF2\u65AD\u5F00\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u8FDE\u63A5\u3002
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u53CC\u51FB\u4EE5\u5C55\u5F00/\u9690\u85CF
+DOUBLE_CLICK_TO_VISUALIZE=\u53CC\u51FB\u4EE5\u4F7F\u5176\u53EF\u89C1
+DESCRIPTION=\u8BF4\u660E
+DESCRIPTION_COLON_=\u8BF4\u660E:
+DESCRIPTOR=\u63CF\u8FF0\u7B26
+DETAILS=\u8BE6\u7EC6\u4FE1\u606F
+DETECT_DEADLOCK=\u68C0\u6D4B\u6B7B\u9501(&D)
+DETECT_DEADLOCK_TOOLTIP=\u68C0\u6D4B\u5904\u4E8E\u6B7B\u9501\u72B6\u6001\u7684\u7EBF\u7A0B
+DIMENSION_IS_NOT_SUPPORTED_COLON=\u4E0D\u652F\u6301\u7EF4:
+DISCARD_CHART=\u653E\u5F03\u56FE\u8868
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5929 |1.0<{0,number,integer} \u5929 }{1,choice,0<{1,number,integer} \u5C0F\u65F6 |1#{1,number,integer} \u5C0F\u65F6 |1<{1,number,integer} \u5C0F\u65F6 }{2,choice,0<{2,number,integer} \u5206\u949F|1#{2,number,integer} \u5206\u949F|1.0<{2,number,integer} \u5206\u949F}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5C0F\u65F6 |1<{0,number,integer} \u5C0F\u65F6 }{1,choice,0<{1,number,integer} \u5206\u949F|1#{1,number,integer} \u5206\u949F|1.0<{1,number,integer} \u5206\u949F}
+DURATION_MINUTES={0,choice,1#{0,number,integer} \u5206\u949F|1.0<{0,number,integer} \u5206\u949F}
+DURATION_SECONDS={0} \u79D2
+EMPTY_ARRAY=\u7A7A\u6570\u7EC4
+EMPTY_OPENTYPE_VIEWER=\u7A7A opentype \u67E5\u770B\u5668
+ERROR=\u9519\u8BEF
+ERROR_COLON_MBEANS_ALREADY_EXIST=\u9519\u8BEF: MBean \u5DF2\u5B58\u5728
+ERROR_COLON_MBEANS_DO_NOT_EXIST=\u9519\u8BEF: MBean \u4E0D\u5B58\u5728
+ERROR_COLON=\u9519\u8BEF:
+EVENT=\u4E8B\u4EF6
+EXIT=\u9000\u51FA(&X)
+FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u6587\u4EF6\u5DF2\u5B58\u5728:<br>{0}<br>\u662F\u5426\u8981\u66FF\u6362?
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u66FF\u6362
+FILE_CHOOSER_FILE_EXISTS_TITLE=\u6587\u4EF6\u5DF2\u5B58\u5728
+FILE_CHOOSER_SAVED_FILE=<html>\u5DF2\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>({1} \u5B57\u8282)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u672A\u80FD\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u5931\u8D25
+FREE_PHYSICAL_MEMORY=\u7A7A\u95F2\u7269\u7406\u5185\u5B58
+FREE_SWAP_SPACE=\u7A7A\u95F2\u4EA4\u6362\u7A7A\u95F4
+GARBAGE_COLLECTOR=\u5783\u573E\u6536\u96C6\u5668
+GTK_CAPITALIZED=GTK
+GC_INFO=\u540D\u79F0 = ''{0}'', \u6536\u96C6 = {1,choice,-1#Unavailable|0#{1,number,integer}}, \u603B\u82B1\u8D39\u65F6\u95F4 = {2}
+GC_TIME=GC \u65F6\u95F4
+GC_TIME_DETAILS={1}\u4E0A\u7684{0} ({2}\u6536\u96C6)
+HEAP_MEMORY_USAGE=\u5806\u5185\u5B58\u4F7F\u7528\u91CF
+HEAP=\u5806
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=\u5305\u542B\u6709\u5173 JConsole \u548C JDK \u7248\u672C\u4FE1\u606F\u7684\u5BF9\u8BDD\u6846
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole \u7248\u672C:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM \u7248\u672C:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole
+HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole \u7528\u6237\u6307\u5357(&U):<br>{0}
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
+HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A)
+HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U)
+HELP_MENU_TITLE=\u5E2E\u52A9(&H)
+HOTSPOT_MBEANS_ELLIPSIS=HotSpot MBean(&H)...
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u7BA1\u7406 HotSpot MBean \u7684\u5BF9\u8BDD\u6846
+IMPACT=\u5F71\u54CD
+INFO=\u4FE1\u606F
+INFO_CAPITALIZED=\u4FE1\u606F
+INVALID_PLUGIN_PATH=\u8B66\u544A: \u63D2\u4EF6\u8DEF\u5F84\u65E0\u6548: {0}
+INVALID_URL=URL \u65E0\u6548: {0}
+IS=\u662F
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
+JCONSOLE_COLON_=JConsole: {0}
+JCONSOLE_VERSION=JConsole \u7248\u672C "{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
+JIT_COMPILER=JIT \u7F16\u8BD1\u5668
+JAVA_VIRTUAL_MACHINE=Java \u865A\u62DF\u673A
+JAVA=Java
+LIBRARY_PATH=\u5E93\u8DEF\u5F84
+LISTENERS=\u76D1\u542C\u7A0B\u5E8F
+LIVE_THREADS=\u6D3B\u52A8\u7EBF\u7A0B
+LOADED=\u5DF2\u52A0\u8F7D
+LOCAL_PROCESS_COLON=\u672C\u5730\u8FDB\u7A0B(&L):
+LOOK_AND_FEEL=\u5916\u89C2
+MASTHEAD_FONT=Dialog-PLAIN-25
+MANAGEMENT_NOT_ENABLED=<b>\u6CE8</b>: \u672A\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
+MANAGEMENT_WILL_BE_ENABLED=<b>\u6CE8</b>: \u5C06\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
+MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
+MBEAN_INFO=MBeanInfo
+MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
+MBEAN_OPERATION_INFO=MBeanOperationInfo
+MBEANS=MBean
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u6E05\u9664(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u6E05\u9664\u901A\u77E5
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u7EC4\u5408\u5BFC\u822A{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u7EC4\u5408\u5BFC\u822A
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u5237\u65B0(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5237\u65B0\u5C5E\u6027
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u8BA2\u9605(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u5F00\u59CB\u76D1\u542C\u901A\u77E5
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u5BFC\u822A{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u5BFC\u822A
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean: 
+MAX=\u6700\u5927\u503C
+MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
+MEMORY=\u5185\u5B58
+MEMORY_POOL_LABEL=\u5185\u5B58\u6C60 "{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u7528: {0}    \u5DF2\u63D0\u4EA4: {1}    \u6700\u5927: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=\u5927\u4E8E{0}\u7684\u9608\u503C\u3002\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u5185\u5B58\u6C60\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=\u4F4E\u4E8E{0}\u7684\u9608\u503C\u3002\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MESSAGE=\u6D88\u606F
+METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5
+MINIMIZE_ALL=\u5168\u90E8\u6700\u5C0F\u5316(&M)
+MINUS_VERSION=\u8FD9\u662F{0}\u7248\u672C {1}
+MONITOR_LOCKED=\ \ \ - \u5DF2\u9501\u5B9A {0}\n
+MOTIF=Motif
+NAME_BUILD_AND_MODE={0} (\u5DE5\u4F5C\u7248\u672C {1}, {2})
+NAME_AND_BUILD={0} (\u5DE5\u4F5C\u7248\u672C {1})
+NAME=\u540D\u79F0
+NAME_COLON_=\u540D\u79F0:
+NAME_STATE=\u540D\u79F0: {0}\n\u72B6\u6001: {1}\n
+NAME_STATE_LOCK_NAME=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}, \u62E5\u6709\u8005: {3}\n
+NEW_CONNECTION_ELLIPSIS=\u65B0\u5EFA\u8FDE\u63A5(&N)...
+NEW_VALUE_APPLIED=\u5DF2\u5E94\u7528\u65B0\u503C
+NO_ATTRIBUTE_SELECTED=\u672A\u9009\u62E9\u5C5E\u6027
+NO_DEADLOCK_DETECTED=\u672A\u68C0\u6D4B\u5230\u6B7B\u9501
+NO_VALUE_SELECTED=\u672A\u9009\u62E9\u503C
+NON_HEAP_MEMORY_USAGE=\u975E\u5806\u5185\u5B58\u4F7F\u7528\u91CF
+NON_HEAP=\u975E\u5806
+NOT_YET_IMPLEMENTED=\u5C1A\u672A\u5B9E\u73B0
+NOT_A_VALID_EVENT_BROADCASTER=\u4E0D\u662F\u6709\u6548\u7684\u4E8B\u4EF6\u5E7F\u64AD\u8005
+NOTIFICATION=\u901A\u77E5
+NOTIFICATION_BUFFER=\u901A\u77E5\u7F13\u51B2\u533A
+NOTIFICATIONS=\u901A\u77E5
+NOTIF_TYPES=NotifTypes
+NUMBER_OF_THREADS=\u7EBF\u7A0B\u6570
+NUMBER_OF_LOADED_CLASSES=\u5DF2\u52A0\u8F7D\u7C7B\u6570
+NUMBER_OF_PROCESSORS=\u5904\u7406\u7A0B\u5E8F\u6570
+OBJECT_NAME=ObjectName
+OPERATING_SYSTEM=\u64CD\u4F5C\u7CFB\u7EDF
+OPERATION=\u64CD\u4F5C
+OPERATION_INVOCATION=\u64CD\u4F5C\u8C03\u7528
+OPERATION_RETURN_VALUE=\u64CD\u4F5C\u8FD4\u56DE\u503C
+OPERATIONS=\u64CD\u4F5C
+OVERVIEW=\u6982\u89C8
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u56FE\u8868\u3002
+PARAMETER=\u53C2\u6570
+PASSWORD_COLON_=\u53E3\u4EE4(&P):
+PASSWORD_ACCESSIBLE_NAME=\u53E3\u4EE4
+PEAK=\u5CF0\u503C
+PERFORM_GC=\u6267\u884C GC(&G)
+PERFORM_GC_TOOLTIP=\u8BF7\u6C42\u5783\u573E\u6536\u96C6
+PLOTTER_ACCESSIBLE_NAME=\u56FE\u8868
+PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u672A\u7ED8\u5236\u6570\u636E\u3002
+PLOTTER_SAVE_AS_MENU_ITEM=\u5C06\u6570\u636E\u53E6\u5B58\u4E3A(&A)...
+PLOTTER_TIME_RANGE_MENU=\u65F6\u95F4\u8303\u56F4(&T)
+PROBLEM_ADDING_LISTENER=\u6DFB\u52A0\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_DISPLAYING_MBEAN=\u663E\u793A MBean \u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_INVOKING=\u8C03\u7528\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_REMOVING_LISTENER=\u5220\u9664\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_SETTING_ATTRIBUTE=\u8BBE\u7F6E\u5C5E\u6027\u65F6\u51FA\u73B0\u95EE\u9898
+PROCESS_CPU_TIME=\u8FDB\u7A0B CPU \u65F6\u95F4
+R_FORWARD_SLASH_W_CAPITALIZED=\u8BFB\u5199
+READABLE=\u53EF\u8BFB
+RECEIVED=\u6536\u5230
+RECONNECT=\u91CD\u65B0\u8FDE\u63A5
+REMOTE_PROCESS_COLON=\u8FDC\u7A0B\u8FDB\u7A0B(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8FDC\u7A0B\u8FDB\u7A0B
+REMOVE=\u5220\u9664
+RESTORE_ALL=\u5168\u90E8\u8FD8\u539F(&R)
+RETURN_VALUE=\u8FD4\u56DE\u503C
+RETURN_TYPE=ReturnType
+SEQ_NUM=SeqNum
+SIZE_BYTES={0,number,integer} \u5B57\u8282
+SIZE_GB={0} Gb
+SIZE_KB={0} Kb
+SIZE_MB={0} Mb
+SOURCE=\u6E90
+STACK_TRACE=\n\u5806\u6808\u8DDF\u8E2A: \n
+SUCCESS_COLON=\u6210\u529F:
+SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u6682\u6302\u6700\u7EC8\u5904\u7406
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u5BF9\u8C61
+SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
+SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
+TABULAR_DATA_ARE_NOT_SUPPORTED=\u4E0D\u652F\u6301 TabularData
+THREADS=\u7EBF\u7A0B
+THREAD_TAB_INFO_LABEL_FORMAT=<html>\u6D3B\u52A8: {0}    \u5CF0\u503C: {1}    \u603B\u8BA1: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
+THRESHOLD=\u9608\u503C
+TILE=\u5E73\u94FA(&T)
+TIME_RANGE_COLON=\u65F6\u95F4\u8303\u56F4(&T):
+TIME=\u65F6\u95F4
+TIME_STAMP=TimeStamp
+TOTAL_LOADED=\u52A0\u8F7D\u603B\u6570
+TOTAL_CLASSES_LOADED=\u5DF2\u52A0\u8F7D\u7C7B\u603B\u6570
+TOTAL_CLASSES_UNLOADED=\u5DF2\u5378\u8F7D\u7C7B\u603B\u6570
+TOTAL_COMPILE_TIME=\u603B\u7F16\u8BD1\u65F6\u95F4
+TOTAL_PHYSICAL_MEMORY=\u603B\u7269\u7406\u5185\u5B58
+TOTAL_THREADS_STARTED=\u542F\u52A8\u7684\u7EBF\u7A0B\u603B\u6570
+TOTAL_SWAP_SPACE=\u603B\u4EA4\u6362\u7A7A\u95F4
+TYPE=\u7C7B\u578B
+UNAVAILABLE=\u4E0D\u53EF\u7528
+UNKNOWN_CAPITALIZED=UNKNOWN
+UNKNOWN_HOST=\u672A\u77E5\u4E3B\u673A: {0}
+UNREGISTER=\u6CE8\u9500
+UPTIME=\u8FD0\u884C\u65F6\u95F4
+UPTIME_COLON_=\u8FD0\u884C\u65F6\u95F4:
+USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
+REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt; \u6216 service:jmx:&lt;protocol&gt;:&lt;sap&gt;
+USED=\u5DF2\u7528
+USERNAME_COLON_=\u7528\u6237\u540D(&U):
+USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
+USER_DATA=UserData
+VIRTUAL_MACHINE=\u865A\u62DF\u673A
+VM_ARGUMENTS=VM \u53C2\u6570
+VM_CAPITALIZED=VM
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u76D1\u89C6 Java \u865A\u62DF\u673A\u7684\u5185\u90E8\u6846\u67B6
+VALUE=\u503C
+VENDOR=\u4F9B\u5E94\u5546
+VERBOSE_OUTPUT=\u8BE6\u7EC6\u8F93\u51FA
+VERBOSE_OUTPUT_TOOLTIP=\u4E3A\u7C7B\u52A0\u8F7D\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA
+VIEW_VALUE=\u89C6\u56FE\u503C
+VIEW=\u89C6\u56FE
+WINDOW=\u7A97\u53E3(&W)
+WINDOWS=\u7A97\u53E3
+WRITABLE=\u53EF\u5199\u5165
+YOU_CANNOT_DROP_A_CLASS_HERE=\u65E0\u6CD5\u5220\u9664\u6B64\u5904\u7684\u7C7B
+COLLAPSE=\u6298\u53E0
+CONNECTION_FAILED1=\u8FDE\u63A5\u5931\u8D25: \u662F\u5426\u91CD\u8BD5?
+CONNECTION_FAILED2=\u672A\u6210\u529F\u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u8981\u91CD\u8BD5?
+CONNECTION_LOST1=\u8FDE\u63A5\u4E22\u5931: \u662F\u5426\u91CD\u65B0\u8FDE\u63A5?
+CONNECTION_LOST2=\u7531\u4E8E\u8FDC\u7A0B\u8FDB\u7A0B\u5DF2\u7EC8\u6B62, \u4E0E{0}\u7684\u8FDE\u63A5\u4E22\u5931\u3002<br>\u662F\u5426\u8981\u91CD\u65B0\u8FDE\u63A5?
+CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0}
+CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002
+DEADLOCK_ALL_TAB=\u5168\u90E8
+DEADLOCK_TAB=\u6B7B\u9501
+DEADLOCK_TAB_N=\u6B7B\u9501{0}
+EXPAND=\u5C55\u5F00
+KBYTES={0} KB
+OPERATION_LOWERCASE=\u64CD\u4F5C
+PLOT=\u7ED8\u56FE
+VISUALIZE=\u53EF\u89C6\u5316
+ZZ_USAGE_TEXT=\u7528\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u5C06\u66F4\u65B0\u95F4\u9694\u8BBE\u7F6E\u4E3A n \u79D2 (\u9ED8\u8BA4\u503C\u4E3A 4 \u79D2)\n  -notile     \u521D\u59CB\u4E0D\u5E73\u94FA\u7A97\u53E3 (\u5BF9\u4E8E\u4E24\u4E2A\u6216\u591A\u4E2A\u8FDE\u63A5)\n  -pluginpath \u6307\u5B9A jconsole \u7528\u4E8E\u67E5\u627E\u63D2\u4EF6\u7684\u8DEF\u5F84\n  -version    \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C\n\n  connection = pid || host:port || JMX URL (service:jmx:<\u534F\u8BAE>://...)\n  pid         \u76EE\u6807\u8FDB\u7A0B\u7684\u8FDB\u7A0B ID\n  host        \u8FDC\u7A0B\u4E3B\u673A\u540D\u6216 IP \u5730\u5740\n  port        \u8FDC\u7A0B\u8FDE\u63A5\u7684\u7AEF\u53E3\u53F7\n\n  -J          \u6307\u5B9A\u8FD0\u884C jconsole \u7684 Java \u865A\u62DF\u673A\n              \u7684\u8F93\u5165\u53C2\u6570
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
index 1d476c8..e1d3fda 100644
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
diff --git a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
index 20518be..f4af21d 100644
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties
index 1aa8ef4..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Alle
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Schwerwiegend
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Warnung
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Information
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Konfiguration
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Fein
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Feiner
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=Am feinsten
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=Deaktiviert
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties
index 90de2e8..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Todo
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Grave
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Advertencia
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Informaci\u00F3n
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Configurar
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Detallado
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Muy Detallado
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=M\u00E1s Detallado
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=Desactivado
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties
index af34d6f..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Tout
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Grave
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Avertissement
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Infos
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Config
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Pr\u00E9cis
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Plus pr\u00E9cis
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=Le plus pr\u00E9cis
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=D\u00E9sactiv\u00E9
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties
index 73a3b5c..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Tutto
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Grave
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Avvertenza
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Informazioni
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Configurazione
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Buono
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Migliore
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=Ottimale
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=Non attivo
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties
index 60358d1..980c335 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties
@@ -29,18 +29,18 @@
 # The following ALL CAPS words should be translated.
 ALL=\u3059\u3079\u3066
 # The following ALL CAPS words should be translated.
-SEVERE=\u91CD\u5927
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
 INFO=\u60C5\u5831
 # The following ALL CAPS words should be translated.
-CONFIG= \u69CB\u6210
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=\u666E\u901A
+FINE=\u8A73\u7D30\u30EC\u30D9\u30EB(\u4F4E)
 # The following ALL CAPS words should be translated.
-FINER=\u8A73\u7D30
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=\u6700\u3082\u8A73\u7D30
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
 OFF=\u30AA\u30D5
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties
index 6d5dc55..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\uBAA8\uB450
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=\uC2EC\uAC01
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=\uACBD\uACE0
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=\uC815\uBCF4
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= \uAD6C\uC131
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=\uBBF8\uC138
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=\uBCF4\uB2E4 \uBBF8\uC138
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=\uAC00\uC7A5 \uBBF8\uC138
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=\uD574\uC81C
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
index 29229f2..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Tudo
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Grave
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Advert\u00EAncia
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Informa\u00E7\u00F5es
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Configura\u00E7\u00E3o
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Detalhado
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Mais Detalhado
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=O Mais Detalhado
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=Desativado
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties
index b760786..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=Alla
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=Allvarlig
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=Varning
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=Info
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= Konfig
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=Fin
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=Finare
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=Finaste
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=Av
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
index 67dd2b8..da17c47 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\u5168\u90E8
+ALL=ALL
 # The following ALL CAPS words should be translated.
-SEVERE=\u4E25\u91CD
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
-INFO=\u4FE1\u606F
+INFO=INFO
 # The following ALL CAPS words should be translated.
-CONFIG= \u914D\u7F6E
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
-FINE=\u8BE6\u7EC6
+FINE=FINE
 # The following ALL CAPS words should be translated.
-FINER=\u8F83\u8BE6\u7EC6
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=\u975E\u5E38\u8BE6\u7EC6
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
-OFF=\u7981\u7528
+OFF=OFF
diff --git a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
index 4875bc8..d7ad070 100644
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\u5168\u90E8
+ALL=\u6240\u6709
 # The following ALL CAPS words should be translated.
-SEVERE=\u56B4\u91CD
+SEVERE=SEVERE
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=WARNING
 # The following ALL CAPS words should be translated.
 INFO=\u8CC7\u8A0A
 # The following ALL CAPS words should be translated.
-CONFIG= \u7D44\u614B
+CONFIG= CONFIG
 # The following ALL CAPS words should be translated.
 FINE=\u8A73\u7D30
 # The following ALL CAPS words should be translated.
-FINER=\u8F03\u8A73\u7D30
+FINER=FINER
 # The following ALL CAPS words should be translated.
-FINEST=\u6700\u8A73\u7D30
+FINEST=FINEST
 # The following ALL CAPS words should be translated.
 OFF=\u95DC\u9589
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties
index dc66691..9d6f940 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -40,7 +41,7 @@
 
 aa=Afar
 ab=Abchasisch
-ae=Avestisch
+ae=Avestisch 
 af=Afrikaans
 ak=Akan
 am=Amharisch
@@ -61,15 +62,15 @@
 br=Bretonisch
 bs=Bosnisch
 ca=Katalanisch
-ce=Chechen
+ce=Tschetschenisch
 ch=Chamorro
 co=Korsisch
 cr=Cree
 cs=Tschechisch
-cu=Church Slavic
+cu=Kirchenslawisch
 cv=Chuvash
 cy=Walisisch
-da=D\u00e4nisch
+da=D\u00E4nisch
 de=Deutsch
 dv=Divehi
 dz=Bhutani
@@ -84,17 +85,17 @@
 ff=Fulah
 fi=Finnisch
 fj=Fidschi
-fo=Far\u00f6isch
-fr=Franz\u00f6sisch
+fo=F\u00E4r\u00F6isch 
+fr=Franz\u00F6sisch
 fy=Friesisch
 ga=Irisch
-gd=Schottisches G\u00e4lisch
+gd=Schottisches G\u00E4lisch
 gl=Galizisch
 gn=Guarani
 gu=Gujaratisch
 gv=Manx
 ha=Haussa
-he=Hebr\u00e4isch
+he=Hebr\u00E4isch
 hi=Hindi
 ho=Hiri Motu
 hr=Kroatisch
@@ -110,19 +111,19 @@
 ik=Inupiak
 in=Indonesisch
 io=Ido
-is=Isl\u00e4ndisch
+is=Isl\u00E4ndisch
 it=Italienisch
 iu=Inuktitut
-iw=Hebr\u00e4isch
+iw=Hebr\u00E4isch
 ja=Japanisch
 ji=Jiddish
-jv=Javanisch
+jv=Javanesisch
 ka=Georgisch
 kg=Kongo
 ki=Kikuyu
 kj=Kwanyama
 kk=Kasachisch
-kl=Gr\u00f6nl\u00e4ndisch
+kl=Gr\u00F6nl\u00E4ndisch
 km=Kambodschanisch
 kn=Kannada
 ko=Koreanisch
@@ -133,7 +134,7 @@
 kw=Cornish
 ky=Kirgisisch
 la=Lateinisch
-lb=Letzeburgisch
+lb=Luxemburgisch
 lg=Ganda
 li=Limburgisch
 ln=Lingalisch
@@ -152,15 +153,15 @@
 ms=Malay
 mt=Maltesisch
 my=Burmesisch
-na=Nauruisch
-nb=Norwegisch, Bokm\u00e5l
+na=Nauru
+nb=Norwegisch Bokm\u00E5l
 nd=Nord-Ndebele
-ne=Nepalisch
+ne=Nepalesisch
 ng=Ndonga
-nl=Niederl\u00e4ndisch
+nl=Niederl\u00E4ndisch
 nn=Norwegisch, Nynorsk
 no=Norwegisch
-nr=S\u00fcd-Ndebele
+nr=S\u00FCd-Ndebele
 nv=Navajo
 ny=Nyanja
 oc=Okzitanisch
@@ -174,14 +175,14 @@
 ps=Paschtu (Pushto)
 pt=Portugiesisch
 qu=Quechua
-rm=R\u00e4toromanisch
+rm=R\u00E4toromanisch
 rn=Kirundisch
-ro=Rum\u00e4nisch
+ro=Rum\u00E4nisch
 ru=Russisch
-rw=Ruanda
+rw=Kinyarwanda
 sa=Sanskrit
 sc=Sardisch
-sd=Zinti
+sd=Sindhi
 se=Nord-Sami
 sg=Sango
 si=Singhalesisch
@@ -192,12 +193,12 @@
 so=Somalisch
 sq=Albanisch
 sr=Serbisch
-ss=Swasil\u00e4ndisch
+ss=Swasil\u00E4ndisch
 st=Sesothisch
-su=Sudanesisch
+su=Sundanesisch
 sv=Schwedisch
 sw=Suaheli
-ta=Tamilisch
+ta=Tamil
 te=Telugu
 tg=Tadschikisch
 th=Thai
@@ -206,8 +207,8 @@
 tl=Tagalog
 tn=Sezuan
 to=Tongaisch
-tr=T\u00fcrkisch
-ts=Tsongaisch
+tr=T\u00FCrkisch
+ts=Tsonga
 tt=Tatarisch
 tw=Twi
 ty=Tahitisch
@@ -217,7 +218,7 @@
 uz=Usbekisch
 ve=Venda
 vi=Vietnamesisch
-vo=Volap\u00fck
+vo=Volap\u00FCk
 wa=Wallonisch
 wo=Wolof
 xh=Xhosa
@@ -540,7 +541,7 @@
 nic=Cordoba
 niu=Niue-Sprache
 nno=Norwegisch, Nynorsk
-nob=Bokmal, Norwegisch
+nob=Bokm\u00E5l, Norwegisch
 nog=Nogai
 non=Altnordisch
 nor=Norwegisch
@@ -577,7 +578,7 @@
 pon=Ponapeanisch
 por=Portugiesisch
 pra=Prakrit
-pro=Altprovenzalisch
+pro=Provenzalisch, Alt (bis 1500)
 pus=Paschtunisch
 que=Quechua
 raj=Rajasthani
@@ -621,7 +622,7 @@
 smo=Samoanisch
 sms=Skolt-Lappisch
 sna=Schonisch
-snd=Zinti-Sprache
+snd=Sindhi
 snk=Soninke-Sprache
 sog=Sogdisch 
 som=Somalisch
@@ -672,7 +673,7 @@
 tup=Tupi-Sprache
 tur=T\u00FCrkisch
 tut=Altaisch
-tvl=Elliceanisch
+tvl=Tuvalu
 twi=Twi
 tyv=Tuwinisch
 udm=Udmurtisch
@@ -806,7 +807,7 @@
 Narb=Altes Nordarabisch
 Nbat=Nabat\u00E4isch
 Nkgb=Nakhi Geba
-Nkoo=N'Ko
+Nkoo=N\u2019Ko
 Ogam=Ogham
 Olck=Ol Chiki
 Orkh=Orchon-Runen
@@ -830,7 +831,7 @@
 Saur=Saurashtra
 Sgnw=Geb\u00E4rdensprache
 Shaw=Shaw-Alphabet
-Sind=Zinti-Sprache
+Sind=Sindhi
 Sinh=Sinhala
 Sund=Sundanesisch
 Sylo=Syloti Nagri
@@ -874,15 +875,15 @@
 AI=Anguilla
 AL=Albanien
 AM=Armenien
-AN=Niederl\u00e4ndische Antillen
+AN=Niederl\u00E4ndische Antillen
 AO=Angola
 AQ=Antarktis
 AR=Argentinien
 AS=Amerikanisch-Samoa
-AT=\u00d6sterreich
+AT=\u00D6sterreich
 AU=Australien
 AW=Aruba
-AX=Aaland-Inseln
+AX=\u00C5land-Inseln
 AZ=Aserbaidschan
 BA=Bosnien und Herzegowina
 BB=Barbados
@@ -902,7 +903,7 @@
 BS=Bahamas
 BT=Bhutan
 BV=Bouvet-Insel
-BW=Botsuana
+BW=Botswana
 BY=Belarus
 BZ=Belize
 CA=Kanada
@@ -911,7 +912,7 @@
 CF=Zentralafrikanische Republik
 CG=Kongo
 CH=Schweiz
-CI=Elfenbeink\u00fcste
+CI=Elfenbeink\u00FCste
 CK=Cook-Inseln
 CL=Chile
 CM=Kamerun
@@ -927,38 +928,38 @@
 CZ=Tschechische Republik
 DE=Deutschland
 DJ=Dschibuti
-DK=D\u00e4nemark
+DK=D\u00E4nemark
 DM=Dominica
 DO=Dominikanische Republik
 DZ=Algerien
 EC=Ecuador
 EE=Estland
-EG=\u00c4gypten
+EG=\u00C4gypten
 EH=Westsahara
 ER=Eritrea
 ES=Spanien
-ET=\u00c4thiopien
+ET=\u00C4thiopien
 FI=Finnland
 FJ=Fidschi
 FK=Falkland-Inseln
-FM=Mikronesien
-FO=F\u00e4r\u00f6er-Inseln
+FM=Mikronesisches Inselgebiet
+FO=F\u00E4r\u00F6er-Inseln
 FR=Frankreich
 GA=Gabun
-GB=Vereinigtes K\u00f6nigreich
+GB=Vereinigtes K\u00F6nigreich
 GD=Grenada
 GE=Georgien
-GF=Franz\u00f6sisch-Guayana
+GF=Franz\u00F6sisch-Guayana
 GG=Guernsey
 GH=Ghana
 GI=Gibraltar
-GL=Gr\u00f6nland
+GL=Gr\u00F6nland
 GM=Gambia
 GN=Guinea
 GP=Guadeloupe
-GQ=\u00c4quatorial-Guinea
+GQ=\u00C4quatorial-Guinea
 GR=Griechenland
-GS=S\u00fcd-Georgia und die s\u00fcdlichen Sandwich-Inseln
+GS=S\u00FCdgeorgien und die S\u00FCdlichen Sandwich-Inseln
 GT=Guatemala
 GU=Guam
 GW=Guinea-Bissau
@@ -990,7 +991,7 @@
 KM=Komoren
 KN=Saint Kitts und Nevis
 KP=Nordkorea
-KR=S\u00fcdkorea
+KR=S\u00FCdkorea
 KW=Kuwait
 KY=Kaiman-Inseln
 KZ=Kasachstan
@@ -1014,16 +1015,16 @@
 MH=Marshall-Inseln
 MK=Mazedonien
 ML=Mali
-MM=Myanmar
+MM=Birmanisch
 MN=Mongolei
 MO=Macao
-MP=N\u00f6rdliche Mariannen-Inseln
+MP=N\u00F6rdliche Marianen
 MQ=Martinique
 MR=Mauretanien
 MS=Montserrat
 MT=Malta
 MU=Mauritius
-MV=Maldiven
+MV=Malediven
 MW=Malawi
 MX=Mexiko
 MY=Malaysia
@@ -1043,7 +1044,7 @@
 OM=Oman
 PA=Panama
 PE=Peru
-PF=Franz\u00f6sisch-Polynesien
+PF=Franz\u00F6sisch-Polynesien
 PG=Papua-Neuguinea
 PH=Philippinen
 PK=Pakistan
@@ -1051,18 +1052,18 @@
 PM=St. Pierre und Miquelon
 PN=Pitcairn
 PR=Puerto Rico
-PS=Pal\u00e4stina
+PS=Pal\u00E4stina
 PT=Portugal
 PW=Palau
 PY=Paraguay
 QA=Katar
 RE=Reunion
-RO=Rum\u00e4nien
+RO=Rum\u00E4nien
 RS=Serbien
 RU=Russland
 RW=Ruanda
 SA=Saudi-Arabien
-SB=Solomon-Inseln
+SB=Salomonen
 SC=Seychellen
 SD=Sudan
 SE=Schweden
@@ -1083,7 +1084,7 @@
 SZ=Swasiland
 TC=Turks- und Caicos-Inseln
 TD=Tschad
-TF=Franz\u00f6sische S\u00fcdgebiete
+TF=Franz\u00F6sische S\u00FCdgebiete
 TG=Togo
 TH=Thailand
 TJ=Tadschikistan
@@ -1092,14 +1093,14 @@
 TM=Turkmenistan
 TN=Tunesien
 TO=Tonga
-TR=T\u00fcrkei
+TR=T\u00FCrkei
 TT=Trinidad und Tobago
 TV=Tuvalu
 TW=Taiwan
 TZ=Tansania
 UA=Ukraine
 UG=Uganda
-UM=\u00dcbrige Inseln im Pazifik der USA
+UM=\u00DCbrige Inseln im Pazifik der USA
 US=Vereinigte Staaten von Amerika
 UY=Uruguay
 UZ=Usbekistan
@@ -1114,7 +1115,7 @@
 WS=Samoa
 YE=Jemen
 YT=Mayotte
-ZA=S\u00fcdafrika
+ZA=S\u00FCdafrika
 ZM=Sambia
 ZW=Simbabwe
 
@@ -1151,3 +1152,19 @@
 154=Nordeuropa
 155=Westeuropa
 419=Lateinamerika und Karibik
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Norwegisch (Nynorsk)
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties
index 8022bdd..615b047 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -40,124 +41,124 @@
 
 aa=afar
 ab=abjasio
-ae=av\u00e9stico
+ae=av\u00E9stico
 af=afrikaans
 ak=akan
-am=am\u00e1rico
-an=aragon\u00e9s
-ar=\u00e1rabe
-as=asam\u00e9s
+am=am\u00E1rico
+an=aragon\u00E9s
+ar=\u00E1rabe
+as=asam\u00E9s
 av=avar
 ay=aimara
-az=azer\u00ed
+az=azer\u00ED
 ba=bashkir
 be=bielorruso
-bg=b\u00falgaro
+bg=b\u00FAlgaro
 bh=bihari
 bi=bislama
 bm=bambara
-bn=bengal\u00ed
+bn=bengal\u00ED
 bo=tibetano
-br=bret\u00f3n
+br=bret\u00F3n
 bs=bosnio
-ca=catal\u00e1n
+ca=catal\u00E1n
 ce=checheno
 ch=chamorro
 co=corso
-cr=cree
+cr=clisteno
 cs=checo
-cu=eslavo eclesi\u00e1stico
+cu=eslavo eclesi\u00E1stico
 cv=chuvash
-cy=gal\u00e9s
-da=dan\u00e9s
-de=alem\u00e1n
+cy=gal\u00E9s
+da=dan\u00E9s
+de=alem\u00E1n
 dv=divehi
 dz=dzongkha
 ee=ewe
 el=griego
-en=ingl\u00e9s
+en=ingl\u00E9s
 eo=esperanto
-es=espa\u00f1ol
+es=espa\u00F1ol
 et=estonio
 eu=vasco
 fa=persa
 ff=fula
-fi=fin\u00e9s
+fi=finland\u00E9s
 fj=fidjiano
-fo=fero\u00e9s
-fr=franc\u00e9s
-fy=fris\u00f3n
-ga=irland\u00e9s
-gd=ga\u00e9lico escoc\u00e9s
+fo=fero\u00E9s
+fr=franc\u00E9s
+fy=fris\u00F3n
+ga=irland\u00E9s
+gd=ga\u00E9lico escoc\u00E9s
 gl=gallego
-gn=guaran\u00ed
+gn=guaran\u00ED
 gu=gujarati
-gv=ga\u00e9lico man\u00e9s
+gv=ga\u00E9lico man\u00E9s
 ha=hausa
 he=hebreo
 hi=hindi
 ho=hiri motu
 hr=croata
 ht=haitiano
-hu=h\u00fangaro
+hu=h\u00FAngaro
 hy=armenio
 hz=herero
 ia=interlingua
 id=indonesio
-ie=interlingue
+ie=interling\u00FCe
 ig=igbo
 ii=sichuan yi
-ik=inupiaq
+ik=i\u00F1upiaq
 in=indonesio
 io=ido
-is=island\u00e9s
+is=island\u00E9s
 it=italiano
 iu=inuktitut
 iw=hebreo
-ja=japon\u00e9s
-ji=y\u00eddish
-jv=javan\u00e9s
+ja=japon\u00E9s
+ji=y\u00EDdish
+jv=javan\u00E9s
 ka=georgiano
 kg=kongo
 ki=kikuyu
-kj=kuanyama
+kj=kwanyama
 kk=kazajo
-kl=groenland\u00e9s
+kl=groenland\u00E9s
 km=jemer
-kn=canar\u00e9s
+kn=canar\u00E9s
 ko=coreano
 kr=kanuri
 ks=cachemiro
 ku=kurdo
 kv=komi
-kw=c\u00f3rnico
+kw=c\u00F3rnico
 ky=kirghiz
-la=lat\u00edn
-lb=luxemburgu\u00e9s
+la=lat\u00EDn
+lb=luxemburgu\u00E9s
 lg=ganda
-li=limburgu\u00e9s
+li=limburgu\u00E9s
 ln=lingala
 lo=laosiano
 lt=lituano
 lu=luba-katanga
-lv=let\u00f3n
+lv=let\u00F3n
 mg=malgache
-mh=marshal\u00e9s
-mi=maor\u00ed
+mh=marshal\u00E9s
+mi=maor\u00ED
 mk=macedonio
 ml=malayalam
 mn=mongol
 mo=moldavo
 mr=marathi
 ms=malayo
-mt=malt\u00e9s
+mt=malt\u00E9s
 my=birmano
 na=nauruano
-nb=bokmal noruego
+nb=noruego bokm\u00E5l
 nd=ndebele septentrional
-ne=nepal\u00ed
+ne=nepal\u00ED
 ng=ndonga
-nl=neerland\u00e9s
+nl=neerland\u00E9s
 nn=nynorsk noruego
 no=noruego
 nr=ndebele meridional
@@ -167,48 +168,48 @@
 oj=ojibwa
 om=oromo
 or=oriya
-os=os\u00e9tico
-pa=punjab\u00ed
+os=os\u00E9tico
+pa=punjab\u00ED
 pi=pali
 pl=polaco
 ps=pashto
-pt=portugu\u00e9s
+pt=portugu\u00E9s
 qu=quechua
-rm=retorrom\u00e1nico
+rm=retorrom\u00E1nico
 rn=kiroundi
 ro=rumano
 ru=ruso
 rw=kinyarwanda
-sa=s\u00e1nscrito
+sa=s\u00E1nscrito
 sc=sardo
 sd=sindhi
 se=sami septentrional
 sg=sango
-si=cingal\u00e9s
+si=cingal\u00E9s
 sk=eslovaco
 sl=esloveno
 sm=samoano
 sn=shona
-so=somal\u00ed
-sq=alban\u00e9s
+so=somal\u00ED
+sq=alban\u00E9s
 sr=serbio
 ss=siswati
 st=sesotho
-su=sundan\u00e9s
+su=sudan\u00E9s
 sv=sueco
 sw=swahili
 ta=tamil
 te=telugu
 tg=tayiko
-th=tailand\u00e9s
-ti=tigri\u00f1a
+th=tailand\u00E9s
+ti=trigri\u00F1a
 tk=turcomano
 tl=tagalo
 tn=setchwana
 to=tongano
 tr=turco
 ts=tsonga
-tt=t\u00e1rtaro
+tt=t\u00E1rtaro
 tw=twi
 ty=tahitiano
 ug=uigur
@@ -217,15 +218,15 @@
 uz=uzbeko
 ve=venda
 vi=vietnamita
-vo=volap\u00fck
-wa=val\u00f3n
+vo=volap\u00FCk
+wa=val\u00F3n
 wo=uolof
 xh=xhosa
-yi=y\u00eddish
+yi=y\u00EDdish
 yo=yoruba
 za=zhuang
 zh=chino
-zu=zul\u00fa
+zu=zul\u00FA
 
 # key is ISO 639.2 language code
 aar=afar
@@ -286,7 +287,7 @@
 bis=Bislama
 bla=siksika
 bnt=bant\u00FA
-bos=Bosnio
+bos=bosnio
 bra=braj
 bre=cruceiros brasile\u00F1os (BRE)
 btk=batak
@@ -337,7 +338,7 @@
 den=slave
 dgr=dogrib
 din=dinka
-div=Dhivehi
+div=divehi
 doi=dogri
 dra=lengua drav\u00EDdica
 dsb=sorbio inferior
@@ -540,7 +541,7 @@
 nic=c\u00F3rdobas nicarag\u00FCenses
 niu=niueano
 nno=Noruego Nynorsk
-nob=Noruego Bokmal
+nob=bokm\u00E5l, noruego
 nog=nogai
 non=n\u00F3rdico antiguo
 nor=Noruego
@@ -577,7 +578,7 @@
 pon=pohnpeiano
 por=Portugu\u00E9s
 pra=lenguas pr\u00E1critas
-pro=provenzal antiguo
+pro=provenzal antiguo (hasta 1500)
 pus=Pushto; Pashto
 que=Quechua
 raj=rajasthani
@@ -682,11 +683,11 @@
 umb=umbundu
 und=indeterminada
 urd=Urdu
-uzb=Uzbeco
+uzb=uzbeko
 vai=vai
 ven=Venda
 vie=vietnamita
-vol=Volapuk
+vol=volap\u00FCk
 vot=v\u00F3tico
 wak=lenguas wakasha
 wal=walamo
@@ -806,7 +807,7 @@
 Narb=\u00C1rabe del Norte Antiguo
 Nbat=Nabateo
 Nkgb=Nakhi Geba
-Nkoo=n'Ko
+Nkoo=N\u2019Ko
 Ogam=ogham
 Olck=ol chiki
 Orkh=orkhon
@@ -868,53 +869,53 @@
 # key is ISO 3166 country code
 
 AD=Andorra
-AE=Emiratos \u00c1rabes Unidos
-AF=Afganist\u00e1n
+AE=Emiratos \u00C1rabes Unidos
+AF=Afganist\u00E1n
 AG=Antigua y Barbuda
 AI=Anguila
 AL=Albania
 AM=Armenia
 AN=Antillas Holandesas
 AO=Angola
-AQ=Ant\u00e1rtida
+AQ=Ant\u00E1rtida
 AR=Argentina
 AS=Samoa Americana
 AT=Austria
 AU=Australia
 AW=Aruba
-AX=Islas Aland
-AZ=Azerbaiy\u00e1n
+AX=Islas \u00C5land
+AZ=Azerbaiy\u00E1n
 BA=Bosnia y Hercegovina
 BB=Barbados
 BD=Bangladesh
-BE=B\u00e9lgica
+BE=B\u00E9lgica
 BF=Burkina Faso
 BG=Bulgaria
-BH=Bahr\u00e1in
+BH=Bahr\u00E1in
 BI=Burundi
-BJ=Ben\u00edn
+BJ=Ben\u00EDn
 BL=San Bartolom\u00E9
 BM=Bermudas
-BN=Brun\u00e9i
+BN=Brun\u00E9i
 BO=Bolivia
 BQ=Bonaire, San Eustaquio y Saba
 BR=Brasil
 BS=Bahamas
-BT=But\u00e1n
+BT=But\u00E1n
 BV=Isla Bouvet
 BW=Botsuana
 BY=Bielorrusia
 BZ=Belice
-CA=Canad\u00e1
+CA=Canad\u00E1
 CC=Islas Cocos
-CD=Rep\u00fablica Democr\u00e1tica del Congo
-CF=Rep\u00fablica Centroafricana
+CD=Rep\u00FAblica Democr\u00E1tica del Congo
+CF=Rep\u00FAblica Centroafricana
 CG=Congo
 CH=Suiza
 CI=Costa de Marfil
 CK=Islas Cook
 CL=Chile
-CM=Camer\u00fan
+CM=Camer\u00FAn
 CN=China
 CO=Colombia
 CR=Costa Rica
@@ -929,22 +930,22 @@
 DJ=Yibuti
 DK=Dinamarca
 DM=Dominica
-DO=Rep\u00fablica Dominicana
+DO=Rep\u00FAblica Dominicana
 DZ=Argelia
 EC=Ecuador
 EE=Estonia
 EG=Egipto
 EH=Sahara Occidental
 ER=Eritrea
-ES=Espa\u00f1a
-ET=Etiop\u00eda
+ES=Espa\u00F1a
+ET=Etiop\u00EDa
 FI=Finlandia
 FJ=Fiyi
 FK=Islas Malvinas
 FM=Micronesia
 FO=Islas Feroe
 FR=Francia
-GA=Gab\u00f3n
+GA=Gab\u00F3n
 GB=Reino Unido
 GD=Granada
 GE=Georgia
@@ -967,35 +968,35 @@
 HM=Islas Heard y McDonald
 HN=Honduras
 HR=Croacia
-HT=Hait\u00ed
-HU=Hungr\u00eda
+HT=Hait\u00ED
+HU=Hungr\u00EDa
 ID=Indonesia
 IE=Irlanda
 IL=Israel
 IM=Isla de Man
 IN=India
-IO=Territorio Brit\u00e1nico del Oc\u00e9ano \u00cdndico
+IO=Territorio Brit\u00E1nico del Oc\u00E9ano \u00CDndico
 IQ=Iraq
-IR=Ir\u00e1n
+IR=Ir\u00E1n
 IS=Islandia
 IT=Italia
 JE=Jersey
 JM=Jamaica
 JO=Jordania
-JP=Jap\u00f3n
+JP=Jap\u00F3n
 KE=Kenia
-KG=Kirguizist\u00e1n
+KG=Kirguizist\u00E1n
 KH=Camboya
 KI=Kiribati
 KM=Comores
-KN=San Crist\u00f3bal y Nieves
+KN=San Crist\u00F3bal y Nieves
 KP=Corea del Norte
 KR=Corea del Sur
 KW=Kuwait
-KY=Islas Caim\u00e1n
-KZ=Kazajst\u00e1n
+KY=Islas Caim\u00E1n
+KZ=Kazajst\u00E1n
 LA=Laos
-LB=L\u00edbano
+LB=L\u00EDbano
 LC=Santa Lucia
 LI=Liechtenstein
 LK=Sri Lanka
@@ -1006,15 +1007,15 @@
 LV=Letonia
 LY=Libia
 MA=Marruecos
-MC=M\u00f3naco
+MC=M\u00F3naco
 MD=Moldavia
 ME=Montenegro
 MF=San Mart\u00EDn
 MG=Madagascar
 MH=Islas Marshall
 MK=Macedonia
-ML=Mal\u00ed
-MM=Myanmar
+ML=Mal\u00ED
+MM=birmano
 MN=Mongolia
 MO=Macao
 MP=Islas Marianas del Norte
@@ -1025,12 +1026,12 @@
 MU=Mauricio
 MV=Maldivas
 MW=Malaui
-MX=M\u00e9xico
+MX=M\u00E9xico
 MY=Malasia
 MZ=Mozambique
 NA=Namibia
 NC=Nueva Caledonia
-NE=N\u00edger
+NE=N\u00EDger
 NF=Isla Norfolk
 NG=Nigeria
 NI=Nicaragua
@@ -1040,15 +1041,15 @@
 NR=Nauru
 NU=Niue
 NZ=Nueva Zelanda
-OM=Om\u00e1n
-PA=Panam\u00e1
-PE=Per\u00fa
+OM=Om\u00E1n
+PA=Panam\u00E1
+PE=Per\u00FA
 PF=Polinesia Francesa
-PG=Pap\u00faa New Guinea
+PG=Pap\u00FAa New Guinea
 PH=Filipinas
-PK=Paquist\u00e1n
+PK=Paquist\u00E1n
 PL=Polonia
-PM=San Pedro y Miquel\u00f3n
+PM=San Pedro y Miquel\u00F3n
 PN=Islas Pitcairn
 PR=Puerto Rico
 PS=Palestina
@@ -1056,15 +1057,15 @@
 PW=Palaos
 PY=Paraguay
 QA=Qatar
-RE=Reuni\u00f3n
+RE=Reuni\u00F3n
 RO=Rumania
 RS=Serbia
 RU=Rusia
 RW=Ruanda
 SA=Arabia Saudita
-SB=Islas Salom\u00f3n
+SB=Islas Salom\u00F3n
 SC=Seychelles
-SD=Sud\u00e1n
+SD=Sud\u00E1n
 SE=Suecia
 SG=Singapur
 SH=Santa Helena
@@ -1076,7 +1077,7 @@
 SN=Senegal
 SO=Somalia
 SR=Surinam
-ST=Santo Tom\u00e9 y Pr\u00edncipe
+ST=Santo Tom\u00E9 y Pr\u00EDncipe
 SV=El Salvador
 SX=San Mart\u00EDn (regi\u00F3n holandesa)
 SY=Siria
@@ -1086,35 +1087,35 @@
 TF=Territorios Franceses del Sur
 TG=Togo
 TH=Tailandia
-TJ=Tayikist\u00e1n
+TJ=Tayikist\u00E1n
 TK=Tokelau
 TL=Timor Oriental
-TM=Turkmenist\u00e1n
-TN=T\u00fanez
+TM=Turkmenist\u00E1n
+TN=T\u00FAnez
 TO=Tonga
-TR=Turqu\u00eda
+TR=Turqu\u00EDa
 TT=Trinidad y Tobago
-TV=Tuvalu
-TW=Taiw\u00e1n
+TV=tuvaluano
+TW=Taiw\u00E1n
 TZ=Tanzania
 UA=Ucrania
 UG=Uganda
 UM=Islas menores alejadas de los Estados Unidos
 US=Estados Unidos
 UY=Uruguay
-UZ=Uzbekist\u00e1n
+UZ=Uzbekist\u00E1n
 VA=Ciudad del Vaticano
 VC=San Vicente y las Granadinas
 VE=Venezuela
-VG=Islas V\u00edrgenes Brit\u00e1nicas
-VI=Islas V\u00edrgenes Americanas
+VG=Islas V\u00EDrgenes Brit\u00E1nicas
+VI=Islas V\u00EDrgenes Americanas
 VN=Vietnam
 VU=Vanuatu
 WF=Wallis y Futuna
 WS=Samoa
 YE=Yemen
 YT=Mayotte
-ZA=Sud\u00e1frica
+ZA=Sud\u00E1frica
 ZM=Zambia
 ZW=Zimbabue
 
@@ -1151,3 +1152,19 @@
 154=Europa septentrional
 155=Europa occidental
 419=Latinoam\u00E9rica y el Caribe
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Nynorsk
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties
index af1564b..c40dfdd 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=afar
-ab=abkhaze
-ae=avestan
-af=afrikaans
-ak=akan
-am=amharique
-an=aragonais
-ar=arabe
-as=assamais
-av=avar
-ay=aymara
-az=az\u00e9ri
-ba=bachkir
-be=bi\u00e9lorusse
-bg=bulgare
-bh=bihari
-bi=bichlamar
-bm=bambara
-bn=bengali
-bo=tib\u00e9tain
-br=breton
-bs=bosniaque
-ca=catalan
-ce=tch\u00e9tch\u00e8ne
-ch=chamorro
-co=corse
-cr=cri
-cs=tch\u00e8que
-cu=slavon d'\u00e9glise
-cv=tchouvache
-cy=gallois
-da=danois
-de=allemand
-dv=divehi
-dz=dzongkha
-ee=\u00e9w\u00e9
-el=grec
-en=anglais
-eo=esp\u00e9ranto
-es=espagnol
-et=estonien
-eu=basque
-fa=persan
-ff=peul
-fi=finnois
-fj=fidjien
-fo=f\u00e9ro\u00efen
-fr=fran\u00e7ais
-fy=frison
-ga=irlandais
-gd=ecossais ga\u00e9lique
-gl=galicien
-gn=guarani
-gu=goudjrati
-gv=manx
-ha=haoussa
-he=h\u00e9breu
-hi=hindi
-ho=hiri motu
-hr=croate
-ht=cr\u00e9ole d'Ha\u00efti
-hu=hongrois
-hy=arm\u00e9nien
-hz=herero
-ia=interlingua
-id=indon\u00e9sien
-ie=interlingue
-ig=ibo
-ii=yi de Sichuan
-ik=inupiaq
-in=indon\u00e9sien
-io=ido
-is=islandais
-it=italien
-iu=inuktitut
-iw=h\u00e9breu
-ja=japonais
-ji=yiddish
-jv=javanais
-ka=georgien
-kg=kongo
-ki=kikuyu
-kj=kwanyama
-kk=kazakh
-kl=groenlandais
-km=khmer
-kn=kannada
-ko=cor\u00e9en
-kr=kanouri
-ks=kashmiri
-ku=kurde
-kv=komi
-kw=cornique
-ky=kirghize
-la=latin
-lb=luxembourgeois
-lg=ganda
-li=limbourgeois
-ln=lingala
-lo=lao
-lt=lithuanien
-lu=luba-katanga
-lv=letton
-mg=malgache
-mh=marshall
-mi=maori
-mk=mac\u00e9donien
-ml=malayalam
-mn=mongol
-mo=moldave
-mr=marathe
-ms=malais
-mt=maltais
-my=birman
-na=nauruan
-nb=norv\u00e9gien bokm\u00e5l
-nd=nd\u00e9b\u00e9l\u00e9 du Nord
-ne=n\u00e9palais
-ng=ndonga
-nl=n\u00e9erlandais
-nn=norv\u00e9gien nynorsk
-no=norv\u00e9gien
-nr=nd\u00e9b\u00e9l\u00e9 du Sud
-nv=navaho
-ny=nyanja
-oc=occitan
-oj=ojibwa
-om=galla
-or=oriya
-os=oss\u00e8te
-pa=pendjabi
-pi=pali
-pl=polonais
-ps=pachto
-pt=portugais
-qu=quechua
-rm=rh\u00e9toroman
-rn=rundi
-ro=roumain
-ru=russe
-rw=rwanda
-sa=sanscrit
-sc=sarde
-sd=sindhi
-se=sami du Nord
-sg=sango
-si=singhalais
-sk=slovaque
-sl=slov\u00e8ne
-sm=samoan
-sn=shona
-so=somali
-sq=albanais
-sr=serbe
-ss=swati
-st=sotho du sud
-su=soundanais
-sv=su\u00e9dois
-sw=swahili
-ta=tamoul
-te=telugu
-tg=tadjik
-th=tha\u00ef
-ti=tigrigna
-tk=turkm\u00e8ne
-tl=tagalog
-tn=setswana
-to=tonga
-tr=turc
-ts=tsonga
-tt=tatare
-tw=twi
-ty=tahitien
-ug=ou\u00efgour
-uk=ukrainien
-ur=ourdou
-uz=ouzbek
-ve=venda
-vi=vietnamien
-vo=volap\u00fck
-wa=wallon
-wo=wolof
-xh=xhosa
-yi=yiddish
-yo=yoruba
-za=zhuang
-zh=chinois
-zu=zoulou
+aa=Afar
+ab=Abkhaze
+ae=Avestan
+af=Afrikaans
+ak=Akan
+am=Amharique
+an=Aragonais
+ar=Arabe
+as=Assamais
+av=Avar
+ay=Aymara
+az=Az\u00E9ri
+ba=Bachkir
+be=Bi\u00E9lorusse
+bg=Bulgare
+bh=Bihari
+bi=Bichlamar
+bm=Bambara
+bn=Bengali
+bo=Tib\u00E9tain
+br=Breton
+bs=Bosniaque
+ca=Catalan
+ce=Tch\u00E9tch\u00E8ne
+ch=Chamorro
+co=Corse
+cr=Cri
+cs=Tch\u00E8que
+cu=Slavon liturgique
+cv=Tchouvache
+cy=Gallois
+da=Danois
+de=Allemand
+dv=Divehi
+dz=Dzongkha
+ee=Ewe
+el=Grec
+en=Anglais
+eo=Esp\u00E9ranto
+es=Espagnol
+et=Estonien
+eu=Basque
+fa=Persan
+ff=Peul
+fi=Finnois
+fj=Fidjien
+fo=F\u00E9ro\u00EFen
+fr=Fran\u00E7ais
+fy=Frison
+ga=Irlandais
+gd=Ecossais ga\u00E9lique
+gl=Galicien
+gn=Guarani
+gu=Goudjarati
+gv=Mannois
+ha=Haoussa
+he=H\u00E9breu
+hi=Hindi
+ho=Hiri Motu
+hr=Croate
+ht=Cr\u00E9ole d'Ha\u00EFti
+hu=Hongrois
+hy=Arm\u00E9nien
+hz=Herero
+ia=Interlingua
+id=Indon\u00E9sien
+ie=Interlingue
+ig=Igbo
+ii=Yi de Sichuan
+ik=Inupiaq
+in=Indon\u00E9sien
+io=Ido
+is=Islandais
+it=Italien
+iu=Inuktitut
+iw=H\u00E9breu
+ja=Japonais
+ji=Yiddish
+jv=Javanais
+ka=G\u00E9orgien
+kg=Kongo
+ki=Kikuyu
+kj=Kwanyama
+kk=Kazakh
+kl=Groenlandais
+km=Khmer
+kn=Kannada
+ko=Cor\u00E9en
+kr=Kanouri
+ks=Kashmiri
+ku=Kurde
+kv=Komi
+kw=Cornique
+ky=Kirghize
+la=Latin
+lb=Luxembourgeois
+lg=Ganda
+li=Limbourgeois
+ln=Lingala
+lo=Laotien
+lt=Lituanien
+lu=Luba-Katanga
+lv=Letton
+mg=Malgache
+mh=Marshallais
+mi=Maori
+mk=Mac\u00E9donien
+ml=Malayalam
+mn=Mongol
+mo=Moldave
+mr=Marathi
+ms=Malais
+mt=Maltais
+my=Birman
+na=Nauruan
+nb=Norv\u00E9gien bokm\u00E5l
+nd=Nd\u00E9b\u00E9l\u00E9 du Nord
+ne=N\u00E9palais
+ng=Ndonga
+nl=N\u00E9erlandais
+nn=Norv\u00E9gien nynorsk
+no=Norv\u00E9gien
+nr=Nd\u00E9b\u00E9l\u00E9 du Sud
+nv=Navajo
+ny=Nyanja
+oc=Occitan
+oj=Ojibwa
+om=Oromo
+or=Oriya
+os=Oss\u00E8te
+pa=Pendjabi
+pi=Pali
+pl=Polonais
+ps=Pachto
+pt=Portugais
+qu=Quechua
+rm=Rh\u00E9toroman
+rn=Rundi
+ro=Roumain
+ru=Russe
+rw=Kinyarwanda
+sa=Sanscrit
+sc=Sarde
+sd=Sindhi
+se=Sami du Nord
+sg=Sango
+si=Singhalais
+sk=Slovaque
+sl=Slov\u00E8ne
+sm=Samoan
+sn=Shona
+so=Somali
+sq=Albanais
+sr=Serbe
+ss=Swati
+st=Sotho du Sud
+su=Soundanais
+sv=Su\u00E9dois
+sw=Swahili
+ta=Tamoul
+te=T\u00E9lougou
+tg=Tadjik
+th=Tha\u00EF
+ti=Tigrigna
+tk=Turkm\u00E8ne
+tl=Tagalog
+tn=Setswana
+to=Tonga
+tr=Turc
+ts=Tsonga
+tt=Tatare
+tw=Twi
+ty=Tahitien
+ug=Ou\u00EFgour
+uk=Ukrainien
+ur=Ourdou
+uz=Ouzbek
+ve=Venda
+vi=Vietnamien
+vo=Volap\u00FCk
+wa=Wallon
+wo=Wolof
+xh=Xhosa
+yi=Yiddish
+yo=Yoruba
+za=Zhuang
+zh=Chinois
+zu=Zoulou
 
 # key is ISO 639.2 language code
 aar=Afar
@@ -540,7 +541,7 @@
 nic=Niger-kordofanian
 niu=Niue
 nno=Norv\u00E9gien nynorsk
-nob=Bokmal, Norv\u00E9gien
+nob=Bokm\u00E5l, norv\u00E9gien
 nog=Noga\u00EF
 non=Vieux norrois
 nor=Norv\u00E9gien
@@ -577,7 +578,7 @@
 pon=Pohnpei
 por=Portugais
 pra=Langues pr\u00E2krit
-pro=Proven\u00E7al ancien
+pro=Ancien proven\u00E7al (jusqu'en 1500)
 pus=Pushto ; Pashto
 que=Quechua
 raj=Rajasthani
@@ -686,7 +687,7 @@
 vai=Va\u00EF
 ven=Venda
 vie=Vietnamien
-vol=Volapuk
+vol=Volap\u00FCk
 vot=Vote
 wak=Langues wakashennes
 wal=Wolaitta
@@ -868,131 +869,131 @@
 # key is ISO 3166 country code
 
 AD=Andorre
-AE=Emirats Arabes Unis
+AE=Emirats arabes unis
 AF=Afghanistan
 AG=Antigua et Barbuda
 AI=Anguilla
 AL=Albanie
-AM=Arm\u00e9nie
-AN=Antilles N\u00e9erlandaises
+AM=Arm\u00E9nie
+AN=Antilles n\u00E9erlandaises
 AO=Angola
 AQ=Antarctique
 AR=Argentine
-AS=Samoa am\u00e9ricaines
+AS=Samoa am\u00E9ricaines
 AT=Autriche
 AU=Australie
 AW=Aruba
-AX=\u00celes \u00c5land
-AZ=Azerba\u00efdjan
-BA=Bosnie-Herz\u00e9govine
+AX=Iles \u00C5land
+AZ=Azerba\u00EFdjan
+BA=Bosnie-Herz\u00E9govine
 BB=Barbade
 BD=Bangladesh
 BE=Belgique
 BF=Burkina Faso
 BG=Bulgarie
-BH=Bahre\u00efn
+BH=Bahre\u00EFn
 BI=Burundi
-BJ=Benin
+BJ=B\u00E9nin
 BL=Saint-Barth\u00E9lemy
 BM=Bermudes
 BN=Brunei
 BO=Bolivie
 BQ=Bonaire, Saint-Eustache et Saba
-BR=Br\u00e9sil
+BR=Br\u00E9sil
 BS=Bahamas
 BT=Bhoutan
-BV=\u00cele Bouvet
+BV=Ile Bouvet
 BW=Botswana
-BY=Bi\u00e9lo-Russie
-BZ=B\u00e9lize
+BY=Bi\u00E9lo-Russie
+BZ=B\u00E9lize
 CA=Canada
-CC=\u00celes Cocos
-CD=R\u00e9publique d\u00e9mocratique du Congo
-CF=R\u00e9publique Centre-Africaine
+CC=Iles Cocos
+CD=R\u00E9publique d\u00E9mocratique du Congo
+CF=R\u00E9publique Centre-Africaine
 CG=Congo
 CH=Suisse
-CI=C\u00f4te d'Ivoire
-CK=\u00celes Cook
+CI=C\u00F4te d'Ivoire
+CK=Iles Cook
 CL=Chili
 CM=Cameroun
 CN=Chine
 CO=Colombie
 CR=Costa Rica
-CS=Serbie et Mont\u00e9n\u00e9gro
+CS=Serbie et Mont\u00E9n\u00E9gro
 CU=Cuba
 CV=Cap Vert
 CW=Cura\u00E7ao
-CX=\u00cele Christmas
+CX=Ile Christmas
 CY=Chypre
-CZ=R\u00e9publique Tch\u00e8que
+CZ=R\u00E9publique Tch\u00E8que
 DE=Allemagne
 DJ=Djibouti
 DK=Danemark
 DM=Dominique
-DO=R\u00e9publique Dominicaine
-DZ=Alg\u00e9rie
+DO=R\u00E9publique Dominicaine
+DZ=Alg\u00E9rie
 EC=Equateur
 EE=Estonie
 EG=Egypte
 EH=Sahara Occidental
-ER=Erythr\u00e9e
+ER=Erythr\u00E9e
 ES=Espagne
 ET=Ethiopie
 FI=Finlande
 FJ=Fidji
-FK=\u00celes Malouines
-FM=Micron\u00e9sie
-FO=\u00celes F\u00e9ro\u00e9
+FK=Iles Malouines
+FM=R\u00E9gion micron\u00E9sienne
+FO=Iles F\u00E9ro\u00E9
 FR=France
 GA=Gabon
 GB=Royaume-Uni
 GD=Grenade
-GE=G\u00e9orgie
-GF=Guyane fran\u00e7aise
+GE=G\u00E9orgie
+GF=Guyane fran\u00E7aise
 GG=Guernesey
 GH=Ghana
 GI=Gibraltar
 GL=Groenland
 GM=Gambie
-GN=Guin\u00e9e
+GN=Guin\u00E9e
 GP=Guadeloupe
-GQ=Guin\u00e9e Equatoriale
-GR=Gr\u00e8ce
-GS=G\u00e9orgie du Sud et \u00eeles Sandwich du Sud
+GQ=Guin\u00E9e \u00E9quatoriale
+GR=Gr\u00E8ce
+GS=G\u00E9orgie du Sud et \u00EEles Sandwich du Sud
 GT=Guatemala
 GU=Guam
-GW=Guin\u00e9e-Bissau
+GW=Guin\u00E9e-Bissau
 GY=Guyana
 HK=Hong-Kong
-HM=\u00cele Heard et \u00eeles McDonald
+HM=Iles Heard et \u00EEles McDonald
 HN=Honduras
 HR=Croatie
-HT=Ha\u00efti
+HT=Ha\u00EFti
 HU=Hongrie
-ID=Indon\u00e9sie
+ID=Indon\u00E9sie
 IE=Irlande
-IL=Isra\u00ebl
+IL=Isra\u00EBl
 IM=Ile de Man
 IN=Inde
-IO=Territoires britanniques de l'Oc\u00e9an Indien
+IO=Territoires britanniques de l'Oc\u00E9an Indien
 IQ=Irak
 IR=Iran
 IS=Islande
 IT=Italie
 JE=Jersey
-JM=Jama\u00efque
+JM=Jama\u00EFque
 JO=Jordanie
 JP=Japon
 KE=Kenya
-KG=Kyrgyzstan
+KG=Kirghizistan
 KH=Cambodge
 KI=Kiribati
 KM=Comores
-KN=Saint-Christophe-et-Ni\u00e9v\u00e8s
-KP=Cor\u00e9e du Nord
-KR=Cor\u00e9e du Sud
-KW=Koweit
-KY=\u00celes Ca\u00efmans
+KN=Saint-Christophe-et-Ni\u00E9v\u00E8s
+KP=Cor\u00E9e du Nord
+KR=Cor\u00E9e du Sud
+KW=Kowe\u00EFt
+KY=Iles Ca\u00EFmans
 KZ=Kazakhstan
 LA=Laos
 LB=Liban
@@ -1001,23 +1002,23 @@
 LK=Sri Lanka
 LR=Liberia
 LS=Lesotho
-LT=Lithuanie
+LT=Lituanie
 LU=Luxembourg
 LV=Lettonie
 LY=Libye
 MA=Maroc
 MC=Monaco
 MD=Moldavie
-ME=Mont\u00e9n\u00e9gro
+ME=Mont\u00E9n\u00E9gro
 MF=Saint-Martin
 MG=Madagascar
-MH=\u00celes Marshall
-MK=Mac\u00e9doine
+MH=Iles Marshall
+MK=Mac\u00E9doine
 ML=Mali
 MM=Myanmar
 MN=Mongolie
 MO=Macao
-MP=\u00celes Mariannes du Nord
+MP=Iles Mariannes du Nord
 MQ=Martinique
 MR=Mauritanie
 MS=Montserrat
@@ -1029,22 +1030,22 @@
 MY=Malaisie
 MZ=Mozambique
 NA=Namibie
-NC=Nouvelle-Cal\u00e9donie
+NC=Nouvelle-Cal\u00E9donie
 NE=Niger
-NF=\u00cele Norfolk
-NG=Nig\u00e9ria
+NF=Ile Norfolk
+NG=Nig\u00E9ria
 NI=Nicaragua
 NL=Pays-Bas
-NO=Norv\u00e8ge
-NP=N\u00e9pal
+NO=Norv\u00E8ge
+NP=N\u00E9pal
 NR=Nauru
 NU=Niue
-NZ=Nouvelle-Z\u00e9lande
+NZ=Nouvelle-Z\u00E9lande
 OM=Oman
 PA=Panama
-PE=P\u00e9rou
-PF=Polyn\u00e9sie Fran\u00e7aise
-PG=Papouasie-Nouvelle-Guin\u00e9e
+PE=P\u00E9rou
+PF=Polyn\u00E9sie Fran\u00E7aise
+PG=Papouasie-Nouvelle-Guin\u00E9e
 PH=Philippines
 PK=Pakistan
 PL=Pologne
@@ -1056,63 +1057,63 @@
 PW=Belau
 PY=Paraguay
 QA=Qatar
-RE=La R\u00e9union
+RE=R\u00E9union
 RO=Roumanie
 RS=Serbie
 RU=Russie
 RW=Rwanda
-SA=Arabie Saoudite
-SB=\u00celes Salomon
+SA=Arabie saoudite
+SB=Iles Salomon
 SC=Seychelles
 SD=Soudan
-SE=Su\u00e8de
+SE=Su\u00E8de
 SG=Singapour
-SH=Sainte-H\u00e9l\u00e8ne
-SI=Slov\u00e9nie
+SH=Sainte-H\u00E9l\u00E8ne
+SI=Slov\u00E9nie
 SJ=Svalbard et Jan Mayen
 SK=Slovaquie
 SL=Sierra Leone
 SM=Saint-Marin
-SN=S\u00e9n\u00e9gal
+SN=S\u00E9n\u00E9gal
 SO=Somalie
 SR=Suriname
-ST=Sao Tom\u00e9 et Principe
+ST=Sao Tom\u00E9 et Principe
 SV=El Salvador
 SX=Saint-Martin (partie n\u00E9erlandaise)
 SY=Syrie
 SZ=Swaziland
-TC=\u00celes Turks et Caicos
+TC=Iles Turks et Caicos
 TD=Tchad
-TF=Territoires Fran\u00e7ais du Sud
+TF=Terres australes fran\u00E7aises
 TG=Togo
-TH=Tha\u00eflande
+TH=Tha\u00EFlande
 TJ=Tadjikistan
 TK=Tokelau
 TL=Timor-Leste
-TM=Turkm\u00e9nistan
+TM=Turkm\u00E9nistan
 TN=Tunisie
 TO=Tonga
 TR=Turquie
-TT=Trinit\u00e9-et-Tobago
+TT=Trinit\u00E9-et-Tobago
 TV=Tuvalu
-TW=Taiwan
+TW=Ta\u00EFwan
 TZ=Tanzanie
 UA=Ukraine
 UG=Ouganda
-UM=D\u00e9pendances am\u00e9ricaines du Pacifique
+UM=D\u00E9pendances am\u00E9ricaines du Pacifique
 US=Etats-Unis
 UY=Uruguay
-UZ=Ouzb\u00e9kistan
+UZ=Ouzb\u00E9kistan
 VA=Vatican
 VC=Saint-Vincent-et-les Grenadines
-VE=V\u00e9n\u00e9zuela
-VG=Iles Vierges Britanniques
-VI=Iles Vierges Am\u00e9ricaines
-VN=Vietnam
+VE=Venezuela
+VG=Iles Vierges britanniques
+VI=Iles Vierges am\u00E9ricaines
+VN=Vi\u00EAt Nam
 VU=Vanuatu
 WF=Wallis-et-Futuna
 WS=Samoa
-YE=Y\u00e9men
+YE=Y\u00E9men
 YT=Mayotte
 ZA=Afrique du Sud
 ZM=Zambie
@@ -1151,3 +1152,19 @@
 154=Europe septentrionale
 155=Europe occidentale
 419=Am\u00E9rique latine et Cara\u00EFbes
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Nynorsk
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties
index a32d069..27dabd3 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=afar
-ab=abhaso
-ae=avestano
-af=afrikaans
-ak=akan
-am=amarico
-an=aragonese
-ar=arabo
-as=assamese
-av=avarico
-ay=aymar\u00e1
-az=azero
-ba=baschiro
-be=bielorusso
-bg=bulgaro
-bh=bihari
-bi=bislama
-bm=bambara
-bn=bengalese
-bo=tibetano
-br=bretone
-bs=bosniaco
-ca=catalano
-ce=ceceno
-ch=chamorro
-co=corso
-cr=cree
-cs=ceco
-cu=slavo ecclesiastico
-cv=chuvash
-cy=gallese
-da=danese
-de=tedesco
-dv=divehi
-dz=dzongkha
-ee=ewe
-el=greco
-en=inglese
-eo=esperanto
-es=spagnolo
-et=estone
-eu=basco
-fa=persiano
-ff=fulah
-fi=finlandese
-fj=figiano
-fo=faeroese
-fr=francese
-fy=frisone
-ga=irlandese
-gd=gaelico scozzese
-gl=galiziano
-gn=guaran\u00ec
-gu=gujarati
-gv=manx
-ha=haussa
-he=ebraico
-hi=hindi
-ho=hiri motu
-hr=croato
-ht=haitiano
-hu=ungherese
-hy=armeno
-hz=herero
-ia=interlingua
-id=indonesiano
-ie=interlingue
-ig=igbo
-ii=sichuan yi
-ik=inupiak
-in=indonesiano
-io=ido
-is=islandese
-it=italiano
-iu=inuktitut
-iw=ebraico
-ja=giapponese
-ji=yiddish
-jv=giavanese
-ka=georgiano
-kg=kongo
-ki=kikuyu
-kj=kwanyama
-kk=kazako
-kl=groenlandese
-km=cambogiano (khmer)
-kn=kannada
-ko=coreano
-kr=kanuri
-ks=kashmiri
-ku=curdo
-kv=komi
-kw=cornico
-ky=kirghiso
-la=latino
-lb=lussemburghese
-lg=ganda
-li=limburghese
-ln=lingala
-lo=lao
-lt=lituano
-lu=luba-katanga
-lv=lettone
-mg=malgascio
-mh=marshallese
-mi=maori
-mk=macedone
-ml=malayalam
-mn=mongolo
-mo=moldavo
-mr=marathi
-ms=malese
-mt=maltese
-my=birmano
-na=nauruano
-nb=norvegese bokm\u00e5l
-nd=ndebele settentrionale
-ne=nepalese
-ng=ndonga
-nl=neerlandese
-nn=norvegese nynorsk
-no=norvegese
-nr=ndebele meridionale
-nv=navajo
-ny=nyanja
-oc=occitano
-oj=ojibwa
-om=oromo (afan)
-or=oriya
-os=ossetiano
-pa=punjabi
-pi=pali
-pl=polacco
-ps=pashto
-pt=portoghese
-qu=quechua
-rm=retoromanzo
-rn=kirundi
-ro=rumeno
-ru=russo
-rw=kinyarwanda
-sa=sanscrito
-sc=sardo
-sd=sindhi
-se=sami settentrionale
-sg=sangho
-si=singalese
-sk=slovacco
-sl=sloveno
-sm=samoano
-sn=shona
-so=somalo
-sq=albanese
-sr=serbo
-ss=siswati
-st=sesotho
-su=sudanese
-sv=svedese
-sw=swahili
-ta=tamil
-te=telugu
-tg=tagiko
-th=thai
-ti=tigrinya
-tk=turkmeno
-tl=tagalog
-tn=setswana
-to=tongano
-tr=turco
-ts=tsonga
-tt=tataro
-tw=twi
-ty=tahitiano
-ug=uiguro
-uk=ucraino
-ur=urdu
-uz=uzbeko
-ve=venda
-vi=vietnamita
-vo=volapuk
-wa=vallone
-wo=wolof
-xh=xhosa
-yi=yiddish
-yo=yoruba
-za=zhuang
-zh=cinese
-zu=zulu
+aa=Afar
+ab=Abkhaso
+ae=Avestano
+af=Afrikaans
+ak=Akan
+am=Amarico
+an=Aragonese
+ar=Arabo
+as=Assamese
+av=Avaro
+ay=Aymara
+az=Azero
+ba=Baschiro
+be=Bielorusso
+bg=Bulgaro
+bh=Bihari
+bi=Bislama
+bm=Bambara
+bn=Bengalese
+bo=Tibetano
+br=Bretone
+bs=Bosniaco
+ca=Catalano
+ce=Ceceno
+ch=Chamorro
+co=Corso
+cr=Cree
+cs=Ceco
+cu=Slavo ecclesiastico
+cv=Chuvash
+cy=Gallese
+da=Danese
+de=Tedesco
+dv=Divehi
+dz=Dzongkha
+ee=Ewe
+el=Greco
+en=Inglese
+eo=Esperanto
+es=Spagnolo
+et=Estone
+eu=Basco
+fa=Persiano
+ff=Fulah
+fi=Finlandese
+fj=Figiano
+fo=Faroese
+fr=Francese
+fy=Frisone
+ga=Irlandese
+gd=Gaelico scozzese
+gl=Galiziano
+gn=Guaran\u00EC
+gu=Gujarati
+gv=Manx
+ha=Hausa
+he=Ebraico
+hi=Hindi
+ho=Hiri Motu
+hr=Croato
+ht=Haitiano
+hu=Ungherese
+hy=Armeno
+hz=Herero
+ia=Interlingua
+id=Indonesiano
+ie=Interlingue
+ig=Igbo
+ii=Sichuan Yi
+ik=Inupiaq
+in=Indonesiano
+io=Ido
+is=Islandese
+it=Italiano
+iu=Inuktitut
+iw=Ebraico
+ja=Giapponese
+ji=Yiddish
+jv=Giavanese
+ka=Georgiano
+kg=Kongo
+ki=Kikuyu
+kj=Kwanyama
+kk=Kazako
+kl=Groenlandese
+km=Khmer
+kn=Kannada
+ko=Coreano
+kr=Kanuri
+ks=Kashmiri
+ku=Curdo
+kv=Komi
+kw=Cornico
+ky=Kirghiso
+la=Latino
+lb=Lussemburghese
+lg=Ganda
+li=Limburghese
+ln=Lingala
+lo=Lao
+lt=Lituano
+lu=Luba-Katanga
+lv=Lettone
+mg=Malgascio
+mh=Marshallese
+mi=Maori
+mk=Macedone
+ml=Malayalam
+mn=Mongolo
+mo=Moldavo
+mr=Marathi
+ms=Malese
+mt=Maltese
+my=Birmano
+na=Nauruano
+nb=Norvegese, Bokm\u00E5l
+nd=Ndebele del nord
+ne=Nepalese
+ng=Ndonga
+nl=Olandese
+nn=Norvegese nynorsk
+no=Norvegese
+nr=Ndebele del sud
+nv=Navajo
+ny=Nyanja
+oc=Occitano
+oj=Ojibwa
+om=Oromo
+or=Oriya
+os=Ossetico
+pa=Punjabi
+pi=Pali
+pl=Polacco
+ps=Pashto
+pt=Portoghese
+qu=Quechua
+rm=Retoromanzo
+rn=Kirundi
+ro=Romeno
+ru=Russo
+rw=Kinyarwanda
+sa=Sanscrito
+sc=Sardo
+sd=Sindhi
+se=Sami del nord
+sg=Sango
+si=Singalese
+sk=Slovacco
+sl=Sloveno
+sm=Samoano
+sn=Shona
+so=Somalo
+sq=Albanese
+sr=Serbo
+ss=Swati
+st=Sotho del sud
+su=Sundanese
+sv=Svedese
+sw=Swahili
+ta=Tamil
+te=Telugu
+tg=Tagiko
+th=Tailandese
+ti=Tigrinya
+tk=Turkmeno
+tl=Tagalog
+tn=Tswana
+to=Tongano
+tr=Turco
+ts=Tsonga
+tt=Tataro
+tw=Twi
+ty=Taitiano
+ug=Uiguro
+uk=Ucraino
+ur=Urdu
+uz=Uzbeko
+ve=Venda
+vi=Vietnamita
+vo=Volapuk
+wa=Vallone
+wo=Wolof
+xh=Xhosa
+yi=Yiddish
+yo=Yoruba
+za=Zhuang
+zh=Cinese
+zu=Zulu
 
 # key is ISO 639.2 language code
 aar=Afar
@@ -540,7 +541,7 @@
 nic=Lingua niger-cordofan
 niu=Niue
 nno=Norvegese nynorsk
-nob=Norvegese bokm\u00E5l
+nob=Bokm\u00E5l, Norvegese
 nog=Nogai
 non=Norse antico
 nor=Norvegese
@@ -577,7 +578,7 @@
 pon=Pohnpeiano
 por=Portoghese
 pra=Pracrito
-pro=Provenzale antico (fino al 1500)
+pro=Provenzale, antico (fino al 1500)
 pus=Pushto; Pashto
 que=Quechua
 raj=Rajasthani
@@ -806,7 +807,7 @@
 Narb=Arabo antico del nord
 Nbat=Lingua nabatea
 Nkgb=Nakhi Geba
-Nkoo=N'Ko
+Nkoo=N\u2019Ko
 Ogam=Ogamico
 Olck=Ol Chiki
 Orkh=Orkhon
@@ -878,11 +879,11 @@
 AO=Angola
 AQ=Antartide
 AR=Argentina
-AS=Samoa americane
+AS=Samoa Americane
 AT=Austria
 AU=Australia
 AW=Aruba
-AX=Isole Aland
+AX=Isole \u00C5land
 AZ=Azerbaigian
 BA=Bosnia-Erzegovina
 BB=Barbados
@@ -890,7 +891,7 @@
 BE=Belgio
 BF=Burkina Faso
 BG=Bulgaria
-BH=Bahrain
+BH=Bahrein
 BI=Burundi
 BJ=Benin
 BL=Saint Barth\u00E9lemy
@@ -901,7 +902,7 @@
 BR=Brasile
 BS=Bahamas
 BT=Bhutan
-BV=Isola di Bouvet
+BV=Isola Bouvet
 BW=Botswana
 BY=Bielorussia
 BZ=Belize
@@ -922,7 +923,7 @@
 CU=Cuba
 CV=Capo Verde
 CW=Cura\u00E7ao
-CX=Isola di Natale
+CX=Isola Christmas
 CY=Cipro
 CZ=Repubblica Ceca
 DE=Germania
@@ -942,13 +943,13 @@
 FJ=Figi
 FK=Isole Falkland
 FM=Micronesia
-FO=Isole F\u00e6roer
+FO=Isole Faroe
 FR=Francia
 GA=Gabon
 GB=Regno Unito
 GD=Grenada
 GE=Georgia
-GF=Guayana Francese
+GF=Guyana francese
 GG=Guernsey
 GH=Ghana
 GI=Gibilterra
@@ -961,7 +962,7 @@
 GS=Georgia del sud e isole Sandwich meridionali
 GT=Guatemala
 GU=Guam
-GW=Guinea Bissau
+GW=Guinea-Bissau
 GY=Guyana
 HK=Hong Kong
 HM=Isole Heard e McDonald
@@ -993,10 +994,10 @@
 KR=Corea del Sud
 KW=Kuwait
 KY=Isole Cayman
-KZ=Kazakhstan
+KZ=Kazakistan
 LA=Laos
 LB=Libano
-LC=Sainte Lucia
+LC=Saint Lucia
 LI=Liechtenstein
 LK=Sri Lanka
 LR=Liberia
@@ -1022,7 +1023,7 @@
 MR=Mauritania
 MS=Montserrat
 MT=Malta
-MU=Maurizio
+MU=Mauritius
 MV=Maldive
 MW=Malawi
 MX=Messico
@@ -1042,7 +1043,7 @@
 NZ=Nuova Zelanda
 OM=Oman
 PA=Panama
-PE=Per\u00f9
+PE=Per\u00F9
 PF=Polinesia Francese
 PG=Papua Nuova Guinea
 PH=Filippine
@@ -1050,7 +1051,7 @@
 PL=Polonia
 PM=Saint Pierre e Miquelon
 PN=Pitcairn
-PR=Puerto Rico
+PR=Portorico
 PS=Palestina
 PT=Portogallo
 PW=Palau
@@ -1062,7 +1063,7 @@
 RU=Russia
 RW=Ruanda
 SA=Arabia Saudita
-SB=Isole Solomon
+SB=Isole Salomone
 SC=Seychelles
 SD=Sudan
 SE=Svezia
@@ -1076,19 +1077,19 @@
 SN=Senegal
 SO=Somalia
 SR=Suriname
-ST=S\u00e3o Tom\u00e9 e Principe
+ST=S\u00E3o Tom\u00E9 e Pr\u00EDncipe
 SV=El Salvador
 SX=Sint Maarten (parte olandese)
 SY=Siria
 SZ=Swaziland
 TC=Isole Turks e Caicos
 TD=Ciad
-TF=Territori Francesi d'Oltremare
+TF=Territori australi francesi
 TG=Togo
 TH=Thailandia
 TJ=Tagikistan
 TK=Tokelau
-TL=Timor Leste
+TL=Timor Est
 TM=Turkmenistan
 TN=Tunisia
 TO=Tonga
@@ -1099,11 +1100,11 @@
 TZ=Tanzania
 UA=Ucraina
 UG=Uganda
-UM=Isole minori lontane degli Stati Uniti
+UM=Isole minori lontane dagli Stati Uniti
 US=Stati Uniti
 UY=Uruguay
 UZ=Uzbekistan
-VA=Citt\u00e0 del Vaticano
+VA=Citt\u00E0 del Vaticano
 VC=Saint Vincent e Grenadine
 VE=Venezuela
 VG=Isole Vergini (GB)
@@ -1113,7 +1114,7 @@
 WF=Wallis e Futuna
 WS=Samoa
 YE=Yemen
-YT=Mayotta
+YT=Mayotte
 ZA=Sudafrica
 ZM=Zambia
 ZW=Zimbabwe
@@ -1151,3 +1152,19 @@
 154=Europa settentrionale
 155=Europa occidentale
 419=America Latina e Caraibi
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Nynorsk
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties
index 0fe0402..6838dd2 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u30a2\u30d5\u30a1\u30fc\u30eb\u8a9e
-ab=\u30a2\u30d6\u30cf\u30ba\u8a9e
-ae=\u30a2\u30f4\u30a7\u30b9\u30bf\u8a9e
-af=\u30a2\u30d5\u30ea\u30ab\u30fc\u30f3\u30b9\u8a9e
-ak=\u30a2\u30ab\u30f3\u8a9e
-am=\u30a2\u30e0\u30cf\u30e9\u8a9e
-an=\u30a2\u30e9\u30b4\u30f3\u8a9e
-ar=\u30a2\u30e9\u30d3\u30a2\u8a9e
-as=\u30a2\u30c3\u30b5\u30e0\u8a9e
-av=\u30a2\u30f4\u30a1\u30eb\u8a9e
-ay=\u30a2\u30a4\u30de\u30e9\u8a9e
-az=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u8a9e
-ba=\u30d0\u30b7\u30ad\u30fc\u30eb\u8a9e
-be=\u767d\u30ed\u30b7\u30a2\u8a9e
-bg=\u30d6\u30eb\u30ac\u30ea\u30a2\u8a9e
-bh=\u30d3\u30cf\u30fc\u30eb\u8a9e
-bi=\u30d3\u30b9\u30e9\u30de\u8a9e
-bm=\u30d0\u30f3\u30d0\u30e9\u8a9e
-bn=\u30d9\u30f3\u30ac\u30eb\u8a9e
-bo=\u30c1\u30d9\u30c3\u30c8\u8a9e
-br=\u30d6\u30eb\u30c8\u30f3\u8a9e
-bs=\u30dc\u30b9\u30cb\u30a2\u8a9e
-ca=\u30ab\u30bf\u30ed\u30cb\u30a2\u8a9e
-ce=\u30c1\u30a7\u30c1\u30a7\u30f3\u8a9e
-ch=\u30c1\u30e3\u30e2\u30ed\u8a9e
-co=\u30b3\u30eb\u30b7\u30ab\u8a9e
-cr=\u30af\u30ea\u30fc\u8a9e
-cs=\u30c1\u30a7\u30b3\u8a9e
-cu=\u6559\u4f1a\u30b9\u30e9\u30d6\u8a9e
-cv=\u30c1\u30e5\u30f4\u30a1\u30b7\u30e5\u8a9e
-cy=\u30a6\u30a7\u30fc\u30eb\u30ba\u8a9e
-da=\u30c7\u30f3\u30de\u30fc\u30af\u8a9e
-de=\u30c9\u30a4\u30c4\u8a9e
-dv=\u30c7\u30a3\u30d9\u30d2\u8a9e
-dz=\u30d6\u30fc\u30bf\u30f3\u8a9e
-ee=\u30a8\u30a6\u30a7\u8a9e
-el=\u30ae\u30ea\u30b7\u30a2\u8a9e
-en=\u82f1\u8a9e
-eo=\u30a8\u30b9\u30da\u30e9\u30f3\u30c8\u8a9e
-es=\u30b9\u30da\u30a4\u30f3\u8a9e
-et=\u30a8\u30b9\u30c8\u30cb\u30a2\u8a9e
-eu=\u30d0\u30b9\u30af\u8a9e
-fa=\u30da\u30eb\u30b7\u30a2\u8a9e
-ff=\u30d5\u30e9\u8a9e
-fi=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9\u8a9e
-fj=\u30d5\u30a3\u30b8\u30fc\u8a9e
-fo=\u30d5\u30a7\u30ed\u30fc\u8a9e
-fr=\u30d5\u30e9\u30f3\u30b9\u8a9e
-fy=\u30d5\u30ea\u30b8\u30a2\u8a9e
-ga=\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u8a9e
-gd=\u30b9\u30b3\u30c3\u30c8\u30e9\u30f3\u30c9\u30fb\u30b2\u30fc\u30eb\u8a9e
-gl=\u30ac\u30ea\u30b7\u30a2\u8a9e
-gn=\u30b0\u30ef\u30e9\u30cb\u8a9e
-gu=\u30b0\u30b8\u30e3\u30e9\u30fc\u30c8\u8a9e
-gv=\u30de\u30f3\u5cf6\u8a9e
-ha=\u30cf\u30a6\u30b5\u8a9e
-he=\u30d8\u30d6\u30e9\u30a4\u8a9e
-hi=\u30d2\u30f3\u30c7\u30a3\u30fc\u8a9e
-ho=\u30d2\u30ea\u30fb\u30e2\u30c4\u8a9e
-hr=\u30af\u30ed\u30a2\u30c1\u30a2\u8a9e
-ht=\u30cf\u30a4\u30c1\u8a9e
-hu=\u30cf\u30f3\u30ac\u30ea\u30fc\u8a9e
-hy=\u30a2\u30eb\u30e1\u30cb\u30a2\u8a9e
-hz=\u30d8\u30ec\u30ed\u8a9e
-ia=\u56fd\u969b\u8a9e
-id=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
-ie=\u56fd\u969b\u8a9e
-ig=\u30a4\u30dc\u8a9e
-ii=\u56db\u5ddd\u8a9e
-ik=\u30a4\u30cc\u30d4\u30a2\u30c3\u30af\u8a9e
-in=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
-io=\u30a4\u30c9\u8a9e
-is=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9\u8a9e
-it=\u30a4\u30bf\u30ea\u30a2\u8a9e
-iu=\u30a4\u30cc\u30af\u30a6\u30c6\u30a3\u30c8\u30c3\u30c8\u8a9e
-iw=\u30d8\u30d6\u30e9\u30a4\u8a9e
-ja=\u65e5\u672c\u8a9e
-ji=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
-jv=\u30b8\u30e3\u30ef\u8a9e
-ka=\u30b0\u30eb\u30b8\u30a2\u8a9e
-kg=\u30b3\u30f3\u30b4\u8a9e
-ki=\u30ad\u30af\u30e6\u8a9e
-kj=\u30af\u30a5\u30cb\u30e3\u30de\u8a9e
-kk=\u30ab\u30b6\u30d5\u8a9e
-kl=\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u8a9e
-km=\u30ab\u30f3\u30dc\u30b8\u30a2\u8a9e
-kn=\u30ab\u30f3\u30ca\u30c0\u8a9e
-ko=\u97d3\u56fd\u8a9e
-kr=\u30ab\u30cc\u30ea\u8a9e
-ks=\u30ab\u30b7\u30df\u30fc\u30eb\u8a9e
-ku=\u30af\u30eb\u30c9\u8a9e
-kv=\u30b3\u30df\u8a9e
-kw=\u30b3\u30fc\u30f3\u30a6\u30a9\u30fc\u30eb\u8a9e
-ky=\u30ad\u30eb\u30ae\u30b9\u8a9e
-la=\u30e9\u30c6\u30f3\u8a9e
-lb=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30af\u8a9e
-lg=\u30ac\u30f3\u30c0\u8a9e
-li=\u30ea\u30f3\u30d6\u30eb\u30b0\u8a9e
-ln=\u30ea\u30f3\u30ac\u30e9\u8a9e
-lo=\u30e9\u30aa\u8a9e
-lt=\u30ea\u30c8\u30a2\u30cb\u30a2\u8a9e
-lu=\u30eb\u30d0\u8a9e
-lv=\u30e9\u30c8\u30d3\u30a2\u8a9e (\u30ec\u30c3\u30c8\u8a9e)
-mg=\u30de\u30e9\u30ac\u30b7\u30fc\u8a9e
-mh=\u30de\u30fc\u30b7\u30e3\u30eb\u8a9e
-mi=\u30de\u30aa\u30ea\u8a9e
-mk=\u30de\u30b1\u30c9\u30cb\u30a2\u8a9e
-ml=\u30de\u30e9\u30e4\u30fc\u30e9\u30e0\u8a9e
-mn=\u30e2\u30f3\u30b4\u30eb\u8a9e
-mo=\u30e2\u30eb\u30c0\u30d3\u30a2\u8a9e
-mr=\u30de\u30e9\u30fc\u30c6\u30a3\u30fc\u8a9e
-ms=\u30de\u30e9\u30a4\u8a9e
-mt=\u30de\u30eb\u30bf\u8a9e
-my=\u30d3\u30eb\u30de\u8a9e
-na=\u30ca\u30a6\u30eb\u8a9e
-nb=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e (\u30dc\u30fc\u30af\u30e2\u30fc\u30eb)
-nd=\u5317\u30f3\u30c7\u30d9\u30ec\u8a9e
-ne=\u30cd\u30d1\u30fc\u30eb\u8a9e
-ng=\u30f3\u30c9\u30f3\u30ac\u8a9e
-nl=\u30aa\u30e9\u30f3\u30c0\u8a9e
-nn=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e (\u30cb\u30e5\u30fc\u30ce\u30eb\u30b9\u30af)
-no=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e
-nr=\u5357\u30f3\u30c7\u30d9\u30ec\u8a9e
-nv=\u30ca\u30d0\u30db\u8a9e
-ny=\u30cb\u30e3\u30f3\u30b8\u30e3\u8a9e
-oc=\u30d7\u30ed\u30d0\u30f3\u30b9\u8a9e
-oj=\u30aa\u30b8\u30d6\u30ef\u8a9e
-om=\u30ac\u30e9\u8a9e
-or=\u30aa\u30ea\u30e4\u30fc\u8a9e
-os=\u30aa\u30bb\u30c1\u30a2\u8a9e
-pa=\u30d1\u30f3\u30b8\u30e3\u30d6\u8a9e
-pi=\u30d1\u30fc\u30ea\u8a9e
-pl=\u30dd\u30fc\u30e9\u30f3\u30c9\u8a9e
-ps=\u30d1\u30b7\u30e5\u30c8\u30fc\u8a9e
-pt=\u30dd\u30eb\u30c8\u30ac\u30eb\u8a9e
-qu=\u30b1\u30c1\u30e5\u30a2\u8a9e
-rm=\u30ec\u30c8\uff1d\u30ed\u30de\u30f3\u8a9e
-rn=\u30eb\u30f3\u30b8\u8a9e
-ro=\u30eb\u30fc\u30de\u30cb\u30a2\u8a9e
-ru=\u30ed\u30b7\u30a2\u8a9e
-rw=\u30eb\u30ef\u30f3\u30c0\u8a9e
-sa=\u30b5\u30f3\u30b9\u30af\u30ea\u30c3\u30c8\u8a9e
-sc=\u30b5\u30eb\u30c7\u30a3\u30cb\u30a2\u8a9e
-sd=\u30b7\u30f3\u30c9\u8a9e
-se=\u5317\u30b5\u30df\u8a9e
-sg=\u30b5\u30f3\u30b4\u8a9e
-si=\u30b7\u30f3\u30cf\u30e9\u8a9e
-sk=\u30b9\u30ed\u30d0\u30ad\u30a2\u8a9e
-sl=\u30b9\u30ed\u30d9\u30cb\u30a2\u8a9e
-sm=\u30b5\u30e2\u30a2\u8a9e
-sn=\u30b7\u30e7\u30ca\u8a9e
-so=\u30bd\u30de\u30ea\u8a9e
-sq=\u30a2\u30eb\u30d0\u30cb\u30a2\u8a9e
-sr=\u30bb\u30eb\u30d3\u30a2\u8a9e
-ss=\u30b7\u30b9\u30ef\u30c6\u30a3\u8a9e
-st=\u30bb\u30bd\u30c8\u8a9e
-su=\u30b9\u30f3\u30c0\u8a9e
-sv=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3\u8a9e
-sw=\u30b9\u30ef\u30d2\u30ea\u8a9e
-ta=\u30bf\u30df\u30fc\u30eb\u8a9e
-te=\u30c6\u30eb\u30b0\u8a9e
-tg=\u30bf\u30b8\u30af\u8a9e
-th=\u30bf\u30a4\u8a9e
-ti=\u30c6\u30a3\u30b0\u30ea\u30cb\u30a2\u8a9e
-tk=\u30c8\u30eb\u30af\u30e1\u30f3\u8a9e
-tl=\u30bf\u30ac\u30ed\u30b0\u8a9e
-tn=\u30c4\u30ef\u30ca\u8a9e
-to=\u30c8\u30f3\u30ac\u8a9e
-tr=\u30c8\u30eb\u30b3\u8a9e
-ts=\u30c4\u30a9\u30f3\u30ac\u8a9e
-tt=\u30bf\u30bf\u30fc\u30eb\u8a9e
-tw=\u30c8\u30a5\u30a4\u8a9e
-ty=\u30bf\u30d2\u30c1\u8a9e
-ug=\u30a6\u30a4\u30b0\u30eb\u8a9e
-uk=\u30a6\u30af\u30e9\u30a4\u30ca\u8a9e
-ur=\u30a6\u30eb\u30c9\u30a5\u30fc\u8a9e
-uz=\u30a6\u30ba\u30d9\u30af\u8a9e
-ve=\u30d9\u30f3\u30c0\u8a9e
-vi=\u30d9\u30c8\u30ca\u30e0\u8a9e
-vo=\u30dc\u30e9\u30d4\u30e5\u30af\u8a9e
-wa=\u30ef\u30ed\u30f3\u8a9e
-wo=\u30a6\u30a9\u30ed\u30d5\u8a9e
-xh=\u30b3\u30b5\u8a9e
-yi=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
-yo=\u30e8\u30eb\u30d0\u8a9e
-za=\u30c1\u30ef\u30f3\u8a9e
-zh=\u4e2d\u56fd\u8a9e
-zu=\u30ba\u30fc\u30eb\u30fc\u8a9e
+aa=\u30A2\u30D5\u30A1\u30FC\u30EB\u8A9E
+ab=\u30A2\u30D6\u30CF\u30BA\u8A9E
+ae=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E
+af=\u30A2\u30D5\u30EA\u30AB\u30FC\u30F3\u30B9\u8A9E
+ak=\u30A2\u30AB\u30F3\u8A9E
+am=\u30A2\u30E0\u30CF\u30E9\u8A9E
+an=\u30A2\u30E9\u30B4\u30F3\u8A9E
+ar=\u30A2\u30E9\u30D3\u30A2\u8A9E
+as=\u30A2\u30C3\u30B5\u30E0\u8A9E
+av=\u30A2\u30F4\u30A1\u30EB\u8A9E
+ay=\u30A2\u30A4\u30DE\u30E9\u8A9E
+az=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u8A9E
+ba=\u30D0\u30B7\u30AD\u30FC\u30EB\u8A9E
+be=\u767D\u30ED\u30B7\u30A2\u8A9E
+bg=\u30D6\u30EB\u30AC\u30EA\u30A2\u8A9E
+bh=\u30D3\u30CF\u30FC\u30EB\u8A9E
+bi=\u30D3\u30B9\u30E9\u30DE\u8A9E
+bm=\u30D0\u30F3\u30D0\u30E9\u8A9E
+bn=\u30D9\u30F3\u30AC\u30EB\u8A9E
+bo=\u30C1\u30D9\u30C3\u30C8\u8A9E
+br=\u30D6\u30EB\u30C8\u30F3\u8A9E
+bs=\u30DC\u30B9\u30CB\u30A2\u8A9E
+ca=\u30AB\u30BF\u30ED\u30CB\u30A2\u8A9E
+ce=\u30C1\u30A7\u30C1\u30A7\u30F3\u8A9E
+ch=\u30C1\u30E3\u30E2\u30ED\u8A9E
+co=\u30B3\u30EB\u30B7\u30AB\u8A9E
+cr=\u30AF\u30EA\u30FC\u8A9E
+cs=\u30C1\u30A7\u30B3\u8A9E
+cu=\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E
+cv=\u30C1\u30E5\u30F4\u30A1\u30B7\u30E5\u8A9E
+cy=\u30A6\u30A7\u30FC\u30EB\u30BA\u8A9E
+da=\u30C7\u30F3\u30DE\u30FC\u30AF\u8A9E
+de=\u30C9\u30A4\u30C4\u8A9E
+dv=\u30C7\u30A3\u30D9\u30D2\u8A9E
+dz=\u30D6\u30FC\u30BF\u30F3\u8A9E
+ee=\u30A8\u30A6\u30A7\u8A9E
+el=\u30AE\u30EA\u30B7\u30A2\u8A9E
+en=\u82F1\u8A9E
+eo=\u30A8\u30B9\u30DA\u30E9\u30F3\u30C8\u8A9E
+es=\u30B9\u30DA\u30A4\u30F3\u8A9E
+et=\u30A8\u30B9\u30C8\u30CB\u30A2\u8A9E
+eu=\u30D0\u30B9\u30AF\u8A9E
+fa=\u30DA\u30EB\u30B7\u30A2\u8A9E
+ff=\u30D5\u30E9\u8A9E
+fi=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u8A9E
+fj=\u30D5\u30A3\u30B8\u30FC\u8A9E
+fo=\u30D5\u30A7\u30ED\u30FC\u8A9E
+fr=\u30D5\u30E9\u30F3\u30B9\u8A9E
+fy=\u30D5\u30EA\u30B8\u30A2\u8A9E
+ga=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E
+gd=\u30B9\u30B3\u30C3\u30C8\u30E9\u30F3\u30C9\u30FB\u30B2\u30FC\u30EB\u8A9E
+gl=\u30AC\u30EA\u30B7\u30A2\u8A9E
+gn=\u30B0\u30A2\u30E9\u30CB\u8A9E
+gu=\u30B0\u30B8\u30E3\u30E9\u30FC\u30C8\u8A9E
+gv=\u30DE\u30F3\u5CF6\u8A9E
+ha=\u30CF\u30A6\u30B5\u8A9E
+he=\u30D8\u30D6\u30E9\u30A4\u8A9E
+hi=\u30D2\u30F3\u30C7\u30A3\u30FC\u8A9E
+ho=\u30D2\u30EA\u30FB\u30E2\u30C4\u8A9E
+hr=\u30AF\u30ED\u30A2\u30C1\u30A2\u8A9E
+ht=\u30CF\u30A4\u30C1\u8A9E
+hu=\u30CF\u30F3\u30AC\u30EA\u30FC\u8A9E
+hy=\u30A2\u30EB\u30E1\u30CB\u30A2\u8A9E
+hz=\u30D8\u30EC\u30ED\u8A9E
+ia=\u56FD\u969B\u8A9E
+id=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E
+ie=\u56FD\u969B\u8A9E
+ig=\u30A4\u30DC\u8A9E
+ii=\u56DB\u5DDD\u8A9E
+ik=\u30A4\u30CC\u30D4\u30A2\u30C3\u30AF\u8A9E
+in=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E
+io=\u30A4\u30C9\u8A9E
+is=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u8A9E
+it=\u30A4\u30BF\u30EA\u30A2\u8A9E
+iu=\u30A4\u30CC\u30AF\u30A6\u30C6\u30A3\u30C8\u30C3\u30C8\u8A9E
+iw=\u30D8\u30D6\u30E9\u30A4\u8A9E
+ja=\u65E5\u672C\u8A9E
+ji=\u30A4\u30C7\u30A3\u30C3\u30B7\u30E5\u8A9E
+jv=\u30B8\u30E3\u30EF\u8A9E
+ka=\u30B0\u30EB\u30B8\u30A2\u8A9E
+kg=\u30B3\u30F3\u30B4\u8A9E
+ki=\u30AD\u30AF\u30E6\u8A9E
+kj=\u30AF\u30A5\u30CB\u30E3\u30DE\u8A9E
+kk=\u30AB\u30B6\u30D5\u8A9E
+kl=\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u8A9E
+km=\u30AB\u30F3\u30DC\u30B8\u30A2\u8A9E
+kn=\u30AB\u30F3\u30CA\u30C0\u8A9E
+ko=\u97D3\u56FD\u8A9E
+kr=\u30AB\u30CC\u30EA\u8A9E
+ks=\u30AB\u30B7\u30DF\u30FC\u30EB\u8A9E
+ku=\u30AF\u30EB\u30C9\u8A9E
+kv=\u30B3\u30DF\u8A9E
+kw=\u30B3\u30FC\u30F3\u30A6\u30A9\u30FC\u30EB\u8A9E
+ky=\u30AD\u30EB\u30AE\u30B9\u8A9E
+la=\u30E9\u30C6\u30F3\u8A9E
+lb=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF\u8A9E
+lg=\u30AC\u30F3\u30C0\u8A9E
+li=\u30EA\u30F3\u30D6\u30EB\u30B0\u8A9E
+ln=\u30EA\u30F3\u30AC\u30E9\u8A9E
+lo=\u30E9\u30AA\u8A9E
+lt=\u30EA\u30C8\u30A2\u30CB\u30A2\u8A9E
+lu=\u30EB\u30D0\u8A9E
+lv=\u30E9\u30C8\u30D3\u30A2\u8A9E (\u30EC\u30C3\u30C8\u8A9E)
+mg=\u30DE\u30E9\u30AC\u30B7\u30FC\u8A9E
+mh=\u30DE\u30FC\u30B7\u30E3\u30EB\u8A9E
+mi=\u30DE\u30AA\u30EA\u8A9E
+mk=\u30DE\u30B1\u30C9\u30CB\u30A2\u8A9E
+ml=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u8A9E
+mn=\u30E2\u30F3\u30B4\u30EB\u8A9E
+mo=\u30E2\u30EB\u30C0\u30D3\u30A2\u8A9E
+mr=\u30DE\u30E9\u30FC\u30C6\u30A3\u30FC\u8A9E
+ms=\u30DE\u30E9\u30A4\u8A9E
+mt=\u30DE\u30EB\u30BF\u8A9E
+my=\u30D3\u30EB\u30DE\u8A9E
+na=\u30CA\u30A6\u30EB\u8A9E
+nb=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB)
+nd=\u5317\u30F3\u30C7\u30D9\u30EC\u8A9E
+ne=\u30CD\u30D1\u30FC\u30EB\u8A9E
+ng=\u30F3\u30C9\u30F3\u30AC\u8A9E
+nl=\u30AA\u30E9\u30F3\u30C0\u8A9E
+nn=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30CB\u30E5\u30FC\u30CE\u30EB\u30B9\u30AF)
+no=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E
+nr=\u5357\u30F3\u30C7\u30D9\u30EC\u8A9E
+nv=\u30CA\u30D0\u30DB\u8A9E
+ny=\u30CB\u30E3\u30F3\u30B8\u30E3\u8A9E
+oc=\u30D7\u30ED\u30D0\u30F3\u30B9\u8A9E
+oj=\u30AA\u30B8\u30D6\u30EF\u8A9E
+om=\u30AC\u30E9\u8A9E
+or=\u30AA\u30EA\u30E4\u30FC\u8A9E
+os=\u30AA\u30BB\u30C1\u30A2\u8A9E
+pa=\u30D1\u30F3\u30B8\u30E3\u30D6\u8A9E
+pi=\u30D1\u30FC\u30EA\u8A9E
+pl=\u30DD\u30FC\u30E9\u30F3\u30C9\u8A9E
+ps=\u30D1\u30B7\u30E5\u30C8\u30FC\u8A9E
+pt=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E
+qu=\u30B1\u30C1\u30E5\u30A2\u8A9E
+rm=\u30EC\u30C8=\u30ED\u30DE\u30F3\u8A9E
+rn=\u30EB\u30F3\u30B8\u8A9E
+ro=\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E
+ru=\u30ED\u30B7\u30A2\u8A9E
+rw=\u30EB\u30EF\u30F3\u30C0\u8A9E
+sa=\u30B5\u30F3\u30B9\u30AF\u30EA\u30C3\u30C8\u8A9E
+sc=\u30B5\u30EB\u30C7\u30A3\u30CB\u30A2\u8A9E
+sd=\u30B7\u30F3\u30C9\u8A9E
+se=\u5317\u30B5\u30DF\u8A9E
+sg=\u30B5\u30F3\u30B4\u8A9E
+si=\u30B7\u30F3\u30CF\u30E9\u8A9E
+sk=\u30B9\u30ED\u30D0\u30AD\u30A2\u8A9E
+sl=\u30B9\u30ED\u30D9\u30CB\u30A2\u8A9E
+sm=\u30B5\u30E2\u30A2\u8A9E
+sn=\u30B7\u30E7\u30CA\u8A9E
+so=\u30BD\u30DE\u30EA\u8A9E
+sq=\u30A2\u30EB\u30D0\u30CB\u30A2\u8A9E
+sr=\u30BB\u30EB\u30D3\u30A2\u8A9E
+ss=\u30B7\u30B9\u30EF\u30C6\u30A3\u8A9E
+st=\u30BB\u30BD\u30C8\u8A9E
+su=\u30B9\u30F3\u30C0\u8A9E
+sv=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u8A9E
+sw=\u30B9\u30EF\u30D2\u30EA\u8A9E
+ta=\u30BF\u30DF\u30FC\u30EB\u8A9E
+te=\u30C6\u30EB\u30B0\u8A9E
+tg=\u30BF\u30B8\u30AF\u8A9E
+th=\u30BF\u30A4\u8A9E
+ti=\u30C6\u30A3\u30B0\u30EA\u30CB\u30A2\u8A9E
+tk=\u30C8\u30EB\u30AF\u30E1\u30F3\u8A9E
+tl=\u30BF\u30AC\u30ED\u30B0\u8A9E
+tn=\u30C4\u30EF\u30CA\u8A9E
+to=\u30C8\u30F3\u30AC\u8A9E
+tr=\u30C8\u30EB\u30B3\u8A9E
+ts=\u30C4\u30A9\u30F3\u30AC\u8A9E
+tt=\u30BF\u30BF\u30FC\u30EB\u8A9E
+tw=\u30C8\u30A5\u30A4\u8A9E
+ty=\u30BF\u30D2\u30C1\u8A9E
+ug=\u30A6\u30A4\u30B0\u30EB\u8A9E
+uk=\u30A6\u30AF\u30E9\u30A4\u30CA\u8A9E
+ur=\u30A6\u30EB\u30C9\u30A5\u30FC\u8A9E
+uz=\u30A6\u30BA\u30D9\u30AF\u8A9E
+ve=\u30D9\u30F3\u30C0\u8A9E
+vi=\u30D9\u30C8\u30CA\u30E0\u8A9E
+vo=\u30F4\u30A9\u30E9\u30D4\u30E5\u30FC\u30AF\u8A9E
+wa=\u30EF\u30ED\u30F3\u8A9E
+wo=\u30A6\u30A9\u30ED\u30D5\u8A9E
+xh=\u30B3\u30B5\u8A9E
+yi=\u30A4\u30C7\u30A3\u30C3\u30B7\u30E5\u8A9E
+yo=\u30E8\u30EB\u30D0\u8A9E
+za=\u30C1\u30EF\u30F3\u8A9E
+zh=\u4E2D\u56FD\u8A9E
+zu=\u30BA\u30FC\u30EB\u30FC\u8A9E
 
 # key is ISO 639.2 language code
 aar=\u30A2\u30D5\u30A1\u30EB\u8A9E
@@ -806,7 +807,7 @@
 Narb=\u53E4\u4EE3\u5317\u30A2\u30E9\u30D3\u30A2\u8A9E
 Nbat=\u30CA\u30D0\u30C6\u30A2\u8A9E
 Nkgb=Nakhi Geba\u6587\u5B57
-Nkoo=\u30F3\u30B3\u6587\u5B57
+Nkoo=\u30F3\u30B3\u8A9E
 Ogam=\u30AA\u30AC\u30E0\u6587\u5B57
 Olck=\u30AA\u30EB\u30C1\u30AD\u6587\u5B57
 Orkh=\u30AA\u30EB\u30DB\u30F3\u6587\u5B57
@@ -855,7 +856,7 @@
 Visp=\u8996\u8A71\u6CD5
 Wara=\u30EF\u30E9\u30F3\u30B0\u30FB\u30AF\u30B7\u30C6\u30A3\u6587\u5B57
 Xpeo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u6587\u5B57
-Xsux=\u30B7\u30E5\u30E1\u30FC\u30EB\uFF1D\u30A2\u30C3\u30AB\u30C9\u8A9E\u6954\u5F62\u6587\u5B57
+Xsux=\u30B7\u30E5\u30E1\u30FC\u30EB=\u30A2\u30C3\u30AB\u30C9\u8A9E\u6954\u5F62\u6587\u5B57
 Yiii=\u30A4\u6587\u5B57
 Zinh=\u7D99\u627F\u7528\u5B57
 Zmth=\u6570\u5B66\u8A18\u53F7
@@ -867,256 +868,256 @@
 # country names
 # key is ISO 3166 country code
 
-AD=\u30a2\u30f3\u30c9\u30e9
-AE=\u30a2\u30e9\u30d6\u9996\u9577\u56fd\u9023\u90a6
-AF=\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3
-AG=\u30a2\u30f3\u30c1\u30b0\u30a2\u30d0\u30fc\u30d6\u30fc\u30c0
-AI=\u30a2\u30f3\u30ae\u30e9
-AL=\u30a2\u30eb\u30d0\u30cb\u30a2
-AM=\u30a2\u30eb\u30e1\u30cb\u30a2
-AN=\u30aa\u30e9\u30f3\u30c0\u9818\u30a2\u30f3\u30c6\u30a3\u30eb\u8af8\u5cf6
-AO=\u30a2\u30f3\u30b4\u30e9
+AD=\u30A2\u30F3\u30C9\u30E9
+AE=\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6
+AF=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3
+AG=\u30A2\u30F3\u30C1\u30B0\u30A2\u30D0\u30FC\u30D6\u30FC\u30C0
+AI=\u30A2\u30F3\u30AE\u30E9
+AL=\u30A2\u30EB\u30D0\u30CB\u30A2
+AM=\u30A2\u30EB\u30E1\u30CB\u30A2
+AN=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB\u8AF8\u5CF6
+AO=\u30A2\u30F3\u30B4\u30E9
 AQ=\u5357\u6975
-AR=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3
-AS=\u30a2\u30e1\u30ea\u30ab\u30f3\u30b5\u30e2\u30a2
-AT=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2
-AU=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2
-AW=\u30a2\u30eb\u30d0\u5cf6
-AX=\u30aa\u30fc\u30e9\u30f3\u30c9\u8af8\u5cf6
-AZ=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3
-BA=\u30dc\u30b9\u30cb\u30a2\u30fb\u30d8\u30eb\u30c4\u30a7\u30b4\u30d3\u30ca
-BB=\u30d0\u30eb\u30d0\u30c9\u30b9
-BD=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5
-BE=\u30d9\u30eb\u30ae\u30fc
-BF=\u30d6\u30eb\u30ad\u30ca\u30d5\u30a1\u30bd
-BG=\u30d6\u30eb\u30ac\u30ea\u30a2
-BH=\u30d0\u30fc\u30ec\u30fc\u30f3
-BI=\u30d6\u30eb\u30f3\u30b8
-BJ=\u30d9\u30cb\u30f3
+AR=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3
+AS=\u30A2\u30E1\u30EA\u30AB\u30F3\u30B5\u30E2\u30A2
+AT=\u30AA\u30FC\u30B9\u30C8\u30EA\u30A2
+AU=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2
+AW=\u30A2\u30EB\u30D0\u5CF6
+AX=\u30AA\u30FC\u30E9\u30F3\u30C9\u8AF8\u5CF6
+AZ=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3
+BA=\u30DC\u30B9\u30CB\u30A2\u30FB\u30D8\u30EB\u30C4\u30A7\u30B4\u30D3\u30CA
+BB=\u30D0\u30EB\u30D0\u30C9\u30B9
+BD=\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5
+BE=\u30D9\u30EB\u30AE\u30FC
+BF=\u30D6\u30EB\u30AD\u30CA\u30D5\u30A1\u30BD
+BG=\u30D6\u30EB\u30AC\u30EA\u30A2
+BH=\u30D0\u30FC\u30EC\u30FC\u30F3
+BI=\u30D6\u30EB\u30F3\u30B8
+BJ=\u30D9\u30CB\u30F3
 BL=\u30B5\u30F3\u30FB\u30D0\u30EB\u30C6\u30EB\u30DF\u30FC
-BM=\u30d0\u30fc\u30df\u30e5\u30fc\u30c0\u8af8\u5cf6
-BN=\u30d6\u30eb\u30cd\u30a4
-BO=\u30dc\u30ea\u30d3\u30a2
+BM=\u30D0\u30FC\u30DF\u30E5\u30FC\u30C0\u8AF8\u5CF6
+BN=\u30D6\u30EB\u30CD\u30A4
+BO=\u30DC\u30EA\u30D3\u30A2
 BQ=\u30DC\u30CD\u30FC\u30EB\u3001\u30BB\u30F3\u30C8\u30FB\u30A8\u30A6\u30B9\u30BF\u30C6\u30A3\u30A6\u30B9\u304A\u3088\u3073\u30B5\u30D0
-BR=\u30d6\u30e9\u30b8\u30eb
-BS=\u30d0\u30cf\u30de
-BT=\u30d6\u30fc\u30bf\u30f3
-BV=\u30d6\u30fc\u30d9\u5cf6
-BW=\u30dc\u30c4\u30ef\u30ca
-BY=\u30d9\u30e9\u30eb\u30fc\u30b7
-BZ=\u30d9\u30ea\u30fc\u30ba
-CA=\u30ab\u30ca\u30c0
-CC=\u30b3\u30b3\u30b9\u8af8\u5cf6
-CD=\u30b3\u30f3\u30b4\u6c11\u4e3b\u5171\u548c\u56fd
-CF=\u4e2d\u592e\u30a2\u30d5\u30ea\u30ab\u5171\u548c\u56fd
-CG=\u30b3\u30f3\u30b4
-CH=\u30b9\u30a4\u30b9
-CI=\u30b3\u30fc\u30c8\u30b8\u30dc\u30a2\u30fc\u30eb
-CK=\u30af\u30c3\u30af\u8af8\u5cf6
-CL=\u30c1\u30ea
-CM=\u30ab\u30e1\u30eb\u30fc\u30f3
-CN=\u4e2d\u83ef\u4eba\u6c11\u5171\u548c\u56fd
-CO=\u30b3\u30ed\u30f3\u30d3\u30a2
-CR=\u30b3\u30b9\u30bf\u30ea\u30ab
-CS=\u30bb\u30eb\u30d3\u30a2\u30fb\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
-CU=\u30ad\u30e5\u30fc\u30d0
-CV=\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7
+BR=\u30D6\u30E9\u30B8\u30EB
+BS=\u30D0\u30CF\u30DE
+BT=\u30D6\u30FC\u30BF\u30F3
+BV=\u30D6\u30FC\u30D9\u5CF6
+BW=\u30DC\u30C4\u30EF\u30CA
+BY=\u30D9\u30E9\u30EB\u30FC\u30B7
+BZ=\u30D9\u30EA\u30FC\u30BA
+CA=\u30AB\u30CA\u30C0
+CC=\u30B3\u30B3\u30B9\u8AF8\u5CF6
+CD=\u30B3\u30F3\u30B4\u6C11\u4E3B\u5171\u548C\u56FD
+CF=\u4E2D\u592E\u30A2\u30D5\u30EA\u30AB\u5171\u548C\u56FD
+CG=\u30B3\u30F3\u30B4
+CH=\u30B9\u30A4\u30B9
+CI=\u30B3\u30FC\u30C8\u30B8\u30DC\u30A2\u30FC\u30EB
+CK=\u30AF\u30C3\u30AF\u8AF8\u5CF6
+CL=\u30C1\u30EA
+CM=\u30AB\u30E1\u30EB\u30FC\u30F3
+CN=\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u56FD
+CO=\u30B3\u30ED\u30F3\u30D3\u30A2
+CR=\u30B3\u30B9\u30BF\u30EA\u30AB
+CS=\u30BB\u30EB\u30D3\u30A2\u30FB\u30E2\u30F3\u30C6\u30CD\u30B0\u30ED
+CU=\u30AD\u30E5\u30FC\u30D0
+CV=\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7
 CW=\u30AD\u30E5\u30E9\u30BD\u30FC
-CX=\u30af\u30ea\u30b9\u30de\u30b9\u5cf6
-CY=\u30ad\u30d7\u30ed\u30b9
-CZ=\u30c1\u30a7\u30b3
-DE=\u30c9\u30a4\u30c4
-DJ=\u30b8\u30d6\u30c1
-DK=\u30c7\u30f3\u30de\u30fc\u30af
-DM=\u30c9\u30df\u30cb\u30ab\u56fd
-DO=\u30c9\u30df\u30cb\u30ab\u5171\u548c\u56fd
-DZ=\u30a2\u30eb\u30b8\u30a7\u30ea\u30a2
-EC=\u30a8\u30af\u30a2\u30c9\u30eb
-EE=\u30a8\u30b9\u30c8\u30cb\u30a2
-EG=\u30a8\u30b8\u30d7\u30c8
-EH=\u897f\u30b5\u30cf\u30e9
-ER=\u30a8\u30ea\u30c8\u30ea\u30a2
-ES=\u30b9\u30da\u30a4\u30f3
-ET=\u30a8\u30c1\u30aa\u30d4\u30a2
-FI=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9
-FJ=\u30d5\u30a3\u30b8\u30fc
-FK=\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\u8af8\u5cf6
-FM=\u30df\u30af\u30ed\u30cd\u30b7\u30a2
-FO=\u30d5\u30a7\u30ed\u30fc\u8af8\u5cf6
-FR=\u30d5\u30e9\u30f3\u30b9
-GA=\u30ac\u30dc\u30f3
-GB=\u30a4\u30ae\u30ea\u30b9
-GD=\u30b0\u30ec\u30ca\u30c0
-GE=\u30b0\u30eb\u30b8\u30a2
-GF=\u4ecf\u9818\u30ae\u30a2\u30ca
+CX=\u30AF\u30EA\u30B9\u30DE\u30B9\u5CF6
+CY=\u30AD\u30D7\u30ED\u30B9
+CZ=\u30C1\u30A7\u30B3
+DE=\u30C9\u30A4\u30C4
+DJ=\u30B8\u30D6\u30C1
+DK=\u30C7\u30F3\u30DE\u30FC\u30AF
+DM=\u30C9\u30DF\u30CB\u30AB\u56FD
+DO=\u30C9\u30DF\u30CB\u30AB\u5171\u548C\u56FD
+DZ=\u30A2\u30EB\u30B8\u30A7\u30EA\u30A2
+EC=\u30A8\u30AF\u30A2\u30C9\u30EB
+EE=\u30A8\u30B9\u30C8\u30CB\u30A2
+EG=\u30A8\u30B8\u30D7\u30C8
+EH=\u897F\u30B5\u30CF\u30E9
+ER=\u30A8\u30EA\u30C8\u30EA\u30A2
+ES=\u30B9\u30DA\u30A4\u30F3
+ET=\u30A8\u30C1\u30AA\u30D4\u30A2
+FI=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9
+FJ=\u30D5\u30A3\u30B8\u30FC
+FK=\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6
+FM=\u30DF\u30AF\u30ED\u30CD\u30B7\u30A2
+FO=\u30D5\u30A7\u30ED\u30FC\u8AF8\u5CF6
+FR=\u30D5\u30E9\u30F3\u30B9
+GA=\u30AC\u30DC\u30F3
+GB=\u30A4\u30AE\u30EA\u30B9
+GD=\u30B0\u30EC\u30CA\u30C0
+GE=\u30B0\u30EB\u30B8\u30A2
+GF=\u4ECF\u9818\u30AE\u30A2\u30CA
 GG=\u30AC\u30FC\u30F3\u30B8\u30FC
-GH=\u30ac\u30fc\u30ca
-GI=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb
-GL=\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9
-GM=\u30ac\u30f3\u30d3\u30a2
-GN=\u30ae\u30cb\u30a2
-GP=\u30b0\u30a2\u30c9\u30eb\u30fc\u30d7
-GQ=\u8d64\u9053\u30ae\u30cb\u30a2
-GR=\u30ae\u30ea\u30b7\u30a2
-GS=\u30b5\u30a6\u30b9\u30b8\u30e7\u30fc\u30b8\u30a2\u5cf6\u30fb\u30b5\u30a6\u30b9\u30b5\u30f3\u30c9\u30a6\u30a3\u30c3\u30c1\u5cf6
-GT=\u30b0\u30a2\u30c6\u30de\u30e9
-GU=\u30b0\u30a2\u30e0
-GW=\u30ae\u30cb\u30a2\u30d3\u30b5\u30a6
-GY=\u30ac\u30a4\u30a2\u30ca
-HK=\u9999\u6e2f
-HM=\u30cf\u30fc\u30c9\u30fb\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u8af8\u5cf6
-HN=\u30db\u30f3\u30b8\u30e5\u30e9\u30b9
-HR=\u30af\u30ed\u30a2\u30c1\u30a2
-HT=\u30cf\u30a4\u30c1
-HU=\u30cf\u30f3\u30ac\u30ea\u30fc
-ID=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2
-IE=\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9
-IL=\u30a4\u30b9\u30e9\u30a8\u30eb
+GH=\u30AC\u30FC\u30CA
+GI=\u30B8\u30D6\u30E9\u30EB\u30BF\u30EB
+GL=\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9
+GM=\u30AC\u30F3\u30D3\u30A2
+GN=\u30AE\u30CB\u30A2
+GP=\u30B0\u30A2\u30C9\u30EB\u30FC\u30D7
+GQ=\u8D64\u9053\u30AE\u30CB\u30A2
+GR=\u30AE\u30EA\u30B7\u30A2
+GS=\u30B5\u30A6\u30B9\u30B8\u30E7\u30FC\u30B8\u30A2\u5CF6\u30FB\u30B5\u30A6\u30B9\u30B5\u30F3\u30C9\u30A6\u30A3\u30C3\u30C1\u5CF6
+GT=\u30B0\u30A2\u30C6\u30DE\u30E9
+GU=\u30B0\u30A2\u30E0
+GW=\u30AE\u30CB\u30A2\u30D3\u30B5\u30A6
+GY=\u30AC\u30A4\u30A2\u30CA
+HK=\u9999\u6E2F
+HM=\u30CF\u30FC\u30C9\u30FB\u30DE\u30AF\u30C9\u30CA\u30EB\u30C9\u8AF8\u5CF6
+HN=\u30DB\u30F3\u30B8\u30E5\u30E9\u30B9
+HR=\u30AF\u30ED\u30A2\u30C1\u30A2
+HT=\u30CF\u30A4\u30C1
+HU=\u30CF\u30F3\u30AC\u30EA\u30FC
+ID=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2
+IE=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9
+IL=\u30A4\u30B9\u30E9\u30A8\u30EB
 IM=\u30DE\u30F3\u5CF6
-IN=\u30a4\u30f3\u30c9
-IO=\u82f1\u9818\u30a4\u30f3\u30c9\u6d0b\u5730\u57df
-IQ=\u30a4\u30e9\u30af
-IR=\u30a4\u30e9\u30f3
-IS=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9
-IT=\u30a4\u30bf\u30ea\u30a2
+IN=\u30A4\u30F3\u30C9
+IO=\u82F1\u9818\u30A4\u30F3\u30C9\u6D0B\u5730\u57DF
+IQ=\u30A4\u30E9\u30AF
+IR=\u30A4\u30E9\u30F3
+IS=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9
+IT=\u30A4\u30BF\u30EA\u30A2
 JE=\u30B8\u30E3\u30FC\u30B8\u30FC
-JM=\u30b8\u30e3\u30de\u30a4\u30ab
-JO=\u30e8\u30eb\u30c0\u30f3
-JP=\u65e5\u672c
-KE=\u30b1\u30cb\u30a2
-KG=\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3
-KH=\u30ab\u30f3\u30dc\u30b8\u30a2
-KI=\u30ad\u30ea\u30d0\u30b9
-KM=\u30b3\u30e2\u30ed
-KN=\u30bb\u30f3\u30c8\u30af\u30ea\u30b9\u30c8\u30d5\u30a1\u30fc\u30fb\u30cd\u30a4\u30d3\u30b9
-KP=\u671d\u9bae\u6c11\u4e3b\u4e3b\u7fa9\u4eba\u6c11\u5171\u548c\u56fd
-KR=\u5927\u97d3\u6c11\u56fd
-KW=\u30af\u30a6\u30a7\u30fc\u30c8
-KY=\u30b1\u30a4\u30de\u30f3\u8af8\u5cf6
-KZ=\u30ab\u30b6\u30d5\u30b9\u30bf\u30f3
-LA=\u30e9\u30aa\u30b9
-LB=\u30ec\u30d0\u30ce\u30f3
-LC=\u30bb\u30f3\u30c8\u30eb\u30b7\u30a2
-LI=\u30ea\u30d2\u30c6\u30f3\u30b7\u30e5\u30bf\u30a4\u30f3
-LK=\u30b9\u30ea\u30e9\u30f3\u30ab
-LR=\u30ea\u30d9\u30ea\u30a2
-LS=\u30ec\u30bd\u30c8
-LT=\u30ea\u30c8\u30a2\u30cb\u30a2
-LU=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30af
-LV=\u30e9\u30c8\u30d3\u30a2
-LY=\u30ea\u30d3\u30a2
-MA=\u30e2\u30ed\u30c3\u30b3
-MC=\u30e2\u30ca\u30b3
-MD=\u30e2\u30eb\u30c9\u30d0
-ME=\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
+JM=\u30B8\u30E3\u30DE\u30A4\u30AB
+JO=\u30E8\u30EB\u30C0\u30F3
+JP=\u65E5\u672C
+KE=\u30B1\u30CB\u30A2
+KG=\u30AD\u30EB\u30AE\u30B9\u30BF\u30F3
+KH=\u30AB\u30F3\u30DC\u30B8\u30A2
+KI=\u30AD\u30EA\u30D0\u30B9
+KM=\u30B3\u30E2\u30ED
+KN=\u30BB\u30F3\u30C8\u30AF\u30EA\u30B9\u30C8\u30D5\u30A1\u30FC\u30FB\u30CD\u30A4\u30D3\u30B9
+KP=\u671D\u9BAE\u6C11\u4E3B\u4E3B\u7FA9\u4EBA\u6C11\u5171\u548C\u56FD
+KR=\u5927\u97D3\u6C11\u56FD
+KW=\u30AF\u30A6\u30A7\u30FC\u30C8
+KY=\u30B1\u30A4\u30DE\u30F3\u8AF8\u5CF6
+KZ=\u30AB\u30B6\u30D5\u30B9\u30BF\u30F3
+LA=\u30E9\u30AA\u30B9
+LB=\u30EC\u30D0\u30CE\u30F3
+LC=\u30BB\u30F3\u30C8\u30EB\u30B7\u30A2
+LI=\u30EA\u30D2\u30C6\u30F3\u30B7\u30E5\u30BF\u30A4\u30F3
+LK=\u30B9\u30EA\u30E9\u30F3\u30AB
+LR=\u30EA\u30D9\u30EA\u30A2
+LS=\u30EC\u30BD\u30C8
+LT=\u30EA\u30C8\u30A2\u30CB\u30A2
+LU=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF
+LV=\u30E9\u30C8\u30D3\u30A2
+LY=\u30EA\u30D3\u30A2
+MA=\u30E2\u30ED\u30C3\u30B3
+MC=\u30E2\u30CA\u30B3
+MD=\u30E2\u30EB\u30C9\u30D0
+ME=\u30E2\u30F3\u30C6\u30CD\u30B0\u30ED
 MF=\u30BB\u30F3\u30C8\u30FB\u30DE\u30FC\u30C1\u30F3
-MG=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb
-MH=\u30de\u30fc\u30b7\u30e3\u30eb\u8af8\u5cf6
-MK=\u30de\u30b1\u30c9\u30cb\u30a2
-ML=\u30de\u30ea
-MM=\u30df\u30e3\u30f3\u30de\u30fc
-MN=\u30e2\u30f3\u30b4\u30eb
-MO=\u30de\u30ab\u30aa
-MP=\u5317\u30de\u30ea\u30a2\u30ca\u8af8\u5cf6
-MQ=\u30de\u30eb\u30c6\u30a3\u30cb\u30fc\u30af\u5cf6
-MR=\u30e2\u30fc\u30ea\u30bf\u30cb\u30a2
-MS=\u30e2\u30f3\u30c8\u30bb\u30e9\u30c8\u5cf6
-MT=\u30de\u30eb\u30bf
-MU=\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9
-MV=\u30e2\u30eb\u30c7\u30a3\u30d6
-MW=\u30de\u30e9\u30a6\u30a4
-MX=\u30e1\u30ad\u30b7\u30b3
-MY=\u30de\u30ec\u30fc\u30b7\u30a2
-MZ=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af
-NA=\u30ca\u30df\u30d3\u30a2
-NC=\u30cb\u30e5\u30fc\u30ab\u30ec\u30c9\u30cb\u30a2
-NE=\u30cb\u30b8\u30a7\u30fc\u30eb
-NF=\u30ce\u30fc\u30d5\u30a9\u30fc\u30af\u5cf6
-NG=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2
-NI=\u30cb\u30ab\u30e9\u30b0\u30a2
-NL=\u30aa\u30e9\u30f3\u30c0
-NO=\u30ce\u30eb\u30a6\u30a7\u30fc
-NP=\u30cd\u30d1\u30fc\u30eb
-NR=\u30ca\u30a6\u30eb
-NU=\u30cb\u30a6\u30a8\u5cf6
-NZ=\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9
-OM=\u30aa\u30de\u30fc\u30f3
-PA=\u30d1\u30ca\u30de
-PE=\u30da\u30eb\u30fc
-PF=\u4ecf\u9818\u30dd\u30ea\u30cd\u30b7\u30a2
-PG=\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2
-PH=\u30d5\u30a3\u30ea\u30d4\u30f3
-PK=\u30d1\u30ad\u30b9\u30bf\u30f3
-PL=\u30dd\u30fc\u30e9\u30f3\u30c9
-PM=\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u5cf6\u30fb\u30df\u30af\u30ed\u30f3\u5cf6
-PN=\u30d4\u30c8\u30b1\u30a2\u30f3\u5cf6
-PR=\u30d7\u30a8\u30eb\u30c8\u30ea\u30b3
-PS=\u30d1\u30ec\u30b9\u30c1\u30ca
-PT=\u30dd\u30eb\u30c8\u30ac\u30eb
-PW=\u30d1\u30e9\u30aa
-PY=\u30d1\u30e9\u30b0\u30a2\u30a4
-QA=\u30ab\u30bf\u30fc\u30eb
-RE=\u30ec\u30e6\u30cb\u30aa\u30f3
-RO=\u30eb\u30fc\u30de\u30cb\u30a2
-RS=\u30bb\u30eb\u30d3\u30a2
-RU=\u30ed\u30b7\u30a2
-RW=\u30eb\u30ef\u30f3\u30c0
-SA=\u30b5\u30a6\u30b8\u30a2\u30e9\u30d3\u30a2
-SB=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6
-SC=\u30bb\u30a4\u30b7\u30a7\u30eb
-SD=\u30b9\u30fc\u30c0\u30f3
-SE=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3
-SG=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb
-SH=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca\u5cf6
-SI=\u30b9\u30ed\u30d9\u30cb\u30a2
-SJ=\u30b9\u30d0\u30fc\u30eb\u30d0\u30eb\u8af8\u5cf6\u30fb\u30e4\u30f3\u30de\u30a4\u30a8\u30f3\u5cf6
-SK=\u30b9\u30ed\u30d0\u30ad\u30a2
-SL=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd
-SM=\u30b5\u30f3\u30de\u30ea\u30ce
-SN=\u30bb\u30cd\u30ac\u30eb
-SO=\u30bd\u30de\u30ea\u30a2
-SR=\u30b9\u30ea\u30ca\u30e0
-ST=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da
-SV=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb
+MG=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB
+MH=\u30DE\u30FC\u30B7\u30E3\u30EB\u8AF8\u5CF6
+MK=\u30DE\u30B1\u30C9\u30CB\u30A2
+ML=\u30DE\u30EA
+MM=\u30DF\u30E3\u30F3\u30DE\u30FC
+MN=\u30E2\u30F3\u30B4\u30EB
+MO=\u30DE\u30AB\u30AA
+MP=\u5317\u30DE\u30EA\u30A2\u30CA\u8AF8\u5CF6
+MQ=\u30DE\u30EB\u30C6\u30A3\u30CB\u30FC\u30AF\u5CF6
+MR=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2
+MS=\u30E2\u30F3\u30C8\u30BB\u30E9\u30C8\u5CF6
+MT=\u30DE\u30EB\u30BF
+MU=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9
+MV=\u30E2\u30EB\u30C7\u30A3\u30D6
+MW=\u30DE\u30E9\u30A6\u30A4
+MX=\u30E1\u30AD\u30B7\u30B3
+MY=\u30DE\u30EC\u30FC\u30B7\u30A2
+MZ=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF
+NA=\u30CA\u30DF\u30D3\u30A2
+NC=\u30CB\u30E5\u30FC\u30AB\u30EC\u30C9\u30CB\u30A2
+NE=\u30CB\u30B8\u30A7\u30FC\u30EB
+NF=\u30CE\u30FC\u30D5\u30A9\u30FC\u30AF\u5CF6
+NG=\u30CA\u30A4\u30B8\u30A7\u30EA\u30A2
+NI=\u30CB\u30AB\u30E9\u30B0\u30A2
+NL=\u30AA\u30E9\u30F3\u30C0
+NO=\u30CE\u30EB\u30A6\u30A7\u30FC
+NP=\u30CD\u30D1\u30FC\u30EB
+NR=\u30CA\u30A6\u30EB
+NU=\u30CB\u30A6\u30A8\u5CF6
+NZ=\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9
+OM=\u30AA\u30DE\u30FC\u30F3
+PA=\u30D1\u30CA\u30DE
+PE=\u30DA\u30EB\u30FC
+PF=\u4ECF\u9818\u30DD\u30EA\u30CD\u30B7\u30A2
+PG=\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2
+PH=\u30D5\u30A3\u30EA\u30D4\u30F3
+PK=\u30D1\u30AD\u30B9\u30BF\u30F3
+PL=\u30DD\u30FC\u30E9\u30F3\u30C9
+PM=\u30B5\u30F3\u30D4\u30A8\u30FC\u30EB\u5CF6\u30FB\u30DF\u30AF\u30ED\u30F3\u5CF6
+PN=\u30D4\u30C8\u30B1\u30A2\u30F3\u5CF6
+PR=\u30D7\u30A8\u30EB\u30C8\u30EA\u30B3
+PS=\u30D1\u30EC\u30B9\u30C1\u30CA
+PT=\u30DD\u30EB\u30C8\u30AC\u30EB
+PW=\u30D1\u30E9\u30AA
+PY=\u30D1\u30E9\u30B0\u30A2\u30A4
+QA=\u30AB\u30BF\u30FC\u30EB
+RE=\u30EC\u30E6\u30CB\u30AA\u30F3
+RO=\u30EB\u30FC\u30DE\u30CB\u30A2
+RS=\u30BB\u30EB\u30D3\u30A2
+RU=\u30ED\u30B7\u30A2
+RW=\u30EB\u30EF\u30F3\u30C0
+SA=\u30B5\u30A6\u30B8\u30A2\u30E9\u30D3\u30A2
+SB=\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6
+SC=\u30BB\u30A4\u30B7\u30A7\u30EB
+SD=\u30B9\u30FC\u30C0\u30F3
+SE=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3
+SG=\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB
+SH=\u30BB\u30F3\u30C8\u30D8\u30EC\u30CA\u5CF6
+SI=\u30B9\u30ED\u30D9\u30CB\u30A2
+SJ=\u30B9\u30D0\u30FC\u30EB\u30D0\u30EB\u8AF8\u5CF6\u30FB\u30E4\u30F3\u30DE\u30A4\u30A8\u30F3\u5CF6
+SK=\u30B9\u30ED\u30D0\u30AD\u30A2
+SL=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD
+SM=\u30B5\u30F3\u30DE\u30EA\u30CE
+SN=\u30BB\u30CD\u30AC\u30EB
+SO=\u30BD\u30DE\u30EA\u30A2
+SR=\u30B9\u30EA\u30CA\u30E0
+ST=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA
+SV=\u30A8\u30EB\u30B5\u30EB\u30D0\u30C9\u30EB
 SX=\u30B5\u30F3\u30FB\u30DE\u30EB\u30BF\u30F3(\u30AA\u30E9\u30F3\u30C0\u9818)
-SY=\u30b7\u30ea\u30a2
-SZ=\u30b9\u30ef\u30b8\u30e9\u30f3\u30c9
-TC=\u30bf\u30fc\u30af\u30b9\u8af8\u5cf6\u30fb\u30ab\u30a4\u30b3\u30b9\u8af8\u5cf6
-TD=\u30c1\u30e3\u30c9
-TF=\u30d5\u30e9\u30f3\u30b9\u9818\u6975\u5357\u8af8\u5cf6
-TG=\u30c8\u30fc\u30b4
-TH=\u30bf\u30a4
-TJ=\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3
-TK=\u30c8\u30b1\u30e9\u30a6\u8af8\u5cf6
-TL=\u6771\u30c6\u30a3\u30e2\u30fc\u30eb
-TM=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3
-TN=\u30c1\u30e5\u30cb\u30b8\u30a2
-TO=\u30c8\u30f3\u30ac
-TR=\u30c8\u30eb\u30b3
-TT=\u30c8\u30ea\u30cb\u30c0\u30fc\u30c9\u30fb\u30c8\u30d0\u30b4
-TV=\u30c4\u30d0\u30eb
-TW=\u53f0\u6e7e
-TZ=\u30bf\u30f3\u30b6\u30cb\u30a2
-UA=\u30a6\u30af\u30e9\u30a4\u30ca
-UG=\u30a6\u30ac\u30f3\u30c0
-UM=\u7c73\u9818\u592a\u5e73\u6d0b\u8af8\u5cf6
-US=\u30a2\u30e1\u30ea\u30ab\u5408\u8846\u56fd
-UY=\u30a6\u30eb\u30b0\u30a2\u30a4
-UZ=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3
-VA=\u30d0\u30c1\u30ab\u30f3
-VC=\u30bb\u30f3\u30c8\u30d3\u30f3\u30bb\u30f3\u30c8\u304a\u3088\u3073\u30b0\u30ec\u30ca\u30c7\u30a3\u30fc\u30f3\u8af8\u5cf6
-VE=\u30d9\u30cd\u30ba\u30a8\u30e9
-VG=\u82f1\u9818\u30d0\u30fc\u30b8\u30f3\u8af8\u5cf6
-VI=\u7c73\u9818\u30d0\u30fc\u30b8\u30f3\u8af8\u5cf6
-VN=\u30d9\u30c8\u30ca\u30e0
-VU=\u30d0\u30cc\u30a2\u30c4
-WF=\u30ef\u30ea\u30b9\u30fb\u30d5\u30c6\u30e5\u30ca\u8af8\u5cf6
-WS=\u897f\u30b5\u30e2\u30a2
-YE=\u30a4\u30a8\u30e1\u30f3
-YT=\u30de\u30e8\u30c3\u30c8\u5cf6
-ZA=\u5357\u30a2\u30d5\u30ea\u30ab
-ZM=\u30b6\u30f3\u30d3\u30a2
-ZW=\u30b8\u30f3\u30d0\u30d6\u30a8
+SY=\u30B7\u30EA\u30A2
+SZ=\u30B9\u30EF\u30B8\u30E9\u30F3\u30C9
+TC=\u30BF\u30FC\u30AF\u30B9\u8AF8\u5CF6\u30FB\u30AB\u30A4\u30B3\u30B9\u8AF8\u5CF6
+TD=\u30C1\u30E3\u30C9
+TF=\u30D5\u30E9\u30F3\u30B9\u9818\u6975\u5357\u8AF8\u5CF6
+TG=\u30C8\u30FC\u30B4
+TH=\u30BF\u30A4
+TJ=\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3
+TK=\u30C8\u30B1\u30E9\u30A6\u8AF8\u5CF6
+TL=\u6771\u30C6\u30A3\u30E2\u30FC\u30EB
+TM=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3
+TN=\u30C1\u30E5\u30CB\u30B8\u30A2
+TO=\u30C8\u30F3\u30AC
+TR=\u30C8\u30EB\u30B3
+TT=\u30C8\u30EA\u30CB\u30C0\u30FC\u30C9\u30FB\u30C8\u30D0\u30B4
+TV=\u30C4\u30D0\u30EB
+TW=\u53F0\u6E7E
+TZ=\u30BF\u30F3\u30B6\u30CB\u30A2
+UA=\u30A6\u30AF\u30E9\u30A4\u30CA
+UG=\u30A6\u30AC\u30F3\u30C0
+UM=\u7C73\u9818\u592A\u5E73\u6D0B\u8AF8\u5CF6
+US=\u30A2\u30E1\u30EA\u30AB\u5408\u8846\u56FD
+UY=\u30A6\u30EB\u30B0\u30A2\u30A4
+UZ=\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3
+VA=\u30D0\u30C1\u30AB\u30F3
+VC=\u30BB\u30F3\u30C8\u30D3\u30F3\u30BB\u30F3\u30C8\u304A\u3088\u3073\u30B0\u30EC\u30CA\u30C7\u30A3\u30FC\u30F3\u8AF8\u5CF6
+VE=\u30D9\u30CD\u30BA\u30A8\u30E9
+VG=\u82F1\u9818\u30D0\u30FC\u30B8\u30F3\u8AF8\u5CF6
+VI=\u7C73\u9818\u30D0\u30FC\u30B8\u30F3\u8AF8\u5CF6
+VN=\u30D9\u30C8\u30CA\u30E0
+VU=\u30D0\u30CC\u30A2\u30C4
+WF=\u30EF\u30EA\u30B9\u30FB\u30D5\u30C6\u30E5\u30CA\u8AF8\u5CF6
+WS=\u897F\u30B5\u30E2\u30A2
+YE=\u30A4\u30A8\u30E1\u30F3
+YT=\u30DE\u30E8\u30C3\u30C8\u5CF6
+ZA=\u5357\u30A2\u30D5\u30EA\u30AB
+ZM=\u30B6\u30F3\u30D3\u30A2
+ZW=\u30B8\u30F3\u30D0\u30D6\u30A8
 
 # territory names
 # key is UN M.49 country and area code
@@ -1151,3 +1152,19 @@
 154=\u5317\u30E8\u30FC\u30ED\u30C3\u30D1
 155=\u897F\u30E8\u30FC\u30ED\u30C3\u30D1
 419=\u30E9\u30C6\u30F3\u30A2\u30E1\u30EA\u30AB\u30FB\u30AB\u30EA\u30D6\u5730\u57DF
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=\u30E6\u30FC\u30ED
+%%B=\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB
+%%NY=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30CB\u30FC\u30CE\u30B7\u30AF)
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties
index fbbf2ef..f3d3a45 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=\uc544\ud30c\ub974\uc5b4
-ab=\uc555\uce74\uc988\uc5b4
-ae=\uc544\ubca0\uc2a4\ud0c0\uc5b4
-af=\ub0a8\uc544\uacf5 \uacf5\uc6a9\uc5b4
-ak=\uc544\uce78\uc5b4
-am=\uc554\ud558\ub77c\uc5b4
-an=\uc544\ub77c\uace4\uc5b4
-ar=\uc544\ub78d\uc5b4
-as=\uc544\uc0d8\uc5b4
-av=\uc544\ubc14\ub974\uc5b4
-ay=\uc544\uc774\ub9c8\ub77c\uc5b4
-az=\uc544\uc81c\ub974\ubc14\uc774\uc794\uc5b4
-ba=\ubc14\uc288\ud0a4\ub974\uc5b4
-be=\ubca8\ub85c\ub8e8\uc2dc\uc5b4
-bg=\ubd88\uac00\ub9ac\uc544\uc5b4
-bh=\ube44\ud558\ub974\uc5b4
-bi=\ube44\uc2ac\ub77c\ub9c8\uc5b4
-bm=\ubc24\ubc14\ub77c\uc5b4
-bn=\ubcb5\uace8\uc5b4
-bo=\ud2f0\ubca0\ud2b8\uc5b4
-br=\ube0c\ub974\ud0c0\ub274\uc5b4
-bs=\ubcf4\uc2a4\ub2c8\uc544\uc5b4
-ca=\uce74\ud0c8\ub85c\ub2c8\uc544\uc5b4
-ce=\uccb4\uccb8\uc5b4
-ch=\ucc28\ubaa8\ub85c\uc5b4
-co=\ucf54\ub974\uc2dc\uce74\uc5b4
-cr=\ud06c\ub9ac\uc5b4
-cs=\uccb4\ucf54\uc5b4
-cu=\uad50\ud68c \uc2ac\ub77c\ube0c\uc5b4
-cv=\ucd94\ubc14\uc26c\uc5b4
-cy=\uc6e8\uc77c\uc2a4\uc5b4
-da=\ub374\ub9c8\ud06c\uc5b4
-de=\ub3c5\uc77c\uc5b4
-dv=\ub514\ubca0\ud788\uc5b4
-dz=\ubd80\ud0c4\uc5b4
-ee=\uc5d0\uc6e8\uc5b4
-el=\uadf8\ub9ac\uc2a4\uc5b4
-en=\uc601\uc5b4
-eo=\uc5d0\uc2a4\ud398\ub780\ud1a0\uc5b4
-es=\uc2a4\ud398\uc778\uc5b4
-et=\uc5d0\uc2a4\ud1a0\ub2c8\uc544\uc5b4
-eu=\ubc14\uc2a4\ud06c\uc5b4
-fa=\uc774\ub780\uc5b4
-ff=\ud480\ub77c\ub2c8\uc5b4
-fi=\ud540\ub780\ub4dc\uc5b4
-fj=\ud53c\uc9c0\uc5b4
-fo=\ud398\ub85c\uc2a4\uc5b4
-fr=\ud504\ub791\uc2a4\uc5b4
-fy=\ud504\ub9ac\uc9c0\uc544\uc5b4
-ga=\uc544\uc77c\ub79c\ub4dc\uc5b4
-gd=\uc2a4\ucf54\uac24\ub9ad\uc5b4
-gl=\uac08\ub9ac\uc2dc\uc544\uc5b4
-gn=\uad6c\uc544\ub77c\ub2c8\uc5b4
-gu=\uad6c\uc790\ub77c\ud2b8\uc5b4
-gv=\ub9f9\ud06c\uc2a4\uc5b4
-ha=\ud558\uc6b0\uc790\uc5b4
-he=\ud788\ube0c\ub9ac\uc5b4
-hi=\ud78c\ub514\uc5b4
-ho=\ud788\ub9ac\ubaa8\ud22c\uc5b4
-hr=\ud06c\ub85c\uc544\ud2f0\uc544\uc5b4
-ht=\uc544\uc774\ud2f0\uc5b4
-hu=\ud5dd\uac00\ub9ac\uc5b4
-hy=\uc544\ub974\uba54\ub2c8\uc544\uc5b4
-hz=\ud5e4\ub808\ub85c\uc5b4
-ia=\uc778\ud130\ub9c1\uac70
-id=\uc778\ub3c4\ub124\uc2dc\uc544\uc5b4
-ie=\uc778\ud130\ub9c1\uac8c\uc5b4
-ig=\uc774\uadf8\ubcf4\uc5b4
-ii=\uc4f0\ucd28 \uc774\uc5b4
-ik=\uc774\ub204\ud53c\uc544\ud06c\uc5b4
-in=\uc778\ub3c4\ub124\uc2dc\uc544\uc5b4
-io=\uc774\ub3c4\uc5b4
-is=\uc544\uc774\uc2ac\ub780\ub4dc\uc5b4
-it=\uc774\ud0c8\ub9ac\uc544\uc5b4
-iu=\uc774\ub205\ud2f0\ud22c\ud2b8\uc5b4
-iw=\ud788\ube0c\ub9ac\uc5b4
-ja=\uc77c\ubcf8\uc5b4
-ji=\uc774\ub514\uc2dc\uc5b4
-jv=\uc790\ubc14\uc5b4
-ka=\uadf8\ub8e8\uc9c0\uc57c\uc5b4
-kg=\ucf69\uace0\uc5b4
-ki=\ud0a4\ucfe0\uc720\uc5b4
-kj=\ucf74\uc57c\ub9c8\uc5b4
-kk=\uce74\uc790\ud750\uc5b4
-kl=\uadf8\ub9b0\ub79c\ub4dc\uc5b4
-km=\uce84\ubcf4\ub514\uc544\uc5b4
-kn=\uce74\ub098\ub2e4\uc5b4
-ko=\ud55c\uad6d\uc5b4
-kr=\uce74\ub204\ub9ac\uc5b4
-ks=\uce74\uc288\ubbf8\ub974\uc5b4
-ku=\ud06c\ub974\ub4dc\uc5b4
-kv=\ucf54\ubbf8\uc5b4
-kw=\ucf58\uc6d4\uc5b4
-ky=\ud0a4\ub974\uae30\uc2a4\uc5b4
-la=\ub77c\ud2f4\uc5b4
-lb=\ub8e9\uc148\ubd80\ub974\ud06c\uc5b4
-lg=\uac04\ub2e4\uc5b4
-li=\ub9bc\ubc84\uadf8\uc5b4
-ln=\ub9c1\uac08\ub77c\uc5b4
-lo=\ub77c\uc624\uc5b4
-lt=\ub9ac\ud22c\uc544\ub2c8\uc544\uc5b4
-lu=\ub8e8\ubc14\uc5b4(\uce74\ud0d5\uac00)
-lv=\ub77c\ud2b8\ube44\uc544\uc5b4(\ub808\ud2b8\uc5b4)
-mg=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974\uc5b4
-mh=\ub9c8\uc15c\uc81c\ub3c4\uc5b4
-mi=\ub9c8\uc624\ub9ac\uc5b4
-mk=\ub9c8\ucf00\ub3c4\ub2c8\uc544\uc5b4
-ml=\ub9d0\ub77c\uc584\ub78c\uc5b4
-mn=\ubabd\uace8\uc5b4
-mo=\ubab0\ub2e4\ube44\uc544\uc5b4
-mr=\ub9c8\ub77c\ud2f0\uc5b4
-ms=\ub9d0\ub808\uc774\uc5b4
-mt=\ubab0\ud0c0\uc5b4
-my=\ubc84\ub9c8\uc5b4
-na=\ub098\uc6b0\ub8e8\uc5b4
-nb=\ub178\ub974\uc6e8\uc774\uc5b4(\ubd81\ubab0)
-nd=\ubd81\ubd80 \uc740\ub370\ubca8\ub808
-ne=\ub124\ud314\uc5b4
-ng=\uc740\ub3d9\uac00\uc5b4
-nl=\ub124\ub35c\ub780\ub4dc\uc5b4
-nn=\ub178\ub974\uc6e8\uc774\uc5b4(\ub2c8\ub178\ub974\uc2a4\ud06c)
-no=\ub178\ub974\uc6e8\uc774\uc5b4
-nr=\ub0a8\ubd80 \uc740\ub370\ubca8\ub808
-nv=\ub098\ubc14\ud638\uc5b4
-ny=\ub2c8\uc580\uc790\uc5b4
-oc=\uc625\uc2dc\ud2b8\uc5b4
-oj=\uc624\uc9c0\ube0c\uc640\uc5b4
-om=\uc624\ub85c\ubaa8\uc5b4(\uc544\ud310)
-or=\uc624\ub9ac\uc57c\uc5b4
-os=\uc624\uc138\ud2f0\uc548\uc5b4
-pa=\ud380\uc7a1\uc5b4
-pi=\ud314\ub9ac\uc5b4
-pl=\ud3f4\ub780\ub4dc\uc5b4
-ps=\ud30c\uc2dc\ud1a0\uc5b4(\ud478\uc2dc\ud1a0)
-pt=\ud3ec\ub974\ud22c\uce7c\uc5b4
-qu=\ucf00\ucd94\uc544\uc5b4
-rm=\ub808\ud1a0\ub85c\ub9cc\uc5b4
-rn=\ubc18\ud22c\uc5b4(\ubd80\ub8ec\ub514)
-ro=\ub8e8\ub9c8\ub2c8\uc544\uc5b4
-ru=\ub7ec\uc2dc\uc544\uc5b4
-rw=\ubc18\ud22c\uc5b4(\ub8e8\uc644\ub2e4)
-sa=\uc0b0\uc2a4\ud06c\ub9ac\ud2b8\uc5b4
-sc=\uc0ac\ub974\ub514\ub2c8\uc544\uc5b4
-sd=\uc2e0\ub514\uc5b4
-se=\ubd81\ubd80 \uc0ac\ubbf8\uc5b4
-sg=\uc0b0\uace0\uc5b4
-si=\uc2a4\ub9ac\ub791\uce74\uc5b4
-sk=\uc2ac\ub85c\ubc14\ud0a4\uc544\uc5b4
-sl=\uc2ac\ub85c\ubca0\ub2c8\uc544\uc5b4
-sm=\uc0ac\ubaa8\uc544\uc5b4
-sn=\uc1fc\ub098\uc5b4
-so=\uc18c\ub9d0\ub9ac\uc544\uc5b4
-sq=\uc54c\ubc14\ub2c8\uc544\uc5b4
-sr=\uc138\ub974\ube44\uc544\uc5b4
-ss=\uc2dc\uc2a4\uc640\ud2f0\uc5b4
-st=\uc138\uc18c\ud1a0\uc5b4
-su=\uc21c\ub2e8\uc5b4
-sv=\uc2a4\uc6e8\ub374\uc5b4
-sw=\uc2a4\uc640\ud790\ub9ac\uc5b4
-ta=\ud0c0\ubc00\uc5b4
-te=\ud154\ub8e8\uad6c\uc5b4
-tg=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4\uc5b4
-th=\ud0dc\uad6d\uc5b4
-ti=\ud2f0\uadf8\ub9ac\ub0d0\uc5b4
-tk=\ud22c\ub974\ud06c\uba58\uc5b4
-tl=\ud0c0\uac08\ub85c\uadf8\uc5b4
-tn=\uc138\uce20\uc640\ub098\uc5b4
-to=\ud1b5\uac00\uc5b4
-tr=\ud130\ud0a4\uc5b4
-ts=\ud1b5\uac00\uc5b4
-tt=\ud0c0\ud0c0\ub974\uc5b4
-tw=\ud2b8\uc704\uc5b4
-ty=\ud0c0\ud788\ud2f0\uc548\uc5b4
-ug=\uc704\uad6c\ub974\uc5b4
-uk=\uc6b0\ud06c\ub77c\uc774\ub098\uc5b4
-ur=\uc6b0\ub974\ub450\uc5b4
-uz=\uc6b0\uc988\ubca0\ud06c\uc5b4
-ve=\ubca4\ub2e4\uc5b4
-vi=\ubca0\ud2b8\ub0a8\uc5b4
-vo=\ubcfc\ub77c\ud4cc\ud06c\uc5b4
-wa=\uc648\ub8ec\uc5b4
-wo=\uc62c\ub85c\ud504\uc5b4
-xh=\ubc18\ud22c\uc5b4(\ub0a8\uc544\ud504\ub9ac\uce74)
-yi=\uc774\ub514\uc2dc\uc5b4
-yo=\uc694\ub8e8\ubc14\uc5b4
-za=\uc8fc\uc559\uc5b4
-zh=\uc911\uad6d\uc5b4
-zu=\uc904\ub8e8\uc5b4
+aa=\uC544\uD30C\uB974\uC5B4
+ab=\uC555\uCE74\uC988\uC5B4
+ae=\uC544\uBCA0\uC2A4\uD0C0\uC5B4
+af=\uB0A8\uC544\uACF5 \uACF5\uC6A9\uC5B4
+ak=\uC544\uCE78\uC5B4
+am=\uC554\uD558\uB77C\uC5B4
+an=\uC544\uB77C\uACE4\uC5B4
+ar=\uC544\uB78D\uC5B4
+as=\uC544\uC0D8\uC5B4
+av=\uC544\uBC14\uB974\uC5B4
+ay=\uC544\uC774\uB9C8\uB77C\uC5B4
+az=\uC544\uC81C\uB974\uBC14\uC774\uC794\uC5B4
+ba=\uBC14\uC288\uD0A4\uB974\uC5B4
+be=\uBCA8\uB77C\uB8E8\uC2A4\uC5B4
+bg=\uBD88\uAC00\uB9AC\uC544\uC5B4
+bh=\uBE44\uD558\uB974\uC5B4
+bi=\uBE44\uC2AC\uB77C\uB9C8\uC5B4
+bm=\uBC24\uBC14\uB77C\uC5B4
+bn=\uBCB5\uACE8\uC5B4
+bo=\uD2F0\uBCA0\uD2B8\uC5B4
+br=\uBE0C\uB974\uD0C0\uB274\uC5B4
+bs=\uBCF4\uC2A4\uB2C8\uC544\uC5B4
+ca=\uCE74\uD0C8\uB85C\uB2C8\uC544\uC5B4
+ce=\uCCB4\uCCB8\uC5B4
+ch=\uCC28\uBAA8\uB85C\uC5B4
+co=\uCF54\uB974\uC2DC\uCE74\uC5B4
+cr=\uD06C\uB9AC\uC5B4
+cs=\uCCB4\uCF54\uC5B4
+cu=\uAD50\uD68C \uC2AC\uB77C\uBE0C\uC5B4
+cv=\uCD94\uBC14\uC26C\uC5B4
+cy=\uC6E8\uC77C\uC2A4\uC5B4
+da=\uB374\uB9C8\uD06C\uC5B4
+de=\uB3C5\uC77C\uC5B4
+dv=\uB514\uBCA0\uD788\uC5B4
+dz=\uBD80\uD0C4\uC5B4
+ee=\uC5D0\uC6E8\uC5B4
+el=\uADF8\uB9AC\uC2A4\uC5B4
+en=\uC601\uC5B4
+eo=\uC5D0\uC2A4\uD398\uB780\uD1A0\uC5B4
+es=\uC2A4\uD398\uC778\uC5B4
+et=\uC5D0\uC2A4\uD1A0\uB2C8\uC544\uC5B4
+eu=\uBC14\uC2A4\uD06C\uC5B4
+fa=\uC774\uB780\uC5B4
+ff=\uD480\uB77C\uB2C8\uC5B4
+fi=\uD540\uB780\uB4DC\uC5B4
+fj=\uD53C\uC9C0\uC5B4
+fo=\uD398\uB85C\uC2A4\uC5B4
+fr=\uD504\uB791\uC2A4\uC5B4
+fy=\uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4
+ga=\uC544\uC77C\uB79C\uB4DC\uC5B4
+gd=\uC2A4\uCF54\uAC24\uB9AD\uC5B4
+gl=\uAC08\uB9AC\uC2DC\uC544\uC5B4
+gn=\uAD6C\uC544\uB77C\uB2C8\uC5B4
+gu=\uAD6C\uC790\uB77C\uD2B8\uC5B4
+gv=\uB9F9\uD06C\uC2A4\uC5B4
+ha=\uD558\uC6B0\uC790\uC5B4
+he=\uD788\uBE0C\uB9AC \uBB38\uC790
+hi=\uD78C\uB514\uC5B4
+ho=\uD788\uB9AC\uBAA8\uD22C\uC5B4
+hr=\uD06C\uB85C\uC544\uD2F0\uC544\uC5B4
+ht=\uC544\uC774\uD2F0\uC5B4
+hu=\uD5DD\uAC00\uB9AC\uC5B4
+hy=\uC544\uB974\uBA54\uB2C8\uC544\uC5B4
+hz=\uD5E4\uB808\uB85C\uC5B4
+ia=\uC778\uD130\uB9C1\uAC70
+id=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4
+ie=\uC778\uD130\uB9C1\uAC8C\uC5B4
+ig=\uC774\uADF8\uBCF4\uC5B4
+ii=\uC4F0\uCD28 \uC774\uC5B4
+ik=\uC774\uB204\uD53C\uC544\uD06C\uC5B4
+in=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4
+io=\uC774\uB3C4\uC5B4
+is=\uC544\uC774\uC2AC\uB780\uB4DC\uC5B4
+it=\uC774\uD0C8\uB9AC\uC544\uC5B4
+iu=\uC774\uB205\uD2F0\uD22C\uD2B8\uC5B4
+iw=\uD788\uBE0C\uB9AC \uBB38\uC790
+ja=\uC77C\uBCF8\uC5B4
+ji=\uC774\uB514\uC2DC\uC5B4
+jv=\uC790\uBC14\uC5B4
+ka=\uADF8\uB8E8\uC9C0\uC57C\uC5B4
+kg=\uCF69\uACE0\uC5B4
+ki=\uD0A4\uCFE0\uC720\uC5B4
+kj=\uCF74\uC57C\uB9C8\uC5B4
+kk=\uCE74\uC790\uD750\uC5B4
+kl=\uADF8\uB9B0\uB79C\uB4DC\uC5B4
+km=\uD06C\uBA54\uB974 \uBB38\uC790
+kn=\uCE78\uB098\uB2E4 \uBB38\uC790
+ko=\uD55C\uAD6D\uC5B4
+kr=\uCE74\uB204\uB9AC\uC5B4
+ks=\uCE74\uC288\uBBF8\uB974\uC5B4
+ku=\uD06C\uB974\uB4DC\uC5B4
+kv=\uCF54\uBBF8\uC5B4
+kw=\uCF58\uC6D4\uC5B4
+ky=\uD0A4\uB974\uAE30\uC2A4\uC5B4
+la=\uB77C\uD2F4\uC5B4
+lb=\uB8E9\uC148\uBD80\uB974\uD06C\uC5B4
+lg=\uAC04\uB2E4\uC5B4
+li=\uB9BC\uBC84\uADF8\uC5B4
+ln=\uB9C1\uAC08\uB77C\uC5B4
+lo=\uB77C\uC624\uC5B4
+lt=\uB9AC\uD22C\uC544\uB2C8\uC544\uC5B4
+lu=\uB8E8\uBC14\uC5B4(\uCE74\uD0D5\uAC00)
+lv=\uB77C\uD2B8\uBE44\uC544\uC5B4(\uB808\uD2B8\uC5B4)
+mg=\uB9C8\uB2E4\uAC00\uC2A4\uCE74\uB974\uC5B4
+mh=\uB9C8\uC15C\uC81C\uB3C4\uC5B4
+mi=\uB9C8\uC624\uB9AC\uC5B4
+mk=\uB9C8\uCF00\uB3C4\uB2C8\uC544\uC5B4
+ml=\uB9D0\uB77C\uC584\uB78C\uC5B4
+mn=\uBABD\uACE8\uC5B4
+mo=\uBAB0\uB2E4\uBE44\uC544\uC5B4
+mr=\uB9C8\uB77C\uD2F0\uC5B4
+ms=\uB9D0\uB808\uC774\uC5B4
+mt=\uBAB0\uD0C0\uC5B4
+my=\uBC84\uB9C8\uC5B4
+na=\uB098\uC6B0\uB8E8\uC5B4
+nb=\uB178\uB974\uC6E8\uC774\uC5B4(\uBCF5\uB9D0)
+nd=\uBD81\uBD80 \uC740\uB370\uBCA8\uB808
+ne=\uB124\uD314\uC5B4
+ng=\uC740\uB3D9\uAC00\uC5B4
+nl=\uB124\uB35C\uB780\uB4DC\uC5B4
+nn=\uB178\uB974\uC6E8\uC774\uC5B4(\uB2C8\uB178\uB974\uC2A4\uD06C)
+no=\uB178\uB974\uC6E8\uC774\uC5B4
+nr=\uB0A8\uBD80 \uC740\uB370\uBCA8\uB808
+nv=\uB098\uBC14\uD638\uC5B4
+ny=\uB2C8\uC580\uC790\uC5B4
+oc=\uC625\uC2DC\uD2B8\uC5B4
+oj=\uC624\uC9C0\uBE0C\uC640\uC5B4
+om=\uC624\uB85C\uBAA8\uC5B4(\uC544\uD310)
+or=\uC624\uB9AC\uC57C\uC5B4
+os=\uC624\uC138\uD2F0\uC548\uC5B4
+pa=\uD380\uC7A1\uC5B4
+pi=\uD314\uB9AC\uC5B4
+pl=\uD3F4\uB780\uB4DC\uC5B4
+ps=\uD30C\uC2DC\uD1A0\uC5B4(\uD478\uC2DC\uD1A0)
+pt=\uD3EC\uB974\uD22C\uCE7C\uC5B4
+qu=\uCF00\uCD94\uC544\uC5B4
+rm=\uB808\uD1A0\uB85C\uB9CC\uC5B4
+rn=\uBC18\uD22C\uC5B4(\uBD80\uB8EC\uB514)
+ro=\uB8E8\uB9C8\uB2C8\uC544\uC5B4
+ru=\uB7EC\uC2DC\uC544\uC5B4
+rw=\uBC18\uD22C\uC5B4(\uB8E8\uC644\uB2E4)
+sa=\uC0B0\uC2A4\uD06C\uB9AC\uD2B8\uC5B4
+sc=\uC0AC\uB974\uB514\uB2C8\uC544\uC5B4
+sd=\uC2E0\uB514\uC5B4
+se=\uBD81\uBD80 \uC0AC\uBBF8\uC5B4
+sg=\uC0B0\uACE0\uC5B4
+si=\uC2E0\uD560\uB77C\uC5B4
+sk=\uC2AC\uB85C\uBC14\uD0A4\uC544\uC5B4
+sl=\uC2AC\uB85C\uBCA0\uB2C8\uC544\uC5B4
+sm=\uC0AC\uBAA8\uC544\uC5B4
+sn=\uC1FC\uB098\uC5B4
+so=\uC18C\uB9D0\uB9AC\uC544\uC5B4
+sq=\uC54C\uBC14\uB2C8\uC544\uC5B4
+sr=\uC138\uB974\uBE44\uC544\uC5B4
+ss=\uC2DC\uC2A4\uC640\uD2F0\uC5B4
+st=\uC138\uC18C\uD1A0\uC5B4
+su=\uC21C\uB2E8\uC5B4
+sv=\uC2A4\uC6E8\uB374\uC5B4
+sw=\uC2A4\uC640\uD790\uB9AC\uC5B4
+ta=\uD0C0\uBC00\uC5B4
+te=\uD154\uB8E8\uAD6C\uC5B4
+tg=\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4\uC5B4
+th=\uD0DC\uAD6D\uC5B4
+ti=\uD2F0\uADF8\uB9AC\uB0D0\uC5B4
+tk=\uD22C\uB974\uD06C\uBA58\uC5B4
+tl=\uD0C0\uAC08\uB85C\uADF8\uC5B4
+tn=\uC138\uCE20\uC640\uB098\uC5B4
+to=\uD1B5\uAC00
+tr=\uD130\uD0A4\uC5B4
+ts=\uD1B5\uAC00\uC5B4
+tt=\uD0C0\uD0C0\uB974\uC5B4
+tw=\uD2B8\uC704\uC5B4
+ty=\uD0C0\uD788\uD2F0\uC548\uC5B4
+ug=\uC704\uAD6C\uB974\uC5B4
+uk=\uC6B0\uD06C\uB77C\uC774\uB098\uC5B4
+ur=\uC6B0\uB974\uB450\uC5B4
+uz=\uC6B0\uC988\uBCA0\uD06C\uC5B4
+ve=\uBCA4\uB2E4\uC5B4
+vi=\uBCA0\uD2B8\uB0A8\uC5B4
+vo=\uBCFC\uB77C\uD4CC\uD06C\uC5B4
+wa=\uC648\uB8EC\uC5B4
+wo=\uC62C\uB85C\uD504\uC5B4
+xh=\uBC18\uD22C\uC5B4(\uB0A8\uC544\uD504\uB9AC\uCE74)
+yi=\uC774\uB514\uC2DC\uC5B4
+yo=\uC694\uB8E8\uBC14\uC5B4
+za=\uC8FC\uC559\uC5B4
+zh=\uC911\uAD6D\uC5B4
+zu=\uC904\uB8E8\uC5B4
 
 # key is ISO 639.2 language code
 aar=\uC544\uD30C\uB974\uC5B4
@@ -540,7 +541,7 @@
 nic=\uB2C8\uCE74\uB77C\uACFC \uCF54\uB974\uB3C4\uBC14
 niu=\uB2C8\uC6E8\uC5B8\uC5B4
 nno=\uB178\uB974\uC6E8\uC774\uC5B4(\uB2C8\uB178\uB974\uC2A4\uD06C)
-nob=\uB178\uB974\uC6E8\uC774\uC5B4(\uBD81\uBAB0)
+nob=\uB178\uB974\uC6E8\uC774\uC5B4(\uBCF5\uB9D0)
 nog=\uB178\uAC00\uC774\uC5B4
 non=\uB178\uB974\uC6E8\uC774, \uACE0\uB300
 nor=\uB178\uB974\uC6E8\uC774\uC5B4
@@ -867,256 +868,256 @@
 # country names
 # key is ISO 3166 country code
 
-AD=\uc548\ub3c4\ub77c
-AE=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8
-AF=\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4
-AG=\uc564\ud2f0\uac00 \ubc14\ubd80\ub2e4
-AI=\uc548\uae38\ub77c
-AL=\uc54c\ubc14\ub2c8\uc544
-AM=\uc544\ub974\uba54\ub2c8\uc544
-AN=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4
-AO=\uc559\uace8\ub77c
-AQ=\ub0a8\uadf9
-AR=\uc544\ub974\ud5e8\ud2f0\ub098
-AS=\ubbf8\uad6d\ub839 \uc0ac\ubaa8\uc544
-AT=\uc624\uc2a4\ud2b8\ub9ac\uc544
-AU=\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544
-AW=\uc544\ub8e8\ubc14
-AX=\uc62c\ub780\ub4dc \uc81c\ub3c4
-AZ=\uc544\uc81c\ub974\ubc14\uc774\uc794
-BA=\ubcf4\uc2a4\ub2c8\uc544 \ud5e4\ub974\uccb4\uace0\ube44\ub098
-BB=\ubc14\ubca0\uc774\ub3c4\uc2a4
-BD=\ubc29\uae00\ub77c\ub370\uc2dc
-BE=\ubca8\uae30\uc5d0
-BF=\ubd80\ub974\ud0a4\ub098\ud30c\uc18c
-BG=\ubd88\uac00\ub9ac\uc544
-BH=\ubc14\ub808\uc778
-BI=\ubd80\ub8ec\ub514
-BJ=\ubca0\ub139
+AD=\uC548\uB3C4\uB77C
+AE=\uC544\uB78D\uC5D0\uBBF8\uB9AC\uD2B8
+AF=\uC544\uD504\uAC00\uB2C8\uC2A4\uD0C4
+AG=\uC564\uD2F0\uAC00 \uBC14\uBD80\uB2E4
+AI=\uC548\uAE38\uB77C
+AL=\uC54C\uBC14\uB2C8\uC544
+AM=\uC544\uB974\uBA54\uB2C8\uC544
+AN=\uB124\uB35C\uB780\uB4DC\uB839 \uC564\uD2F8\uB9AC\uC2A4
+AO=\uC559\uACE8\uB77C
+AQ=\uB0A8\uADF9
+AR=\uC544\uB974\uD5E8\uD2F0\uB098
+AS=\uBBF8\uAD6D\uB839 \uC0AC\uBAA8\uC544
+AT=\uC624\uC2A4\uD2B8\uB9AC\uC544
+AU=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544
+AW=\uC544\uB8E8\uBC14
+AX=\uC62C\uB780\uB4DC \uC81C\uB3C4
+AZ=\uC544\uC81C\uB974\uBC14\uC774\uC794
+BA=\uBCF4\uC2A4\uB2C8\uC544 \uD5E4\uB974\uCCB4\uACE0\uBE44\uB098
+BB=\uBC14\uBCA0\uC774\uB3C4\uC2A4
+BD=\uBC29\uAE00\uB77C\uB370\uC2DC
+BE=\uBCA8\uAE30\uC5D0
+BF=\uBD80\uB974\uD0A4\uB098\uD30C\uC18C
+BG=\uBD88\uAC00\uB9AC\uC544
+BH=\uBC14\uB808\uC778
+BI=\uBD80\uB8EC\uB514
+BJ=\uBCA0\uB139
 BL=\uC0DD \uBC14\uB974\uD154\uB808\uBBF8
-BM=\ubc84\ubba4\ub2e4
-BN=\ube0c\ub8e8\ub098\uc774
-BO=\ubcfc\ub9ac\ube44\uc544
+BM=\uBC84\uBBA4\uB2E4
+BN=\uBE0C\uB8E8\uB098\uC774
+BO=\uBCFC\uB9AC\uBE44\uC544
 BQ=\uBCF4\uB124\uB974, \uC2E0\uD2B8\uC720\uC2A4\uD0C0\uD2F0\uC6B0\uC2A4, \uC0AC\uBC14 \uC81C\uB3C4
-BR=\ube0c\ub77c\uc9c8
-BS=\ubc14\ud558\ub9c8
-BT=\ubd80\ud0c4
-BV=\ubd80\ubca0\uc774 \uc12c
-BW=\ubcf4\uce20\uc640\ub098
-BY=\ubca8\ub77c\ub8e8\uc2a4
-BZ=\ubca8\ub9ac\uc988
-CA=\uce90\ub098\ub2e4
-CC=\ucf54\ucf54\uc2a4 \uad70\ub3c4
-CD=\ucf69\uace0 \ubbfc\uc8fc \uacf5\ud654\uad6d
-CF=\uc911\uc559 \uc544\ud504\ub9ac\uce74
-CG=\ucf69\uace0
-CH=\uc2a4\uc704\uc2a4
-CI=\ucf54\ud2b8\ub514\ubd80\uc640\ub974
-CK=\ucfe1 \uc81c\ub3c4
-CL=\uce60\ub808
-CM=\uce74\uba54\ub8ec
-CN=\uc911\uad6d
-CO=\ucf5c\ub86c\ube44\uc544
-CR=\ucf54\uc2a4\ud0c0\ub9ac\uce74
-CS=\uc138\ub974\ube44\uc544 \ubaac\ud14c\ub124\uadf8\ub85c(\uc720\uace0\uc2ac\ub77c\ube44\uc544)
-CU=\ucfe0\ubc14
-CV=\uae4c\ubf40\ubca0\ub974\ub370
+BR=\uBE0C\uB77C\uC9C8
+BS=\uBC14\uD558\uB9C8
+BT=\uBD80\uD0C4
+BV=\uBD80\uBCA0\uC774 \uC12C
+BW=\uBCF4\uCE20\uC640\uB098
+BY=\uBCA8\uB77C\uB8E8\uC2A4
+BZ=\uBCA8\uB9AC\uC988
+CA=\uCE90\uB098\uB2E4
+CC=\uCF54\uCF54\uC2A4 \uAD70\uB3C4
+CD=\uCF69\uACE0 \uBBFC\uC8FC \uACF5\uD654\uAD6D
+CF=\uC911\uC559 \uC544\uD504\uB9AC\uCE74
+CG=\uCF69\uACE0
+CH=\uC2A4\uC704\uC2A4
+CI=\uCF54\uD2B8\uB514\uBD80\uC544\uB974
+CK=\uCFE1 \uC81C\uB3C4
+CL=\uCE60\uB808
+CM=\uCE74\uBA54\uB8EC
+CN=\uC911\uAD6D
+CO=\uCF5C\uB86C\uBE44\uC544
+CR=\uCF54\uC2A4\uD0C0\uB9AC\uCE74
+CS=\uC138\uB974\uBE44\uC544 \uBAAC\uD14C\uB124\uADF8\uB85C(\uC720\uACE0\uC2AC\uB77C\uBE44\uC544)
+CU=\uCFE0\uBC14
+CV=\uAE4C\uBF40\uBCA0\uB974\uB370
 CW=\uD034\uB77C\uC18C
-CX=\ud06c\ub9ac\uc2a4\ub9c8\uc2a4 \uc12c
-CY=\uc0ac\uc774\ud504\ub7ec\uc2a4
-CZ=\uccb4\ucf54
-DE=\ub3c5\uc77c
-DJ=\uc9c0\ubd80\ud2f0
-DK=\ub374\ub9c8\ud06c
-DM=\ub3c4\ubbf8\ub2c8\uce74
-DO=\ub3c4\ubbf8\ub2c8\uce74 \uacf5\ud654\uad6d
-DZ=\uc54c\uc81c\ub9ac
-EC=\uc5d0\ucfe0\uc544\ub3c4\ub974
-EE=\uc5d0\uc2a4\ud1a0\ub2c8\uc544
-EG=\uc774\uc9d1\ud2b8
-EH=\uc11c\uc0ac\ud558\ub77c
-ER=\uc5d0\ub9ac\ud2b8\ub9ac\uc544
-ES=\uc2a4\ud398\uc778
-ET=\uc774\ub514\uc624\ud53c\uc544
-FI=\ud540\ub780\ub4dc
-FJ=\ud53c\uc9c0
-FK=\ud3ec\ud074\ub79c\ub4dc \uc81c\ub3c4
-FM=\ub9c8\uc774\ud06c\ub85c\ub124\uc2dc\uc544
-FO=\ud398\ub85c \uc81c\ub3c4
-FR=\ud504\ub791\uc2a4
-GA=\uac00\ubd09
-GB=\uc601\uad6d
-GD=\uadf8\ub808\ub098\ub2e4
-GE=\uadf8\ub8e8\uc9c0\uc57c
-GF=\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098
+CX=\uD06C\uB9AC\uC2A4\uB9C8\uC2A4 \uC12C
+CY=\uC0AC\uC774\uD504\uB7EC\uC2A4
+CZ=\uCCB4\uCF54
+DE=\uB3C5\uC77C
+DJ=\uC9C0\uBD80\uD2F0
+DK=\uB374\uB9C8\uD06C
+DM=\uB3C4\uBBF8\uB2C8\uCE74
+DO=\uB3C4\uBBF8\uB2C8\uCE74 \uACF5\uD654\uAD6D
+DZ=\uC54C\uC81C\uB9AC
+EC=\uC5D0\uCFE0\uC544\uB3C4\uB974
+EE=\uC5D0\uC2A4\uD1A0\uB2C8\uC544
+EG=\uC774\uC9D1\uD2B8
+EH=\uC11C\uC0AC\uD558\uB77C
+ER=\uC5D0\uB9AC\uD2B8\uB9AC\uC544
+ES=\uC2A4\uD398\uC778
+ET=\uC774\uB514\uC624\uD53C\uC544
+FI=\uD540\uB780\uB4DC
+FJ=\uD53C\uC9C0
+FK=\uD3EC\uD074\uB79C\uB4DC \uC81C\uB3C4
+FM=\uB9C8\uC774\uD06C\uB85C\uB124\uC2DC\uC544
+FO=\uD398\uB85C \uC81C\uB3C4
+FR=\uD504\uB791\uC2A4
+GA=\uAC00\uBD09
+GB=\uC601\uAD6D
+GD=\uADF8\uB808\uB098\uB2E4
+GE=\uADF8\uB8E8\uC9C0\uC57C
+GF=\uD504\uB791\uC2A4\uB839 \uAE30\uC544\uB098
 GG=\uAC74\uC9C0
-GH=\uac00\ub098
-GI=\uc9c0\ube0c\ub864\ud130
-GL=\uadf8\ub9b0\ub79c\ub4dc
-GM=\uac10\ube44\uc544
-GN=\uae30\ub2c8
-GP=\uacfc\ub2ec\ub85c\ud504
-GQ=\uc801\ub3c4 \uae30\ub2c8
-GR=\uadf8\ub9ac\uc2a4
-GS=\uc0ac\uc6b0\uc2a4 \uc870\uc9c0\uc544 \ubc0f \uc0ac\uc6b0\uc2a4 \uc0cc\ub4dc\uc704\uce58 \uc81c\ub3c4
-GT=\uacfc\ud14c\ub9d0\ub77c
-GU=\uad0c
-GW=\uae30\ub124\ube44\uc3d8
-GY=\uac00\uc774\uc544\ub098
-HK=\ud64d\ucf69
-HM=\ud5c8\ub4dc \uc12c \ubc0f \ub9e5\ub3c4\ub110\ub4dc \uc81c\ub3c4
-HN=\uc628\ub450\ub77c\uc2a4
-HR=\ud06c\ub85c\uc544\ud2f0\uc544
-HT=\ud558\uc774\ud2f0
-HU=\ud5dd\uac00\ub9ac
-ID=\uc778\ub3c4\ub124\uc2dc\uc544
-IE=\uc544\uc77c\ub79c\ub4dc
-IL=\uc774\uc2a4\ub77c\uc5d8
+GH=\uAC00\uB098
+GI=\uC9C0\uBE0C\uB864\uD130
+GL=\uADF8\uB9B0\uB79C\uB4DC
+GM=\uAC10\uBE44\uC544
+GN=\uAE30\uB2C8
+GP=\uACFC\uB2EC\uB85C\uD504
+GQ=\uC801\uB3C4 \uAE30\uB2C8
+GR=\uADF8\uB9AC\uC2A4
+GS=\uC0AC\uC6B0\uC2A4 \uC870\uC9C0\uC544 \uBC0F \uC0AC\uC6B0\uC2A4 \uC0CC\uB4DC\uC704\uCE58 \uC81C\uB3C4
+GT=\uACFC\uD14C\uB9D0\uB77C
+GU=\uAD0C
+GW=\uAE30\uB124\uBE44\uC3D8
+GY=\uAC00\uC774\uC544\uB098
+HK=\uD64D\uCF69
+HM=\uD5C8\uB4DC \uC12C \uBC0F \uB9E5\uB3C4\uB110\uB4DC \uC81C\uB3C4
+HN=\uC628\uB450\uB77C\uC2A4
+HR=\uD06C\uB85C\uC544\uD2F0\uC544
+HT=\uD558\uC774\uD2F0
+HU=\uD5DD\uAC00\uB9AC
+ID=\uC778\uB3C4\uB124\uC2DC\uC544
+IE=\uC544\uC77C\uB79C\uB4DC
+IL=\uC774\uC2A4\uB77C\uC5D8
 IM=\uB9E8 \uC12C
-IN=\uc778\ub3c4
-IO=\uc601\uc778\ub3c4 \uc81c\ub3c4
-IQ=\uc774\ub77c\ud06c
-IR=\uc774\ub780
-IS=\uc544\uc774\uc2ac\ub780\ub4dc
-IT=\uc774\ud0c8\ub9ac\uc544
+IN=\uC778\uB3C4
+IO=\uC601\uC778\uB3C4 \uC81C\uB3C4
+IQ=\uC774\uB77C\uD06C
+IR=\uC774\uB780
+IS=\uC544\uC774\uC2AC\uB780\uB4DC
+IT=\uC774\uD0C8\uB9AC\uC544
 JE=\uC800\uC9C0
-JM=\uc790\uba54\uc774\uce74
-JO=\uc694\ub974\ub2e8
-JP=\uc77c\ubcf8
-KE=\ucf00\ub0d0
-KG=\ud0a4\ub974\uae30\uc2a4\uc2a4\ud0c4
-KH=\uce84\ubcf4\ub514\uc544
-KI=\ud0a4\ub9ac\ubc14\uc2dc
-KM=\ucf54\ubaa8\ub974
-KN=\uc138\uc778\ud2b8 \ud06c\ub9ac\uc2a4\ud1a0\ud37c \ub2c8\ube44\uc2a4
-KP=\ubd81\ud55c
-KR=\ub300\ud55c\ubbfc\uad6d
-KW=\ucfe0\uc6e8\uc774\ud2b8
-KY=\ucf00\uc774\ub9e8 \uc81c\ub3c4
-KZ=\uce74\uc790\ud750\uc2a4\ud0c4
-LA=\ub77c\uc624\uc2a4
-LB=\ub808\ubc14\ub17c
-LC=\uc138\uc778\ud2b8 \ub8e8\uc2dc\uc544
-LI=\ub9ac\ud788\ud150\uc288\ud0c0\uc778
-LK=\uc2a4\ub9ac\ub791\uce74
-LR=\ub77c\uc774\ubca0\ub9ac\uc544
-LS=\ub808\uc18c\ud1a0
-LT=\ub9ac\ud22c\uc544\ub2c8\uc544
-LU=\ub8e9\uc148\ubd80\ub974\ud06c
-LV=\ub77c\ud2b8\ube44\uc544
-LY=\ub9ac\ube44\uc544
-MA=\ubaa8\ub85c\ucf54
-MC=\ubaa8\ub098\ucf54
-MD=\ubab0\ub3c4\ubc14
-ME=\ubaac\ud14c\ub124\uadf8\ub85c
+JM=\uC790\uBA54\uC774\uCE74
+JO=\uC694\uB974\uB2E8
+JP=\uC77C\uBCF8
+KE=\uCF00\uB0D0
+KG=\uD0A4\uB974\uAE30\uC2A4\uC2A4\uD0C4
+KH=\uCE84\uBCF4\uB514\uC544
+KI=\uD0A4\uB9AC\uBC14\uC2DC
+KM=\uCF54\uBAA8\uB974
+KN=\uC138\uC778\uD2B8 \uD06C\uB9AC\uC2A4\uD1A0\uD37C \uB2C8\uBE44\uC2A4
+KP=\uBD81\uD55C
+KR=\uB300\uD55C\uBBFC\uAD6D
+KW=\uCFE0\uC6E8\uC774\uD2B8
+KY=\uCF00\uC774\uB9E8 \uC81C\uB3C4
+KZ=\uCE74\uC790\uD750\uC2A4\uD0C4
+LA=\uB77C\uC624\uC2A4
+LB=\uB808\uBC14\uB17C
+LC=\uC138\uC778\uD2B8 \uB8E8\uC2DC\uC544
+LI=\uB9AC\uD788\uD150\uC288\uD0C0\uC778
+LK=\uC2A4\uB9AC\uB791\uCE74
+LR=\uB77C\uC774\uBCA0\uB9AC\uC544
+LS=\uB808\uC18C\uD1A0
+LT=\uB9AC\uD22C\uC544\uB2C8\uC544
+LU=\uB8E9\uC148\uBD80\uB974\uD06C
+LV=\uB77C\uD2B8\uBE44\uC544
+LY=\uB9AC\uBE44\uC544
+MA=\uBAA8\uB85C\uCF54
+MC=\uBAA8\uB098\uCF54
+MD=\uBAB0\uB3C4\uBC14
+ME=\uBAAC\uD14C\uB124\uADF8\uB85C
 MF=\uC0DD \uB9C8\uB974\uD0F1
-MG=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974
-MH=\ub9c8\uc15c \uc81c\ub3c4
-MK=\ub9c8\ucf00\ub3c4\ub2c8\uc544\uc5b4
-ML=\ub9d0\ub9ac
-MM=\ubbf8\uc580\ub9c8
-MN=\ubabd\uace8
-MO=\ub9c8\uce74\uc624
-MP=\ubd81\ub9c8\ub9ac\uc544\ub098 \uc81c\ub3c4
-MQ=\ub9d0\ud2f0\ub2c8\ud06c
-MR=\ubaa8\ub9ac\ud0c0\ub2c8
-MS=\ubaac\ud2b8\uc138\ub77c\ud2b8
-MT=\ubab0\ud0c0
-MU=\ubaa8\ub9ac\uc154\uc2a4
-MV=\ubab0\ub514\ube0c
-MW=\ub9d0\ub77c\uc704
-MX=\uba55\uc2dc\ucf54
-MY=\ub9d0\ub808\uc774\uc9c0\uc544
-MZ=\ubaa8\uc7a0\ube44\ud06c
-NA=\ub098\ubbf8\ube44\uc544
-NC=\ub274 \uce7c\ub808\ub3c4\ub2c8\uc544
-NE=\ub2c8\uc81c\ub974
-NF=\ub178\ud37d \uc12c
-NG=\ub098\uc774\uc9c0\ub9ac\uc544
-NI=\ub2c8\uce74\ub77c\uacfc
-NL=\ub124\ub35c\ub780\ub4dc
-NO=\ub178\ub974\uc6e8\uc774
-NP=\ub124\ud314
-NR=\ub098\uc6b0\ub8e8
-NU=\ub2c8\uc6b0\uc5d0
-NZ=\ub274\uc9c8\ub79c\ub4dc
-OM=\uc624\ub9cc
-PA=\ud30c\ub098\ub9c8
-PE=\ud398\ub8e8
-PF=\ud504\ub791\uc2a4\ub839 \ud3f4\ub9ac\ub124\uc2dc\uc544
-PG=\ud30c\ud478\uc544\ub274\uae30\ub2c8
-PH=\ud544\ub9ac\ud540
-PK=\ud30c\ud0a4\uc2a4\ud0c4
-PL=\ud3f4\ub780\ub4dc
-PM=\uc138\uc778\ud2b8 \ud53c\uc5d0\ub974 \ubbf8\ucf08\ub860
-PN=\ud54f\ucf00\uc5b8 \uc81c\ub3c4
-PR=\ud478\uc5d0\ub974\ud1a0\ub9ac\ucf54
-PS=\ud314\ub808\uc2a4\ud0c0\uc778
-PT=\ud3ec\ub974\ud2b8\uce7c
-PW=\ud314\ub77c\uc6b0
-PY=\ud30c\ub77c\uacfc\uc774
-QA=\uce74\ud0c0\ub974
-RE=\ub9ac\uc720\ub2c8\uc5b8
-RO=\ub8e8\ub9c8\ub2c8\uc544
-RS=\uc138\ub974\ube44\uc544
-RU=\ub7ec\uc2dc\uc544
-RW=\ub974\uc644\ub2e4
-SA=\uc0ac\uc6b0\ub514\uc544\ub77c\ube44\uc544
-SB=\uc194\ub85c\ubaac \uc81c\ub3c4
-SC=\uc250\uc774\uc258
-SD=\uc218\ub2e8
-SE=\uc2a4\uc6e8\ub374
-SG=\uc2f1\uac00\ud3ec\ub974
-SH=\uc138\uc778\ud2b8 \ud5ec\ub808\ub098
-SI=\uc2ac\ub85c\ubca0\ub2c8\uc544
-SJ=\uc2a4\ubc1c\ubc14\ub974 \ubc0f \uc580\ub9c8\uc6ec
-SK=\uc2ac\ub85c\ubc14\ud0a4\uc544
-SL=\uc2dc\uc5d0\ub77c\ub9ac\uc628
-SM=\uc0b0\ub9c8\ub9ac\ub178
-SN=\uc138\ub124\uac08
-SO=\uc18c\ub9d0\ub9ac\uc544
-SR=\uc218\ub9ac\ub0a8
-ST=\uc0c1\ud22c\uba54 \ud504\ub9b0\uc2dc\ud398
-SV=\uc5d8\uc0b4\ubc14\ub3c4\ub974
+MG=\uB9C8\uB2E4\uAC00\uC2A4\uCE74\uB974
+MH=\uB9C8\uC15C \uC81C\uB3C4
+MK=\uB9C8\uCF00\uB3C4\uB2C8\uC544
+ML=\uB9D0\uB9AC
+MM=\uBBF8\uC580\uB9C8
+MN=\uBABD\uACE8
+MO=\uB9C8\uCE74\uC624
+MP=\uBD81\uB9C8\uB9AC\uC544\uB098 \uC81C\uB3C4
+MQ=\uB9D0\uD2F0\uB2C8\uD06C
+MR=\uBAA8\uB9AC\uD0C0\uB2C8
+MS=\uBAAC\uD2B8\uC138\uB77C\uD2B8
+MT=\uBAB0\uD0C0
+MU=\uBAA8\uB9AC\uC154\uC2A4
+MV=\uBAB0\uB514\uBE0C
+MW=\uB9D0\uB77C\uC704
+MX=\uBA55\uC2DC\uCF54
+MY=\uB9D0\uB808\uC774\uC9C0\uC544
+MZ=\uBAA8\uC7A0\uBE44\uD06C
+NA=\uB098\uBBF8\uBE44\uC544
+NC=\uB274 \uCE7C\uB808\uB3C4\uB2C8\uC544
+NE=\uB2C8\uC81C\uB974
+NF=\uB178\uD37D \uC12C
+NG=\uB098\uC774\uC9C0\uB9AC\uC544
+NI=\uB2C8\uCE74\uB77C\uACFC
+NL=\uB124\uB35C\uB780\uB4DC
+NO=\uB178\uB974\uC6E8\uC774
+NP=\uB124\uD314
+NR=\uB098\uC6B0\uB8E8
+NU=\uB2C8\uC6B0\uC5D0
+NZ=\uB274\uC9C8\uB79C\uB4DC
+OM=\uC624\uB9CC
+PA=\uD30C\uB098\uB9C8
+PE=\uD398\uB8E8
+PF=\uD504\uB791\uC2A4\uB839 \uD3F4\uB9AC\uB124\uC2DC\uC544
+PG=\uD30C\uD478\uC544\uB274\uAE30\uB2C8
+PH=\uD544\uB9AC\uD540
+PK=\uD30C\uD0A4\uC2A4\uD0C4
+PL=\uD3F4\uB780\uB4DC
+PM=\uC138\uC778\uD2B8 \uD53C\uC5D0\uB974 \uBBF8\uCF08\uB860
+PN=\uD54F\uCF00\uC5B8 \uC81C\uB3C4
+PR=\uD478\uC5D0\uB974\uD1A0\uB9AC\uCF54
+PS=\uD314\uB808\uC2A4\uD0C0\uC778
+PT=\uD3EC\uB974\uD22C\uCE7C
+PW=\uD314\uB77C\uC6B0
+PY=\uD30C\uB77C\uACFC\uC774
+QA=\uCE74\uD0C0\uB974
+RE=\uB9AC\uC720\uB2C8\uC5B8
+RO=\uB8E8\uB9C8\uB2C8\uC544
+RS=\uC138\uB974\uBE44\uC544
+RU=\uB7EC\uC2DC\uC544
+RW=\uB974\uC644\uB2E4
+SA=\uC0AC\uC6B0\uB514\uC544\uB77C\uBE44\uC544
+SB=\uC194\uB85C\uBAAC \uC81C\uB3C4
+SC=\uC250\uC774\uC258
+SD=\uC218\uB2E8
+SE=\uC2A4\uC6E8\uB374
+SG=\uC2F1\uAC00\uD3EC\uB974
+SH=\uC138\uC778\uD2B8 \uD5EC\uB808\uB098
+SI=\uC2AC\uB85C\uBCA0\uB2C8\uC544
+SJ=\uC2A4\uBC1C\uBC14\uB974 \uBC0F \uC580\uB9C8\uC6EC
+SK=\uC2AC\uB85C\uBC14\uD0A4\uC544
+SL=\uC2DC\uC5D0\uB77C\uB9AC\uC628
+SM=\uC0B0\uB9C8\uB9AC\uB178
+SN=\uC138\uB124\uAC08
+SO=\uC18C\uB9D0\uB9AC\uC544
+SR=\uC218\uB9AC\uB0A8
+ST=\uC0C1\uD22C\uBA54 \uD504\uB9B0\uC2DC\uD398
+SV=\uC5D8\uC0B4\uBC14\uB3C4\uB974
 SX=\uC2E0\uD2B8\uB9C8\uB974\uD150(\uB124\uB35C\uB780\uB4DC\uB839)
-SY=\uc2dc\ub9ac\uc544
-SZ=\uc2a4\uc640\uc9c8\ub79c\ub4dc
-TC=\ud130\ud06c\uc2a4 \ucf00\uc774\ucee4\uc2a4 \uc81c\ub3c4
-TD=\ucc28\ub4dc
-TF=\ud504\ub791\uc2a4 \ub0a8\ubd80 \uc9c0\ubc29
-TG=\ud1a0\uace0
-TH=\ud0dc\uad6d
-TJ=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4
-TK=\ud1a0\ucf08\ub77c\uc6b0
-TL=\ub3d9\ud2f0\ubaa8\ub974
-TM=\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4
-TN=\ud280\ub2c8\uc9c0
-TO=\ud1b5\uac00
-TR=\ud130\ud0a4
-TT=\ud2b8\ub9ac\ub2c8\ub2e4\ub4dc \ud1a0\ubc14\uace0
-TV=\ud22c\ubc1c\ub8e8
-TW=\ub300\ub9cc
-TZ=\ud0c4\uc790\ub2c8\uc544
-UA=\uc6b0\ud06c\ub77c\uc774\ub098
-UG=\uc6b0\uac04\ub2e4
-UM=\ubbf8\uad6d\ub839 \uad70\ub3c4
-US=\ubbf8\uad6d
-UY=\uc6b0\ub8e8\uacfc\uc774
-UZ=\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4
-VA=\ubc14\ud2f0\uce78
-VC=\uc138\uc778\ud2b8 \ube48\uc13c\ud2b8 \uadf8\ub808\ub098\ub518\uc2a4
-VE=\ubca0\ub124\uc218\uc5d8\ub77c
-VG=\uc601\uad6d\ub839 \ubc84\uc9c4 \uc544\uc77c\ub79c\ub4dc
-VI=\ubbf8\uad6d\ub839 \ubc84\uc9c4 \uc544\uc77c\ub79c\ub4dc
-VN=\ubca0\ud2b8\ub0a8
-VU=\ubc14\ub204\uc544\ud22c
-WF=\uc70c\ub9ac\uc2a4 \ud478\ud22c\ub098
-WS=\uc0ac\ubaa8\uc544
-YE=\uc608\uba58
-YT=\ub9c8\uc694\ud2f0
-ZA=\ub0a8\uc544\ud504\ub9ac\uce74
-ZM=\uc7a0\ube44\uc544
-ZW=\uc9d0\ubc14\ube0c\uc6e8
+SY=\uC2DC\uB9AC\uC544
+SZ=\uC2A4\uC640\uC9C8\uB79C\uB4DC
+TC=\uD130\uD06C\uC2A4 \uCF00\uC774\uCEE4\uC2A4 \uC81C\uB3C4
+TD=\uCC28\uB4DC
+TF=\uD504\uB791\uC2A4 \uB0A8\uBD80 \uC9C0\uBC29
+TG=\uD1A0\uACE0
+TH=\uD0DC\uAD6D
+TJ=\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4
+TK=\uD1A0\uCF08\uB77C\uC6B0\uC81C\uB3C4
+TL=\uB3D9\uD2F0\uBAA8\uB974
+TM=\uD22C\uB974\uD06C\uBA54\uB2C8\uC2A4\uD0C4
+TN=\uD280\uB2C8\uC9C0
+TO=\uD1B5\uAC00
+TR=\uD130\uD0A4
+TT=\uD2B8\uB9AC\uB2C8\uB2E4\uB4DC \uD1A0\uBC14\uACE0
+TV=\uD22C\uBC1C\uB8E8
+TW=\uB300\uB9CC
+TZ=\uD0C4\uC790\uB2C8\uC544
+UA=\uC6B0\uD06C\uB77C\uC774\uB098
+UG=\uC6B0\uAC04\uB2E4
+UM=\uBBF8\uAD6D\uB839 \uAD70\uB3C4
+US=\uBBF8\uAD6D
+UY=\uC6B0\uB8E8\uACFC\uC774
+UZ=\uC6B0\uC988\uBCA0\uD0A4\uC2A4\uD0C4
+VA=\uBC14\uD2F0\uCE78
+VC=\uC138\uC778\uD2B8 \uBE48\uC13C\uD2B8 \uADF8\uB808\uB098\uB518\uC2A4
+VE=\uBCA0\uB124\uC218\uC5D8\uB77C
+VG=\uC601\uAD6D\uB839 \uBC84\uC9C4 \uC544\uC77C\uB79C\uB4DC
+VI=\uBBF8\uAD6D\uB839 \uBC84\uC9C4 \uC544\uC77C\uB79C\uB4DC
+VN=\uBCA0\uD2B8\uB0A8
+VU=\uBC14\uB204\uC544\uD22C
+WF=\uC70C\uB9AC\uC2A4 \uD478\uD22C\uB098
+WS=\uC0AC\uBAA8\uC544
+YE=\uC608\uBA58
+YT=\uB9C8\uC694\uD2F0
+ZA=\uB0A8\uC544\uD504\uB9AC\uCE74
+ZM=\uC7A0\uBE44\uC544
+ZW=\uC9D0\uBC14\uBE0C\uC6E8
 
 # territory names
 # key is UN M.49 country and area code
@@ -1151,3 +1152,19 @@
 154=\uBD81\uC720\uB7FD
 155=\uC11C\uC720\uB7FD
 419=\uB77C\uD2F4 \uC544\uBA54\uB9AC\uCE74 \uBC0F \uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=\uC720\uB85C
+%%B=\uBCF5\uB9D0
+%%NY=\uB2C8\uB178\uB974\uC2A4\uD06C
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties
index d6e391f..ffdf633 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties
@@ -1,54 +1,1170 @@
 #
-# 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.
 #
 
+# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
+# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
 #
-# COPYRIGHT AND PERMISSION NOTICE
+# The original version of this source code and documentation
+# is copyrighted and owned by Taligent, Inc., a wholly-owned
+# subsidiary of IBM. These materials are provided under terms
+# of a License Agreement between Taligent and Sun. This technology
+# is protected by multiple US and International patents.
 #
-# Copyright (C) 1991-2007 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.
-#
-# 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.
-#
- 
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+# This notice and attribution to Taligent may not be removed.
+# Taligent is a registered trademark of Taligent, Inc.
 
-ce=checheno
-ik=inupiaque
-jv=javan\u00eas
-nd=ndebele do norte
-nr=ndebele do sul
-st=soto do sul
-AX=Ilhas Aland
-BA=B\u00f3snia-Herzegovina
+
+# language names
+# key is ISO 639 language code
+
+aa=Afar
+ab=Abcaziano
+ae=Av\u00E9stico
+af=Afric\u00E2ner
+ak=Akan
+am=Am\u00E1rico
+an=Aragon\u00EAs
+ar=\u00C1rabe
+as=Assam\u00EAs
+av=Av\u00E1rico
+ay=Aimara
+az=Azerbaijano
+ba=Bashkir
+be=Bielorrusso
+bg=B\u00FAlgaro
+bh=Biari
+bi=Bislam\u00E1
+bm=Bambara
+bn=Bengali
+bo=Tibetano
+br=Bret\u00E3o
+bs=B\u00F3snio
+ca=Catal\u00E3o
+ce=Checheno
+ch=Chamorro
+co=C\u00F3rsico
+cr=Cree
+cs=Tcheco
+cu=Eslavo Eclesi\u00E1stico
+cv=Chuvash
+cy=Gal\u00EAs
+da=Dinamarqu\u00EAs
+de=Alem\u00E3o
+dv=Divehi
+dz=Dzonga
+ee=Eve
+el=Grego
+en=Ingl\u00EAs
+eo=Esperanto
+es=Espanhol
+et=Estoniano
+eu=Basco
+fa=Persa
+ff=Fula
+fi=Finland\u00EAs
+fj=Fijiano
+fo=Fero\u00EAs
+fr=Franc\u00EAs
+fy=Fr\u00EDsio
+ga=Irland\u00EAs
+gd=Ga\u00E9lico Escoc\u00EAs
+gl=Galego
+gn=Guarani
+gu=Guzerate
+gv=Manx
+ha=Hau\u00E7\u00E1
+he=Hebraico
+hi=H\u00EDndi
+ho=Hiri Motu
+hr=Croata
+ht=Haitiano
+hu=H\u00FAngaro
+hy=Arm\u00EAnio
+hz=Herero
+ia=Interl\u00EDngua
+id=Indon\u00E9sio
+ie=Interlingue
+ig=Ibo
+ii=Sichuan Yi
+ik=Inupiaque
+in=Indon\u00E9sio
+io=Ido
+is=Island\u00EAs
+it=Italiano
+iu=Inuktitut
+iw=Hebraico
+ja=Japon\u00EAs
+ji=\u00CDdiche
+jv=Javan\u00EAs
+ka=Georgiano
+kg=Congol\u00EAs
+ki=Quicuio
+kj=Kuanyama
+kk=Cazaque
+kl=Groenland\u00EAs
+km=Khmer
+kn=Kannada
+ko=Coreano
+kr=Can\u00FAri
+ks=Caxemir
+ku=Curdo
+kv=Komi
+kw=C\u00F3rnico
+ky=Quirguiz
+la=Latim
+lb=Luxemburgu\u00EAs
+lg=Ganda
+li=Limburgish
+ln=Lingala
+lo=Laosiano
+lt=Lituano
+lu=Luba-Catanga
+lv=Let\u00E3o
+mg=Malgaxe
+mh=Marshall\u00EAs
+mi=Maori
+mk=Maced\u00F4nio
+ml=Malaiala
+mn=Mongol
+mo=Mold\u00E1vio
+mr=Marata
+ms=Malaio
+mt=Malt\u00EAs
+my=Birman\u00EAs
+na=Nauruano
+nb=Bokm\u00E5l Noruegu\u00EAs
+nd=Ndebele do Norte
+ne=Nepali
+ng=Dongo
+nl=Holand\u00EAs
+nn=Nynorsk Noruegu\u00EAs
+no=Noruegu\u00EAs
+nr=Ndebele do Sul
+nv=Navajo
+ny=Nianja; Chicheua; Cheua
+oc=occit\u00E2nico
+oj=Ojibwa
+om=Oromo
+or=Oriya
+os=Osseta
+pa=Panjabi
+pi=Pali
+pl=Polon\u00EAs
+ps=Pashto (Pushto)
+pt=Portugu\u00EAs
+qu=Qu\u00EDchua
+rm=Reto-Romano
+rn=Rundi
+ro=Romeno
+ru=Russo
+rw=Kinyarwanda
+sa=S\u00E2nscrito
+sc=Sardo
+sd=Sindi
+se=Sami do Norte
+sg=Sango
+si=Cingal\u00EAs
+sk=Eslovaco
+sl=Eslov\u00EAnio
+sm=Samoano
+sn=Shona
+so=Somali
+sq=Alban\u00EAs
+sr=S\u00E9rvio
+ss=Swati
+st=Soto do Sul
+su=Sundan\u00EAs
+sv=Sueco
+sw=Sua\u00EDli
+ta=T\u00E2mil
+te=Telugu
+tg=Tadjique
+th=Tailand\u00EAs
+ti=Tigr\u00EDnia
+tk=Turcomano
+tl=Tagalo
+tn=Tswana
+to=Reino de Tonga
+tr=Turco
+ts=Tsonga
+tt=Tatar
+tw=Twi
+ty=Taitiano
+ug=Uighur
+uk=Ucraniano
+ur=Urdu
+uz=Usbeque
+ve=Venda
+vi=Vietnamita
+vo=Volap\u00FCk
+wa=Walloon
+wo=Uolofe
+xh=Xosa
+yi=\u00CDdiche
+yo=Ioruba
+za=Zhuang
+zh=Chin\u00EAs
+zu=Zulu
+
+# key is ISO 639.2 language code
+aar=Afar
+abk=Abcaziano
+ace=Ach\u00E9m
+ach=Acoli
+ada=Adangme
+ady=Adigue
+afa=Afro-Asi\u00E1tico
+afh=Afrihili
+afr=Afric\u00E2ner
+ain=Ainu
+aka=Akan
+akk=Acadiano
+alb=Alban\u00EAs
+ale=Ale\u00FAte
+alg=Idioma Algonquiano
+alt=Altai do Sul
+amh=Am\u00E1rico
+ang=Ingl\u00EAs Antigo (aprox.450-1100)
+anp=Angika
+apa=Idioma Apache
+ara=\u00C1rabe
+arc=Aramaico Oficial (700-300 BCE)
+arg=Aragon\u00EAs
+arm=Arm\u00EAnio
+arn=Mapudungun
+arp=Arapaho
+art=Idioma Artificial
+arw=Arauaqui
+asm=Assam\u00EAs
+ast=Asturiano
+ath=Idioma Atabascano
+aus=Idioma Australiano
+ava=Av\u00E1rico
+ave=Av\u00E9stico
+awa=Awadhi
+aym=Aimara
+aze=Azerbaijano
+bad=Banda
+bai=Idioma Bamileke
+bak=Bashkir
+bal=Bal\u00FAchi
+bam=Bambara
+ban=Balin\u00EAs
+baq=Basco
+bas=Basa
+bat=Idioma B\u00E1ltico
+bej=Beja
+bel=Bielorrusso
+bem=Bemba
+ben=Bengali
+ber=Berbere
+bho=Bhojpuri
+bih=Biari
+bik=Bikol
+bin=Bini
+bis=Bislam\u00E1
+bla=Siksika
+bnt=Banto
+bos=B\u00F3snio
+bra=Braj
+bre=Bret\u00E3o
+btk=Bataque
+bua=Buriata
+bug=Buguin\u00EAs
+bul=B\u00FAlgaro
+bur=Birman\u00EAs
+byn=Blin
+cad=Caddo
+cai=Idioma Ind\u00EDgena Centro-Americano
+car=Galibi Carib
+cat=Catal\u00E3o
+cau=Idioma Cauc\u00E1sico
+ceb=Cebuano
+cel=Idioma Celta
+cha=Chamorro
+chb=Chibcha
+che=Checheno
+chg=Chagatai
+chi=Chin\u00EAs
+chk=Chuukese
+chm=Mari
+chn=Jarg\u00E3o Chinuke
+cho=Choctaw
+chp=Chipewyan
+chr=Cherokee
+chu=Eslavo Eclesi\u00E1stico
+chv=Chuvash
+chy=Cheiene
+cmc=Idioma Chamic
+cop=C\u00F3ptico
+cor=C\u00F3rnico
+cos=C\u00F3rsico
+cpe=Crioulo ou Pidgin Baseado no Ingl\u00EAs
+cpf=Crioulo ou Pidgin Baseado no Franc\u00EAs
+cpp=Crioulo ou Pidgin Baseado no Portugu\u00EAs
+cre=Cree
+crh=Turco da Crimeia
+crp=Crioulo ou Pidgin
+csb=Kashubian
+cus=Idioma Cuch\u00EDtico
+cze=Tcheco
+dak=Dacota
+dan=Dinamarqu\u00EAs
+dar=Dargwa
+day=Dayak
+del=Delaware
+den=Slavey (Athapascano)
+dgr=Dogrib
+din=Dinka
+div=Divehi
+doi=Dogri
+dra=Idioma Dravidiano
+dsb=S\u00E9rvio Baixo
+dua=Duala
+dum=Holand\u00EAs M\u00E9dio (aprox. 1050-1350)
+dut=Holand\u00EAs
+dyu=Di\u00FAla
+dzo=Dzonga
+efi=Efique
+egy=Eg\u00EDpcio Arcaico
+eka=Ekajuk
+elx=Elamita
+eng=Ingl\u00EAs
+enm=Ingl\u00EAs M\u00E9dio (1100-1500)
+epo=Esperanto
+est=Estoniano
+ewe=Eve
+ewo=Ewondo
+fan=Fangue
+fao=Fero\u00EAs
+fat=Fanti
+fij=Fijiano
+fil=Filipino
+fin=Finland\u00EAs
+fiu=Idioma Fino-\u00DAgrico
+fon=Fom
+fre=Franc\u00EAs
+frm=Franc\u00EAs M\u00E9dio (aprox. 1400-1600)
+fro=Franc\u00EAs Arcaico (842- aprox.1400)
+frr=Fr\u00EDsio Setentrional
+frs=Fr\u00EDsio Oriental
+fry=Fr\u00EDsio Ocidental
+ful=Fula
+fur=Friuliano
+gaa=Ga
+gay=Gayo
+gba=Gbaia
+gem=Idioma Germ\u00E2nico
+geo=Georgiano
+ger=Alem\u00E3o
+gez=Geez
+gil=Gilbert\u00EAs
+gla=Ga\u00E9lico
+gle=Irland\u00EAs
+glg=Gal\u00EDcio
+glv=Manx
+gmh=Alem\u00E3o M\u00E9dio-Alto (aprox. 1050-1500)
+goh=Alem\u00E3o Arcaico Alto (aprox. 750-1050)
+gon=Gondi
+gor=Gorontalo
+got=G\u00F3tico
+grb=Grebo
+grc=Grego Arcaico (at\u00E9 1453)
+gre=Grego Moderno (1453-)
+grn=Guarani
+gsw=Alem\u00E3o Su\u00ED\u00E7o
+guj=Guzerate
+gwi=Gwich'in
+hai=Haida
+hat=Haitiano
+hau=Hau\u00E7\u00E1
+haw=Havaiano
+heb=Hebraico
+her=Herero
+hil=Hiligaynon
+him=Himachali
+hin=H\u00EDndi
+hit=Hitita
+hmn=Hmong
+hmo=Hiri Motu
+hrv=Croata
+hsb=Sor\u00E1bio Superior
+hun=H\u00FAngaro
+hup=Hupa
+iba=Iban
+ibo=Ibo
+ice=Island\u00EAs
+ido=Ido
+iii=Sichuan Yi
+ijo=Ijo
+iku=Inuktitut
+ile=Interlingue
+ilo=Ilocano
+ina=Interlingua (Associa\u00E7\u00E3o Internacional de Idiomas Auxiliares)
+inc=Idioma \u00CDndico
+ind=Indon\u00E9sio
+ine=Idioma Indo-Europeu
+inh=Inguche
+ipk=Inupiaque
+ira=Iraniano
+iro=Idioma Iroqu\u00EAs
+ita=Italiano
+jav=Javan\u00EAs
+jbo=Lojban
+jpn=Japon\u00EAs
+jpr=Judaico-Persa
+jrb=Judaico-Ar\u00E1bico
+kaa=Kara-Kalpak
+kab=Kabyle
+kac=Kachin
+kal=Kalaallisut
+kam=Kamba
+kan=Kannada
+kar=Karen
+kas=Caxemir
+kau=Can\u00FAri
+kaw=Kawi
+kaz=Cazaque
+kbd=Kabardiano
+kha=Khasi
+khi=Idioma Cois\u00E3
+khm=Khmer Central
+kho=Khotan\u00EAs
+kik=Quicuio
+kin=Kinyarwanda
+kir=Quirguiz
+kmb=Quimbundo
+kok=Concani
+kom=Komi
+kon=Congol\u00EAs
+kor=Coreano
+kos=Kosraeano
+kpe=Kpelle
+krc=Karachay-Balkar
+krl=Idioma Car\u00E9lio
+kro=Kru
+kru=Kurukh
+kua=Cuanhama
+kum=Kumyk
+kur=Curdo
+kut=Kutenai
+lad=Ladino
+lah=Lahnda
+lam=Lamba
+lao=Laosiano
+lat=Latim
+lav=Let\u00E3o
+lez=Lezgui
+lim=Limburgu\u00EAs
+lin=Lingala
+lit=Lituano
+lol=Mongo
+loz=Lozi
+ltz=Luxemburgu\u00EAs
+lua=Luba-Lulua
+lub=Luba-Catanga
+lug=Ganda
+lui=Luiseno
+lun=Lunda
+luo=Luo (Qu\u00EAnia e Tanz\u00E2nia)
+lus=lushai
+mac=Maced\u00F4nio
+mad=Madur\u00EAs
+mag=Magahi
+mah=Marshall\u00EAs
+mai=Maithili
+mak=Makasar
+mal=Malaiala
+man=Mandinga
+mao=Maori
+map=Austron\u00E9sio
+mar=Marata
+mas=Massai
+may=Malaio
+mdf=Mocsa
+mdr=Mandar
+men=Mende
+mga=Irland\u00EAs M\u00E9dio (900-1200)
+mic=Miquemaque
+min=Minangkabau
+mis=Idiomas Diversos
+mkh=Idioma Mon-Khmer
+mlg=Malgaxe
+mlt=Malt\u00EAs
+mnc=Manchu
+mni=Manipuri
+mno=Idioma Manobo
+moh=Mohawk
+mon=Mongol
+mos=Mossi
+mul=Idiomas M\u00FAltiplos
+mun=Idiomas Munda
+mus=Creek
+mwl=Mirand\u00EAs
+mwr=Marwari
+myn=Maia
+myv=Erzya
+nah=N\u00E1uatle
+nai=Idioma Ind\u00EDgena Norte-Americano
+nap=Napolitano
+nau=Nauruano
+nav=Navajo
+nbl=Ndebele, Sul
+nde=Ndebele, Norte
+ndo=Dongo
+nds=Baixo-Alem\u00E3o
+nep=Nepali
+new=Nepal Bhasa
+nia=Nias
+nic=Niger-Cordof\u00E2nio
+niu=Niueano
+nno=Nynorsk Noruegu\u00EAs
+nob=Bokm\u00E5l, Noruega
+nog=Nogai
+non=N\u00F3rdico Arcaico
+nor=Noruegu\u00EAs
+nqo=N'Ko
+nso=Pedi
+nub=Idioma N\u00FAbio
+nwc=Newari Cl\u00E1ssico
+nya=Chichewa
+nym=Nyamwezi
+nyn=Nyankole
+nyo=Nyoro
+nzi=Nzima
+oci=Occit\u00E2nico (ap\u00F3s 1500)
+oji=Ojibwa
+ori=Oriya
+orm=Oromo
+osa=Osage
+oss=Osseta
+ota=Turco Otomano (1500-1928)
+oto=Idioma Otomano
+paa=Idioma Papuano
+pag=Pangasin\u00E3
+pal=P\u00E1lavi
+pam=Pampanga
+pan=Panjabi
+pap=Papiamento
+pau=Palauano
+peo=Persa Arcaico (aprox.600-400 a.C.)
+per=Persa
+phi=Idioma Filipino
+phn=Fen\u00EDcio
+pli=Pali
+pol=Polon\u00EAs
+pon=Pompeiano
+por=Portugu\u00EAs
+pra=Idioma Pr\u00E1crito
+pro=Proven\u00E7al, Antigo (at\u00E9 1500)
+pus=Pushto; Pashto
+que=Qu\u00EDchua
+raj=Rajastani
+rap=Rapanui
+rar=Rarotongano
+roa=Idioma Rom\u00E2nico
+roh=Raetho-Romance
+rom=Romani
+rum=Romeno
+run=Rundi
+rup=Aromeno
+rus=Russo
+sad=Sandawe
+sag=Sango
+sah=Iacuto
+sai=Idioma Ind\u00EDgena Sul-Americano
+sal=Idioma Salisano
+sam=Aramaico Samaritano
+san=S\u00E2nscrito
+sas=Sasak
+sat=Santali
+scn=Siciliano
+sco=Escoc\u00EAs
+sel=Selkup
+sem=Idioma Sem\u00EDtico
+sga=Irland\u00EAs Arcaico (at\u00E9 900)
+sgn=Linguagem de Sinais
+shn=Shan
+sid=Sidamo
+sin=Cingal\u00EAs
+sio=Idioma Sioux
+sit=Sino-Tibetano
+sla=Idioma Eslavo
+slo=Eslovaco
+slv=Eslov\u00EAnio
+sma=Sami do Sul
+sme=Sami do Norte
+smi=Idioma Sami
+smj=Lule Sami
+smn=Inari Sami
+smo=Samoano
+sms=Skolt Sami
+sna=Shona
+snd=Sindi
+snk=Soninqu\u00EA
+sog=Sogdiano
+som=Somali
+son=Songai
+sot=Soto do Sul
+spa=Espanhol
+srd=Sardo
+srn=Idioma Surinam\u00EAs
+srp=S\u00E9rvio
+srr=Serere
+ssa=Idioma Nilo-Saariano
+ssw=Swati
+suk=Sukuma
+sun=Sundan\u00EAs
+sus=Sosso
+sux=Sum\u00E9rio
+swa=Sua\u00EDli
+swe=Sueco
+syc=Sir\u00EDaco Cl\u00E1ssico
+syr=Sir\u00EDaco
+tah=Taitiano
+tai=Idioma Tailand\u00EAs
+tam=T\u00E2mil
+tat=Tatar
+tel=Telugu
+tem=Timne
+ter=Tereno
+tet=T\u00E9tum
+tgk=Tadjique
+tgl=Tagalo
+tha=Tailand\u00EAs
+tib=Tibetano
+tig=Tigre
+tir=Tigr\u00EDnia
+tiv=Tiv
+tkl=Toquelauano
+tlh=Klingon
+tli=Tlinguite
+tmh=Tamaxeque
+tog=Tongan\u00EAs de Nyasa
+ton=Tongan\u00EAs (das Ilhas Tonga)
+tpi=Tok Pisin
+tsi=Tsimshian
+tsn=Tswana
+tso=Tsonga
+tuk=Turcomano
+tum=Tumbuka
+tup=Idioma Tupi
+tur=Turco
+tut=Idioma Altaico
+tvl=Tuvaluano
+twi=Twi
+tyv=Tuviniano
+udm=Udmurt
+uga=Ugar\u00EDtico
+uig=Uighur
+ukr=Ucraniano
+umb=Umbundu
+und=Idioma Inv\u00E1lido ou Desconhecido
+urd=Urdu
+uzb=Usbeque
+vai=Vai
+ven=Venda
+vie=Vietnamita
+vol=Volap\u00FCk
+vot=Votico
+wak=Idioma Wakashan
+wal=Walamo
+war=Waray
+was=Washo
+wel=Gal\u00EAs
+wen=Idioma Sor\u00E1bio
+wln=Walloon
+wol=Uolofe
+xal=Kalmyk
+xho=Xosa
+yao=Yao
+yap=Yapese
+yid=\u00CDdiche
+yor=Ioruba
+ypk=Idioma I\u00FApique
+zap=Zapoteca
+zbl=S\u00EDmbolos Blis
+zen=Zenaga
+zha=Zhuang
+znd=Zande
+zul=Zulu
+zun=Zunhi
+zxx=Sem conte\u00FAdo lingu\u00EDstico
+zza=Zaza
+
+# script names
+# key is ISO 15924 script code
+
+Arab=\u00C1rabe
+Armi=Aramaico Imperial
+Armn=Arm\u00EAnio
+Avst=Av\u00E9stico
+Bali=Balin\u00EAs
+Bamu=Bamum
+Bass=Bassa Vah
+Batk=Bataque
+Beng=Bengali
+Blis=S\u00EDmbolos Blis
+Bopo=Bopomofo
+Brah=Brahmi
+Brai=Braille
+Bugi=Buguin\u00EAs
+Buhd=Buhid
+Cakm=Chakma
+Cans=Escrita Sil\u00E1bica Unificada dos Abor\u00EDgenes Canadenses
+Cari=Cariano
+Cham=Cham
+Cher=Cherokee
+Cirt=Cirth
+Copt=C\u00F3ptico
+Cprt=Cipriota
+Cyrl=Cir\u00EDlico
+Cyrs=Alfabeto Cir\u00EDlico do Eslavo "Old Church"
+Deva=Devan\u00E1gari
+Dsrt=Deseret
+Dupl=Estenografia Duploiana
+Egyd=Dem\u00F3tico Eg\u00EDpcio
+Egyh=Hier\u00E1tico Eg\u00EDpcio
+Egyp=Hier\u00F3glifos eg\u00EDpcios
+Elba=Elbasan
+Ethi=Eti\u00F3pico
+Geok=Khutsuri
+Geor=Georgiano
+Glag=Glagol\u00EDtico
+Goth=G\u00F3tico
+Gran=Grantha
+Grek=Grego
+Gujr=Guzerate
+Guru=Gurmuqui
+Hang=Hangul
+Hani=Han
+Hano=Hanunoo
+Hans=Han Simplificado
+Hant=Han Tradicional
+Hebr=Hebraico
+Hira=Hiragana
+Hmng=Pahawh Hmong
+Hrkt=Katakana ou Hiragana
+Hung=H\u00FAngaro Antigo
+Inds=Indus
+Ital=It\u00E1lico Antigo
+Java=Javan\u00EAs
+Jpan=Japon\u00EAs
+Kali=Kayah Li
+Kana=Katakana
+Khar=Kharoshthi
+Khmr=Khmer
+Knda=Kannada
+Kore=Coreano
+Kpel=Kpelle
+Kthi=Kaithi
+Lana=Tai Tham
+Laoo=Laosiano
+Latf=Tipo Fraktur Latino
+Latg=Latim Ga\u00E9lico
+Latn=Latim
+Lepc=Lepcha
+Limb=Limbu
+Lina=A Linear
+Linb=B Linear
+Lisu=Lisu
+Loma=Loma
+Lyci=L\u00EDcio
+Lydi=L\u00EDdio
+Mand=Mandaico
+Mani=Maniqueano
+Maya=Hier\u00F3glifos maias
+Mend=Mende
+Merc=Mero\u00EDtico Cursivo
+Mero=Mero\u00EDtico
+Mlym=Malaiala
+Mong=Mongol
+Moon=Moon
+Mtei=Meitei Mayek
+Mymr=Mianmar
+Narb=\u00C1rabe Antigo do Norte
+Nbat=Nabataeano
+Nkgb=Nakhi Geba
+Nkoo=N'Ko
+Ogam=Og\u00E2mico
+Olck=Ol Chiki
+Orkh=Orkhon
+Orya=Oriya
+Osma=Osmanya
+Palm=Palmyrene
+Perm=P\u00E9rmico Antigo
+Phag=Phags-pa
+Phli=Pahlavi de Inscri\u00E7\u00E3o
+Phlp=Psalter Pahlavi
+Phlv=Book Pahlavi
+Phnx=Fen\u00EDcio
+Plrd=Miao
+Prti=Parthian de Inscri\u00E7\u00E3o
+Rjng=Rejang
+Roro=Rongorongo
+Runr=R\u00FAnico
+Samr=Samaritano
+Sara=Sarati
+Sarb=\u00C1rabe Antigo do Sul
+Saur=Saurashtra
+Sgnw=SignWriting
+Shaw=Shaviano
+Sind=Sindi
+Sinh=Cingal\u00EAs
+Sund=Sundan\u00EAs
+Sylo=Syloti Nagri
+Syrc=Sir\u00EDaco
+Syre=Sir\u00EDaco Estrangelo
+Syrj=Sir\u00EDaco Ocidental
+Syrn=Sir\u00EDaco Oriental
+Tagb=Tagbanwa
+Tale=Tai Le
+Talu=New Tai Lue
+Taml=T\u00E2mil
+Tavt=Tai Viet
+Telu=Telugu
+Teng=Tengwar
+Tfng=Tifinagh
+Tglg=Tagalo
+Thaa=Thaana
+Thai=Tailand\u00EAs
+Tibt=Tibetano
+Ugar=Ugar\u00EDtico
+Vaii=Vai
+Visp=Visible Speech
+Wara=Warang Citi
+Xpeo=Persa Antigo
+Xsux=Sum\u00E9rio-Acadiano Cuneiforme
+Yiii=Yi
+Zinh=Herdado
+Zmth=Nota\u00E7\u00E3o Matem\u00E1tica
+Zsym=S\u00EDmbolos
+Zxxx=\u00C1grafo
+Zyyy=Escrita indeterminada
+Zzzz=Escrita Desconhecida ou Inv\u00E1lida
+
+# country names
+# key is ISO 3166 country code
+
+AD=Andorra
+AE=Emirados \u00C1rabes Unidos
+AF=Afeganist\u00E3o
+AG=Ant\u00EDgua e Barbuda
+AI=Anguila
+AL=Alb\u00E2nia
+AM=Arm\u00EAnia
+AN=Antilhas Holandesas
+AO=Angola
+AQ=Ant\u00E1rtida
+AR=Argentina
+AS=Samoa Americana
+AT=\u00C1ustria
+AU=Austr\u00E1lia
+AW=Aruba
+AX=Ilhas \u00C5land
+AZ=Azerbaij\u00E3o
+BA=B\u00F3snia-Herzegovina
+BB=Barbados
+BD=Bangladesh
+BE=B\u00E9lgica
+BF=Burkina Faso
+BG=Bulg\u00E1ria
 BH=Bahrain
-KP=Cor\u00e9ia do Norte
-MK=Maced\u00f4nia
-ZW=Zimb\u00e1bue
+BI=Burundi
+BJ=Benin
+BL=Saint Barth\u00E9lemy
+BM=Bermudas
+BN=Brunei
+BO=Bol\u00EDvia
+BQ=Territ\u00F3rio Insular de Bonaire, Ilha de Santo Eust\u00E1quio e Saba
+BR=Brasil
+BS=Bahamas
+BT=But\u00E3o
+BV=Ilha Bouvet
+BW=Botsuana
+BY=Bielorr\u00FAssia
+BZ=Belize
+CA=Canad\u00E1
+CC=Ilhas Cocos (Keeling)
+CD=Congo, Rep\u00FAblica Democr\u00E1tica do
+CF=Rep\u00FAblica Centro-Africana
+CG=Congo - Brazzaville
+CH=Su\u00ED\u00E7a
+CI=Costa do Marfim
+CK=Ilhas Cook
+CL=Chile
+CM=Rep\u00FAblica dos Camar\u00F5es
+CN=China
+CO=Col\u00F4mbia
+CR=Costa Rica
+CS=S\u00E9rvia e Montenegro
+CU=Cuba
+CV=Cabo Verde
+CW=Cura\u00E7ao
+CX=Ilha Christmas
+CY=Chipre
+CZ=Rep\u00FAblica Tcheca
+DE=Alemanha
+DJ=Djibuti
+DK=Dinamarca
+DM=Dominica
+DO=Rep\u00FAblica Dominicana
+DZ=Arg\u00E9lia
+EC=Equador
+EE=Est\u00F4nia
+EG=Egito
+EH=Saara Ocidental
+ER=Eritreia
+ES=Espanha
+ET=Eti\u00F3pia
+FI=Finl\u00E2ndia
+FJ=Fiji
+FK=Ilhas Falkland
+FM=Micron\u00E9sia, Estados Federados da
+FO=Ilhas Faroe
+FR=Fran\u00E7a
+GA=Gab\u00E3o
+GB=Reino Unido
+GD=Granada
+GE=Ge\u00F3rgia
+GF=Guiana Francesa
+GG=Guernsey
+GH=Gana
+GI=Gibraltar
+GL=Groenl\u00E2ndia
+GM=G\u00E2mbia
+GN=Guin\u00E9
+GP=Guadalupe
+GQ=Guin\u00E9 Equatorial
+GR=Gr\u00E9cia
+GS=Ge\u00F3rgia do Sul e Ilhas Sandwich do Sul
+GT=Guatemala
+GU=Guam
+GW=Guin\u00E9 Bissau
+GY=Guiana
+HK=Hong Kong, Regi\u00E3o Admin. Especial da China
+HM=Ilha Heard e Ilhas McDonald
+HN=Honduras
+HR=Cro\u00E1cia
+HT=Haiti
+HU=Hungria
+ID=Indon\u00E9sia
+IE=Irlanda
+IL=Israel
+IM=Ilha de Man
+IN=\u00CDndia
+IO=Territ\u00F3rio Brit\u00E2nico do Oceano \u00CDndico
+IQ=Iraque
+IR=Ir\u00E3
+IS=Isl\u00E2ndia
+IT=It\u00E1lia
+JE=Jersey
+JM=Jamaica
+JO=Jord\u00E2nia
+JP=Jap\u00E3o
+KE=Qu\u00EAnia
+KG=Quirguist\u00E3o
+KH=Camboja
+KI=Quiribati
+KM=Comores
+KN=S\u00E3o Crist\u00F3v\u00E3o e Nevis
+KP=Coreia do Norte
+KR=Coreia do Sul
+KW=Kuwait
+KY=Ilhas Caiman
+KZ=Cazaquist\u00E3o
+LA=Rep\u00FAblica Democr\u00E1tica Popular de Laos
+LB=L\u00EDbano
+LC=Santa L\u00FAcia
+LI=Liechtenstein
+LK=Sri Lanka
+LR=Lib\u00E9ria
+LS=Lesoto
+LT=Litu\u00E2nia
+LU=Luxemburgo
+LV=Let\u00F4nia
+LY=L\u00EDbia
+MA=Marrocos
+MC=M\u00F4naco
+MD=Moldova, Rep\u00FAblica de
+ME=Montenegro
+MF=Saint Martin
+MG=Madag\u00E1scar
+MH=Ilhas Marshall
+MK=Maced\u00F4nia
+ML=Mali
+MM=Mianmar
+MN=Mong\u00F3lia
+MO=Macau, Regi\u00E3o Admin. Especial da China
+MP=Ilhas Marianas do Norte
+MQ=Martinica
+MR=Maurit\u00E2nia
+MS=Montserrat
+MT=Malta
+MU=Maur\u00EDcio
+MV=Maldivas
+MW=Malau\u00ED
+MX=M\u00E9xico
+MY=Mal\u00E1sia
+MZ=Mo\u00E7ambique
+NA=Nam\u00EDbia
+NC=Nova Caled\u00F4nia
+NE=N\u00EDger
+NF=Ilha Norfolk
+NG=Nig\u00E9ria
+NI=Nicar\u00E1gua
+NL=Pa\u00EDses Baixos
+NO=Noruega
+NP=Nepal
+NR=Nauruano
+NU=Niue
+NZ=Nova Zel\u00E2ndia
+OM=Om\u00E3
+PA=Panam\u00E1
+PE=Peru
+PF=Polin\u00E9sia Francesa
+PG=Papua-Nova Guin\u00E9
+PH=Filipinas
+PK=Paquist\u00E3o
+PL=Pol\u00F4nia
+PM=Saint Pierre e Miquelon
+PN=Pitcairn
+PR=Porto Rico
+PS=Territ\u00F3rio da Palestina
+PT=Portugal
+PW=Palau
+PY=Paraguai
+QA=Catar
+RE=Reuni\u00E3o
+RO=Rom\u00EAnia
+RS=S\u00E9rvia
+RU=R\u00FAssia
+RW=Ruanda
+SA=Ar\u00E1bia Saudita
+SB=Ilhas Salom\u00E3o
+SC=Ilhas Seychelles
+SD=Sud\u00E3o
+SE=Su\u00E9cia
+SG=Cingapura
+SH=Santa Helena
+SI=Eslov\u00EAnia
+SJ=Svalbard e Jan Mayen
+SK=Eslov\u00E1quia
+SL=Serra Leoa
+SM=San Marino
+SN=Senegal
+SO=Som\u00E1lia
+SR=Suriname
+ST=S\u00E3o Tom\u00E9 e Pr\u00EDncipe
+SV=El Salvador
+SX=Saint Maarten (parte holandesa)
+SY=S\u00EDria
+SZ=Suazil\u00E2ndia
+TC=Ilhas Turks e Caicos
+TD=Chade
+TF=Territ\u00F3rios Franceses do Sul
+TG=Togo
+TH=Tail\u00E2ndia
+TJ=Tadjiquist\u00E3o
+TK=Toquelauano
+TL=Timor Leste
+TM=Turcomenist\u00E3o
+TN=Tun\u00EDsia
+TO=Reino de Tonga
+TR=Turquia
+TT=Trinidad e Tobago
+TV=Tuvaluano
+TW=Taiwan
+TZ=Tanz\u00E2nia
+UA=Ucr\u00E2nia
+UG=Uganda
+UM=Ilhas Menores Distantes dos Estados Unidos
+US=Estados Unidos
+UY=Uruguai
+UZ=Uzbequist\u00E3o
+VA=Vaticano
+VC=S\u00E3o Vicente e Granadinas
+VE=Venezuela
+VG=Ilhas Virgens Brit\u00E2nicas
+VI=Ilhas Virgens dos EUA
+VN=Vietn\u00E3
+VU=Vanuatu
+WF=Wallis e Futuna
+WS=Samoa
+YE=I\u00EAmen
+YT=Maiote
+ZA=\u00C1frica do Sul
+ZM=Z\u00E2mbia
+ZW=Zimb\u00E1bue
+
+# territory names
+# key is UN M.49 country and area code
+
+001=Mundo
+002=\u00C1frica
+003=Am\u00E9rica do Norte
+005=Am\u00E9rica do Sul
+009=Oceania
+011=\u00C1frica Ocidental
+013=Am\u00E9rica Central
+014=\u00C1frica Oriental
+015=\u00C1frica Setentrional
+017=\u00C1frica Central
+018=\u00C1frica Austral
+019=Am\u00E9ricas
+021=Am\u00E9rica Setentrional
+029=Caribe
+030=\u00C1sia Oriental
+034=\u00C1sia Meridional
+035=\u00C1sia Centro-Oriental
+039=Europa Meridional
+053=Austr\u00E1lia e Nova Zel\u00E2ndia
+054=Melan\u00E9sia
+057=Regi\u00E3o da Micron\u00E9sia
+061=Polin\u00E9sia
+142=\u00C1sia
+143=\u00C1sia Central
+145=\u00C1sia Ocidental
+150=Europa
+151=Europa Oriental
+154=Europa Setentrional
+155=Europa Ocidental
+419=Am\u00E9rica Latina e Caribe
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Noruegu\u00EAs (Nynorsk)
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties
index 526bb96..740b114 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=afar
-ab=abchasiska
+aa=Afar
+ab=Abchasiska
 ae=Avestiska
-af=afrikaans
+af=Afrikaans
 ak=Akan
-am=amhariska
-an=Aragoniska
-ar=arabiska
-as=assamesiska
-av=Avariska
-ay=aymara
-az=azerbadjanska
-ba=bashkir
-be=vitryska
-bg=bulgariska
-bh=bihari
-bi=bislama
+am=Amhariska
+an=Aragonsk spanska
+ar=Arabiska
+as=Assamesiska
+av=Avariskt spr\u00E5k
+ay=Aymara
+az=Azerbajdzjanska
+ba=Basjkiriska
+be=Vitryska
+bg=Bulgariska
+bh=Bihari
+bi=Bislama
 bm=Bambara
-bn=bengaliska
-bo=tibetanska
-br=bretagnska
+bn=Bengali
+bo=Tibetanska
+br=Bretonska
 bs=Bosniska
-ca=katalan
+ca=Katalanska
 ce=Tjetjenska
 ch=Chamorro
-co=korsikanksa
+co=Korsikanska
 cr=Cree
-cs=tjeckiska
+cs=Tjeckiska
 cu=Kyrkoslaviska
 cv=Tjuvasjiska
-cy=walesiska
-da=danska
-de=tyska
+cy=Kymriska
+da=Danska
+de=Tyska
 dv=Divehi
-dz=bhutanska
+dz=Bhutanesiska (Dzongkha)
 ee=Ewe
-el=grekiska
-en=engelska
-eo=esperanto
-es=spanska
-et=estniska
-eu=baskiska
-fa=persiska
+el=Grekiska
+en=Engelska
+eo=Esperanto
+es=Spanska
+et=Estniska
+eu=Baskiska
+fa=Persiska
 ff=Fulani
-fi=finska
-fj=fiji
-fo=f\u00e4r\u00f6iska
-fr=franska
-fy=frisiska
-ga=irl\u00e4ndska
-gd=skotsk gaeliska
-gl=galiciska
-gn=guarani
-gu=gujarati
+fi=Finska
+fj=Fidjianska
+fo=F\u00E4r\u00F6iska
+fr=Franska
+fy=Frisiska
+ga=Iriska
+gd=Skotsk gaeliska
+gl=Galiciska
+gn=Guarani
+gu=Gujarati
 gv=Manx
-ha=hausa
-he=hebreiska
-hi=hindi
+ha=Haussa
+he=Hebreiska
+hi=Hindi
 ho=Hirimotu
-hr=kroatiska
+hr=Kroatiska
 ht=Haitiska
-hu=ungerska
-hy=armeniska
+hu=Ungerska
+hy=Armeniska
 hz=Herero
-ia=interlingua
-id=indonesiska
-ie=interlingue
-ig=Igbo
+ia=Interlingua
+id=Indonesiska
+ie=Interlingue
+ig=Ibo (Igbo)
 ii=Sichuan Yi
-ik=inupiak
-in=indonesiska
+ik=Inupiaq
+in=Indonesiska
 io=Ido
-is=isl\u00e4ndska
-it=italienska
-iu=inuktitut
-iw=hebreiska
-ja=japanska
-ji=jiddish
+is=Isl\u00E4ndska
+it=Italienska
+iu=Inuktitut
+iw=Hebreiska
+ja=Japanska
+ji=Jiddisch
 jv=Javanesiska
-ka=georgiska
+ka=Georgiska
 kg=Kikongo
 ki=Kikuyu
 kj=Kwanyama
-kk=kazakstanska
-kl=gr\u00f6nl\u00e4ndska
-km=kambodjanska
-kn=kannada
-ko=koreanska
+kk=Kazakiska
+kl=Gr\u00F6nl\u00E4ndska
+km=Kambodjanska (Khmer)
+kn=Kannada
+ko=Koreanska
 kr=Kanuri
-ks=kashmiriska
-ku=kurdiska
+ks=Kashmiri
+ku=Kurdiska
 kv=Komi
 kw=Korniska
-ky=kirgisiska
-la=latin
+ky=Kirgisiska
+la=Latin
 lb=Luxemburgiska
 lg=Luganda
 li=Limburgiska
-ln=lingala
-lo=laotiska
-lt=litauiska
+ln=Lingala
+lo=Laotiska
+lt=Litauiska
 lu=Luba-Katanga
-lv=lettiska
-mg=malagas
+lv=Lettiska
+mg=Malagassiska
 mh=Marshallesiska
-mi=maori
-mk=makedoniska
-ml=malayalam
-mn=mongoliska
-mo=moldaviska
-mr=marathi
-ms=malajiska
-mt=maltesiska
-my=burmesiska
-na=nauru
-nb=Norska (bokm\u00e5l)
-nd=Ndebele (nord)
-ne=nepaliska
+mi=Maori
+mk=Makedonska
+ml=Malayalam
+mn=Mongoliska
+mo=Moldaviska
+mr=Marathi
+ms=Malajiska
+mt=Maltesiska
+my=Burmesiska
+na=Nauru
+nb=Norska, bokm\u00E5l
+nd=Nordndebele
+ne=Nepali
 ng=Ndonga
-nl=nederl\u00e4ndska
-nn=Nynorska
-no=norska
-nr=Ndebele (syd)
-nv=Navaho
+nl=Nederl\u00E4ndska
+nn=Norska (Nynorska)
+no=Norska
+nr=Sydndebele
+nv=Navajo
 ny=Nyanja
-oc=occitan
-oj=Odjibwa
-om=oromo (afan)
-or=oriya
+oc=Occitanska
+oj=Odjibwa (Chippewa)
+om=Oromo
+or=Oriya
 os=Ossetiska
-pa=punjabiska
+pa=Panjabi
 pi=Pali
-pl=polska
-ps=pashto (pushto)
-pt=portugisiska
-qu=quechua
-rm=r\u00e4tromanska 
-rn=kirundi
-ro=rum\u00e4nska
-ru=ryska
-rw=kinyarwanda
-sa=sanskrit
+pl=Polska
+ps=Pashto
+pt=Portugisiska
+qu=Quechua
+rm=R\u00E4toromanska
+rn=Rundi
+ro=Rum\u00E4nska
+ru=Ryska
+rw=Rwanda
+sa=Sanskrit
 sc=Sardiska
-sd=sindhi
+sd=Sindhi
 se=Nordsamiska
-sg=sangho
-si=singalese
-sk=slovakiska
-sl=slovenska
-sm=samoa
-sn=shona
-so=somaliska
-sq=albanska
-sr=serbiska
-ss=siswati
-st=sesotho
-su=sundanesiska
-sv=svenska
-sw=swahili
-ta=tamil
-te=telugu
-tg=tadjekiska
-th=thail\u00e4ndska
-ti=tigrinya
-tk=turkmeniska
-tl=tagalog
-tn=setswana
-to=tonga
-tr=turkiska
-ts=tsonga
-tt=tatariska
-tw=twi
+sg=Sango
+si=Singalesiska
+sk=Slovakiska
+sl=Slovenska
+sm=Samoanska
+sn=Shona
+so=Somaliska
+sq=Albanska
+sr=Serbiska
+ss=Swazi
+st=Sesotho
+su=Sundanesiska
+sv=Svenska
+sw=Swahili
+ta=Tamil
+te=Telugo
+tg=Tadzjikiska
+th=Thail\u00E4ndska
+ti=Tigrinja
+tk=Turkmeniska
+tl=Tagalog
+tn=Tswana
+to=Tonga
+tr=Turkiska
+ts=Tsonga
+tt=Tatariska
+tw=Twi
 ty=Tahitiska
-ug=uighur
-uk=ukrainska
-ur=urdu
-uz=uzbekiska
+ug=Uiguriska
+uk=Ukrainska
+ur=Urdu
+uz=Uzbekiska
 ve=Venda
-vi=vietnamesiska
-vo=volapuk
+vi=Vietnamesiska
+vo=Volap\u00FCk
 wa=Vallonska
-wo=wolof
-xh=xhosa
-yi=jiddish
-yo=yoruba
-za=zhuang
-zh=kinesiska
-zu=zulu
+wo=Wolof
+xh=Xhosa
+yi=Jiddisch
+yo=Yoruba
+za=Zhuang
+zh=Kinesiska
+zu=Zulu
 
 # key is ISO 639.2 language code
 aar=Afar
@@ -577,7 +578,7 @@
 pon=Pohnpeiska
 por=Portugisiska
 pra=Prakrit
-pro=Fornprovensalska (-1500)
+pro=Provensalska, gammal (till 1500)
 pus=Pashto
 que=Quechua
 raj=Rajasthani
@@ -806,7 +807,7 @@
 Narb=Nordlig fornarabiska
 Nbat=Nabataeiska
 Nkgb=Nakhi geba
-Nkoo=N'Ko
+Nkoo=N\u2019Ko
 Ogam=Ogham
 Olck=Ol chiki
 Orkh=Orkhon
@@ -868,23 +869,23 @@
 # key is ISO 3166 country code
 
 AD=Andorra
-AE=F\u00f6renade Arabemiraten
+AE=F\u00F6renade Arabemiraten
 AF=Afghanistan
 AG=Antigua och Barbuda
 AI=Anguilla
 AL=Albanien
 AM=Armenien
-AN=Nederl\u00e4ndska Antillerna 
+AN=Nederl\u00E4ndska Antillerna
 AO=Angola
 AQ=Antarktis
 AR=Argentina
-AS=Amerikanska Samoa
-AT=\u00d6sterrike
+AS=Amerikanska Samoa\u00F6arna
+AT=\u00D6sterrike
 AU=Australien
 AW=Aruba
-AX=\u00c5land
-AZ=Azerbadjan
-BA=Bosnien och Herzegovina
+AX=\u00C5land
+AZ=Azerbajdzjan
+BA=Bosnien och Hercegovina
 BB=Barbados
 BD=Bangladesh
 BE=Belgien
@@ -901,18 +902,18 @@
 BR=Brasilien
 BS=Bahamas
 BT=Bhutan
-BV=Bouvet\u00f6n
+BV=Bouvet\u00F6n
 BW=Botswana
 BY=Vitryssland
 BZ=Belize
 CA=Kanada
-CC=Cocos\u00f6arna
+CC=Kokos\u00F6arna
 CD=Demokratiska republiken Kongo
 CF=Centralafrikanska republiken
-CG=Kongo
+CG=Kongo-Brazzaville
 CH=Schweiz
 CI=Elfenbenskusten
-CK=Cook\u00f6arna
+CK=Cook\u00F6arna
 CL=Chile
 CM=Kamerun
 CN=Kina
@@ -922,9 +923,9 @@
 CU=Kuba
 CV=Kap Verde
 CW=Cura\u00E7ao
-CX=Jul\u00f6n
+CX=Jul\u00F6n
 CY=Cypern
-CZ=Tjeckiska republiken
+CZ=Tjeckien
 DE=Tyskland
 DJ=Djibouti
 DK=Danmark
@@ -934,15 +935,15 @@
 EC=Ecuador
 EE=Estland
 EG=Egypten
-EH=V\u00e4stra Sahara
+EH=V\u00E4stsahara
 ER=Eritrea
 ES=Spanien
 ET=Etiopien
 FI=Finland
 FJ=Fiji
-FK=Falklands\u00f6arna
+FK=Falklands\u00F6arna
 FM=Mikronesien
-FO=F\u00e4r\u00f6arna
+FO=F\u00E4r\u00F6arna
 FR=Frankrike
 GA=Gabon
 GB=Storbritannien
@@ -952,19 +953,19 @@
 GG=Guernsey
 GH=Ghana
 GI=Gibraltar
-GL=Gr\u00f6nland
+GL=Gr\u00F6nland
 GM=Gambia
 GN=Guinea
 GP=Guadeloupe
 GQ=Ekvatorialguinea
 GR=Grekland
-GS=Sydgeorgien och Sydsandwich\u00f6arna
+GS=Sydgeorgien och Sydsandwich\u00F6arna
 GT=Guatemala
 GU=Guam
 GW=Guinea-Bissau
 GY=Guyana
 HK=Hongkong
-HM=Heard\u00f6ch McDonald\u00f6arna
+HM=Heard-\u00F6n och McDonald-\u00F6arna
 HN=Honduras
 HR=Kroatien
 HT=Haiti
@@ -974,7 +975,7 @@
 IL=Israel
 IM=Isle of Man
 IN=Indien
-IO=Brittiska territoriet i Indiska Oceanen
+IO=Brittiska Indiska Ocean\u00F6arna
 IQ=Irak
 IR=Iran
 IS=Island
@@ -984,7 +985,7 @@
 JO=Jordanien
 JP=Japan
 KE=Kenya
-KG=Kirgisistan
+KG=Kirgizistan
 KH=Kambodja
 KI=Kiribati
 KM=Komorerna
@@ -992,11 +993,11 @@
 KP=Nordkorea
 KR=Sydkorea
 KW=Kuwait
-KY=Cayman\u00f6arna
+KY=Cayman\u00F6arna
 KZ=Kazakstan
 LA=Laos
 LB=Libanon
-LC=Saint Lucia
+LC=St Lucia
 LI=Liechtenstein
 LK=Sri Lanka
 LR=Liberia
@@ -1011,13 +1012,13 @@
 ME=Montenegro
 MF=Saint-Martin
 MG=Madagaskar
-MH=Marshall\u00f6arna
+MH=Marshall\u00F6arna
 MK=Makedonien
 ML=Mali
 MM=Myanmar
 MN=Mongoliet
 MO=Macao
-MP=Nordmarianerna
+MP=Norra Marianer\u00F6arna
 MQ=Martinique
 MR=Mauretanien
 MS=Montserrat
@@ -1027,14 +1028,14 @@
 MW=Malawi
 MX=Mexiko
 MY=Malaysia
-MZ=Mo\u00e7ambique
+MZ=Mo\u00E7ambique
 NA=Namibia
 NC=Nya Kaledonien
 NE=Niger
-NF=Norfolk\u00f6n
+NF=Norfolk\u00F6n
 NG=Nigeria
 NI=Nicaragua
-NL=Nederl\u00e4nderna
+NL=Nederl\u00E4nderna
 NO=Norge
 NP=Nepal
 NR=Nauru
@@ -1056,18 +1057,18 @@
 PW=Palau
 PY=Paraguay
 QA=Qatar
-RE=R\u00e9union
-RO=Rum\u00e4nien
+RE=R\u00E9union
+RO=Rum\u00E4nien
 RS=Serbien
 RU=Ryssland
 RW=Rwanda
 SA=Saudiarabien
-SB=Salomon\u00f6arna
+SB=Salomon\u00F6arna
 SC=Seychellerna
 SD=Sudan
 SE=Sverige
 SG=Singapore
-SH=Saint Helena
+SH=St Helena
 SI=Slovenien
 SJ=Svalbard och Jan Mayen
 SK=Slovakien
@@ -1076,19 +1077,19 @@
 SN=Senegal
 SO=Somalia
 SR=Surinam
-ST=S\u00e3o Tom\u00e9 och Pr\u00edncipe
+ST=Sao Tom\u00E9 och Pr\u00EDncipe
 SV=El Salvador
 SX=Sint Maarten (nederl\u00E4ndska delen)
 SY=Syrien
 SZ=Swaziland
-TC=Turks- och Caicos\u00f6arna
+TC=Turks- och Caicos\u00F6arna
 TD=Tchad
-TF=Franska s\u00f6dra territorierna
+TF=Franska Sydterritorierna
 TG=Togo
 TH=Thailand
 TJ=Tadzjikistan
-TK=Tokelau
-TL=Timor-Leste
+TK=Tokelau\u00F6arna
+TL=\u00D6sttimor
 TM=Turkmenistan
 TN=Tunisien
 TO=Tonga
@@ -1099,22 +1100,22 @@
 TZ=Tanzania
 UA=Ukraina
 UG=Uganda
-UM=F\u00f6renta staternas mindre \u00f6ar i Oceanien och V\u00e4stindien
-US=Amerikas F\u00f6renta Stater
+UM=F\u00F6renta staternas mindre \u00F6ar i Oceanien och V\u00E4stindien
+US=USA
 UY=Uruguay
 UZ=Uzbekistan
-VA=Vatikanen
-VC=Saint Vincent och Grenadinerna
+VA=Vatikanstaten
+VC=St Vincent och Grenadinerna
 VE=Venezuela
-VG=Brittiska Virgin Islands
-VI=Amerikanska Virgin Islands
+VG=Brittiska Jungfru\u00F6arna
+VI=Amerikanska Jungfru\u00F6arna
 VN=Vietnam
 VU=Vanuatu
-WF=Wallis och Futuna
+WF=Wallis- och Futuna\u00F6arna
 WS=Samoa
 YE=Jemen
 YT=Mayotte
-ZA=Sydafrika 
+ZA=Sydafrika
 ZM=Zambia
 ZW=Zimbabwe
 
@@ -1151,3 +1152,19 @@
 154=Norra Europa
 155=V\u00E4stra Europa
 419=Latinamerika och Karibien
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=Euro
+%%B=Bokm\u00E5l
+%%NY=Nynorsk
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties
index 35278b0..afbb5c9 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u963f\u6cd5\u6587
-ab=\u963f\u5e03\u54c8\u897f\u4e9a\u6587
-ae=\u963f\u7ef4\u65af\u9640\u6587
-af=\u5357\u975e\u8377\u5170\u6587
-ak=\u5e93\u963f\u6587
-am=\u963f\u59c6\u54c8\u62c9\u6587
-an=\u963f\u62c9\u8d21\u6587
-ar=\u963f\u62c9\u4f2f\u6587
-as=\u963f\u8428\u59c6\u6587
-av=\u963f\u74e6\u5c14\u6587
-ay=\u827e\u9a6c\u62c9\u6587
-az=\u963f\u585e\u62dc\u7586\u6587
-ba=\u5df4\u4ec0\u5ba2\u5c14\u6587
-be=\u767d\u4fc4\u7f57\u65af\u6587
-bg=\u4fdd\u52a0\u5229\u4e9a\u6587
-bh=\u6bd4\u54c8\u5c14\u6587
-bi=\u6bd4\u65af\u62c9\u9a6c\u6587
-bm=\u73ed\u5df4\u62c9\u6587
-bn=\u5b5f\u52a0\u62c9\u6587
-bo=\u897f\u85cf\u6587
-br=\u5e03\u91cc\u591a\u5c3c\u6587
-bs=\u6ce2\u65af\u5c3c\u4e9a\u6587
-ca=\u52a0\u6cf0\u7f57\u5c3c\u4e9a\u6587
-ce=\u8f66\u81e3\u6587
-ch=\u67e5\u83ab\u7f57\u6587
-co=\u79d1\u897f\u5609\u6587
-cr=\u514b\u91cc\u6587
-cs=\u6377\u514b\u6587
-cu=\u6559\u4f1a\u65af\u62c9\u592b\u6587
-cv=\u695a\u74e6\u4ec0\u6587
-cy=\u5a01\u5c14\u58eb\u6587
-da=\u4e39\u9ea6\u6587
-de=\u5fb7\u6587
-dv=\u8fea\u7ef4\u5e0c\u6587
-dz=\u4e0d\u4e39\u6587
-ee=\u57c3\u7ef4\u6587
-el=\u5e0c\u814a\u6587
-en=\u82f1\u6587
-eo=\u4e16\u754c\u6587
-es=\u897f\u73ed\u7259\u6587
-et=\u7231\u6c99\u5c3c\u4e9a\u6587
-eu=\u5df4\u65af\u514b\u6587
-fa=\u6ce2\u65af\u6587
-ff=\u5bcc\u62c9\u6587
-fi=\u82ac\u5170\u6587
-fj=\u6590\u6d4e\u6587
-fo=\u6cd5\u7f57\u6587
-fr=\u6cd5\u6587
-fy=\u5f17\u91cc\u65af\u5170\u6587
-ga=\u7231\u5c14\u5170\u6587
-gd=\u82cf\u683c\u5170- \u76d6\u5c14\u6587
-gl=\u52a0\u5229\u897f\u4e9a\u6587
-gn=\u74dc\u62c9\u5c3c\u6587
-gu=\u53e4\u52a0\u62c9\u63d0\u6587
-gv=\u9a6c\u6069\u6587
-ha=\u8c6a\u6492\u6587
-he=\u5e0c\u4f2f\u6765\u6587
+aa=\u963F\u6CD5\u5C14\u6587
+ab=\u963F\u5E03\u54C8\u897F\u4E9A\u6587
+ae=\u963F\u7EF4\u65AF\u9640\u6587
+af=\u5357\u975E\u8377\u5170\u6587
+ak=\u5E93\u963F\u6587
+am=\u963F\u59C6\u54C8\u62C9\u6587
+an=\u963F\u62C9\u8D21\u6587
+ar=\u963F\u62C9\u4F2F\u6587
+as=\u963F\u8428\u59C6\u6587
+av=\u963F\u74E6\u5C14\u6587
+ay=\u827E\u9A6C\u62C9\u6587
+az=\u963F\u585E\u62DC\u7586\u6587
+ba=\u5DF4\u4EC0\u5BA2\u5C14\u6587
+be=\u767D\u4FC4\u7F57\u65AF\u6587
+bg=\u4FDD\u52A0\u5229\u4E9A\u6587
+bh=\u6BD4\u54C8\u5C14\u6587
+bi=\u6BD4\u65AF\u62C9\u9A6C\u6587
+bm=\u73ED\u5DF4\u62C9\u6587
+bn=\u5B5F\u52A0\u62C9\u6587
+bo=\u897F\u85CF\u6587
+br=\u5E03\u91CC\u591A\u5C3C\u6587
+bs=\u6CE2\u65AF\u5C3C\u4E9A\u6587
+ca=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u6587
+ce=\u8F66\u81E3\u6587
+ch=\u67E5\u83AB\u7F57\u6587
+co=\u79D1\u897F\u5609\u6587
+cr=\u514B\u91CC\u6587
+cs=\u6377\u514B\u6587
+cu=\u6559\u4F1A\u65AF\u62C9\u592B\u6587
+cv=\u695A\u74E6\u4EC0\u6587
+cy=\u5A01\u5C14\u58EB\u6587
+da=\u4E39\u9EA6\u6587
+de=\u5FB7\u6587
+dv=\u8FEA\u7EF4\u5E0C\u6587
+dz=\u4E0D\u4E39\u6587
+ee=\u57C3\u7EF4\u6587
+el=\u5E0C\u814A\u6587
+en=\u82F1\u6587
+eo=\u4E16\u754C\u6587
+es=\u897F\u73ED\u7259\u6587
+et=\u7231\u6C99\u5C3C\u4E9A\u6587
+eu=\u5DF4\u65AF\u514B\u6587
+fa=\u6CE2\u65AF\u6587
+ff=\u5BCC\u62C9\u6587
+fi=\u82AC\u5170\u6587
+fj=\u6590\u6D4E\u6587
+fo=\u6CD5\u7F57\u6587
+fr=\u6CD5\u6587
+fy=\u5F17\u91CC\u65AF\u5170\u6587
+ga=\u7231\u5C14\u5170\u6587
+gd=\u82CF\u683C\u5170-\u76D6\u5C14\u6587
+gl=\u52A0\u5229\u897F\u4E9A\u6587
+gn=\u74DC\u62C9\u5C3C\u6587
+gu=\u53E4\u52A0\u62C9\u63D0\u6587
+gv=\u9A6C\u6069\u6587
+ha=\u8C6A\u6492\u6587
+he=\u5E0C\u4F2F\u6765\u6587
 hi=\u5370\u5730\u6587
-ho=\u65b0\u91cc\u6728\u6258\u6587
-hr=\u514b\u7f57\u5730\u4e9a\u6587
-ht=\u6d77\u5730\u6587
+ho=\u65B0\u91CC\u6728\u6258\u6587
+hr=\u514B\u7F57\u5730\u4E9A\u6587
+ht=\u6D77\u5730\u6587
 hu=\u5308\u7259\u5229\u6587
-hy=\u4e9a\u7f8e\u5c3c\u4e9a\u6587
-hz=\u8d6b\u96f7\u7f57\u6587
-ia=\u62c9\u4e01\u56fd\u9645\u6587
-id=\u5370\u5ea6\u5c3c\u897f\u4e9a\u6587
-ie=\u62c9\u4e01\u56fd\u9645\u6587
-ig=\u4f0a\u535a\u6587
-ii=\u56db\u5ddd\u5f5d\u6587
-ik=\u4f9d\u5974\u76ae\u7ef4\u514b\u6587
-in=\u5370\u5ea6\u5c3c\u897f\u4e9a\u6587
-io=\u4f0a\u591a\u6587
-is=\u51b0\u5c9b\u6587
-it=\u610f\u5927\u5229\u6587
-iu=\u7231\u65af\u57fa\u6469\u6587
-iw=\u5e0c\u4f2f\u6765\u6587
-ja=\u65e5\u6587
-ji=\u4f9d\u5730\u6587
-jv=\u722a\u54c7\u6587
-ka=\u683c\u9c81\u5409\u4e9a\u6587
-kg=\u521a\u679c\u6587
-ki=\u5409\u5e93\u5c24\u6587
-kj=\u5361\u6e7e\u4e9a\u9a6c\u6587
-kk=\u54c8\u8428\u514b\u6587
-kl=\u683c\u9675\u5170\u6587
-km=\u67ec\u57d4\u5be8\u6587
-kn=\u57c3\u7eb3\u5fb7\u6587
-ko=\u671d\u9c9c\u6587
-kr=\u5361\u52aa\u91cc\u6587
-ks=\u514b\u4ec0\u7c73\u5c14\u6587
-ku=\u5e93\u5c14\u5fb7\u6587
-kv=\u79d1\u7c73\u6587
-kw=\u5eb7\u6c83\u5c14\u6587
-ky=\u5409\u5c14\u5409\u65af\u6587
-la=\u62c9\u4e01\u6587
-lb=\u5362\u68ee\u5821\u6587
-lg=\u5e72\u8fbe\u6587
+hy=\u4E9A\u7F8E\u5C3C\u4E9A\u6587
+hz=\u8D6B\u96F7\u7F57\u6587
+ia=\u62C9\u4E01\u56FD\u9645\u6587
+id=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587
+ie=\u62C9\u4E01\u56FD\u9645\u6587
+ig=\u4F0A\u535A\u6587
+ii=\u56DB\u5DDD\u5F5D\u6587
+ik=\u4F9D\u5974\u76AE\u7EF4\u514B\u6587
+in=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587
+io=\u4F0A\u591A\u6587
+is=\u51B0\u5C9B\u6587
+it=\u610F\u5927\u5229\u6587
+iu=\u7231\u65AF\u57FA\u6469\u6587
+iw=\u5E0C\u4F2F\u6765\u6587
+ja=\u65E5\u6587
+ji=\u4F9D\u5730\u6587
+jv=\u722A\u54C7\u6587
+ka=\u683C\u9C81\u5409\u4E9A\u6587
+kg=\u521A\u679C\u6587
+ki=\u5409\u5E93\u5C24\u6587
+kj=\u5361\u6E7E\u4E9A\u9A6C\u6587
+kk=\u54C8\u8428\u514B\u6587
+kl=\u683C\u9675\u5170\u6587
+km=\u67EC\u57D4\u5BE8\u6587
+kn=\u57C3\u7EB3\u5FB7\u6587
+ko=\u671D\u9C9C\u6587
+kr=\u5361\u52AA\u91CC\u6587
+ks=\u514B\u4EC0\u7C73\u5C14\u6587
+ku=\u5E93\u5C14\u5FB7\u6587
+kv=\u79D1\u7C73\u6587
+kw=\u5EB7\u6C83\u5C14\u6587
+ky=\u5409\u5C14\u5409\u65AF\u6587
+la=\u62C9\u4E01\u6587
+lb=\u5362\u68EE\u5821\u6587
+lg=\u5E72\u8FBE\u6587
 li=\u6797\u5821\u6587
-ln=\u6797\u52a0\u62c9\u6587
-lo=\u8001\u631d\u6587
-lt=\u7acb\u9676\u5b9b\u6587
-lu=\u5362\u5df4-\u52a0\u4e39\u52a0
-lv=\u62c9\u6258\u7ef4\u4e9a\u6587(\u5217\u6258)
-mg=\u9a6c\u5c14\u52a0\u4ec0\u6587
-mh=\u9a6c\u7ecd\u5c14\u6587
-mi=\u6bdb\u5229\u6587
-mk=\u9a6c\u5176\u987f\u6587
-ml=\u9a6c\u6765\u4e9a\u62c9\u59c6\u6587
-mn=\u8499\u53e4\u6587
-mo=\u6469\u5c14\u591a\u74e6\u6587
-mr=\u9a6c\u62c9\u5730\u6587
-ms=\u9a6c\u6765\u6587
-mt=\u9a6c\u8033\u4ed6\u6587
-my=\u7f05\u7538\u6587
-na=\u7459\u9c81\u6587
-nb=\u632a\u5a01\u535a\u514b\u9a6c\u5c14\u6587
-nd=\u5317\u6069\u5fb7\u6bd4\u5229\u6587
-ne=\u5c3c\u6cca\u5c14\u6587
-ng=\u6069\u4e1c\u52a0\u6587
+ln=\u6797\u52A0\u62C9\u6587
+lo=\u8001\u631D\u6587
+lt=\u7ACB\u9676\u5B9B\u6587
+lu=\u5362\u5DF4-\u52A0\u4E39\u52A0\u6587
+lv=\u62C9\u6258\u7EF4\u4E9A\u6587 (\u5217\u6258)
+mg=\u9A6C\u5C14\u52A0\u4EC0\u6587
+mh=\u9A6C\u7ECD\u5C14\u6587
+mi=\u6BDB\u5229\u6587
+mk=\u9A6C\u5176\u987F\u6587
+ml=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587
+mn=\u8499\u53E4\u6587
+mo=\u6469\u5C14\u591A\u74E6\u6587
+mr=\u9A6C\u62C9\u5730\u6587
+ms=\u9A6C\u6765\u6587
+mt=\u9A6C\u8033\u4ED6\u6587
+my=\u7F05\u7538\u6587
+na=\u7459\u9C81\u6587
+nb=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u6587
+nd=\u5317\u6069\u5FB7\u6BD4\u5229\u6587
+ne=\u5C3C\u6CCA\u5C14\u6587
+ng=\u6069\u4E1C\u52A0\u6587
 nl=\u8377\u5170\u6587
-nn=\u632a\u5a01\u5c3c\u8bfa\u65af\u514b\u6587
-no=\u632a\u5a01\u6587
-nr=\u5357\u6069\u5fb7\u6bd4\u5229\u6587
-nv=\u7eb3\u74e6\u970d\u6587
-ny=\u5c3c\u626c\u624e\u6587
-oc=\u5965\u897f\u5766\u6587
-oj=\u5965\u5409\u5e03\u74e6\u6587
-om=\u963f\u66fc\u6587
-or=\u6b27\u91cc\u4e9a\u6587
-os=\u5965\u585e\u68af\u6587
-pa=\u65c1\u906e\u666e\u6587
-pi=\u5df4\u5229\u6587
-pl=\u6ce2\u5170\u6587
-ps=\u666e\u4ec0\u56fe\u6587
+nn=\u632A\u5A01\u5C3C\u8BFA\u65AF\u514B\u6587
+no=\u632A\u5A01\u6587
+nr=\u5357\u6069\u5FB7\u6BD4\u5229\u6587
+nv=\u7EB3\u74E6\u970D\u6587
+ny=\u5C3C\u626C\u624E\u6587
+oc=\u5965\u897F\u5766\u6587
+oj=\u5965\u5409\u5E03\u74E6\u6587
+om=\u963F\u66FC\u6587
+or=\u6B27\u91CC\u4E9A\u6587
+os=\u5965\u585E\u68AF\u6587
+pa=\u65C1\u906E\u666E\u6587
+pi=\u5DF4\u5229\u6587
+pl=\u6CE2\u5170\u6587
+ps=\u666E\u4EC0\u56FE\u6587
 pt=\u8461\u8404\u7259\u6587
-qu=\u76d6\u4e18\u4e9a\u6587
-rm=\u91cc\u6258\u7f57\u66fc\u65af\u6587
-rn=\u57fa\u9686\u8fea\u6587
-ro=\u7f57\u9a6c\u5c3c\u4e9a\u6587
-ru=\u4fc4\u6587
-rw=\u5362\u65fa\u8fbe\u6587
-sa=\u68b5\u6587
-sc=\u6492\u4e01\u6587
-sd=\u82cf\u4e39\u6587
-se=\u5317\u6c99\u5bc6\u6587
+qu=\u76D6\u4E18\u4E9A\u6587
+rm=\u91CC\u6258\u7F57\u66FC\u65AF\u6587
+rn=\u57FA\u9686\u8FEA\u6587
+ro=\u7F57\u9A6C\u5C3C\u4E9A\u6587
+ru=\u4FC4\u6587
+rw=\u5362\u65FA\u8FBE\u6587
+sa=\u68B5\u6587
+sc=\u6492\u4E01\u6587
+sd=\u4FE1\u5FB7\u6587
+se=\u5317\u6C99\u5BC6\u6587
 sg=\u6851\u6208\u6587
-si=\u50e7\u4f3d\u7f57\u6587
-sk=\u65af\u6d1b\u4f10\u514b\u6587
-sl=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6587
-sm=\u8428\u6469\u4e9a\u6587
-sn=\u585e\u5185\u52a0\u5c14\u6587
-so=\u7d22\u9a6c\u91cc\u6587
-sq=\u963f\u5c14\u5df4\u5c3c\u4e9a\u6587
-sr=\u585e\u5c14\u7ef4\u4e9a\u6587
-ss=\u8f9b\u8f9b\u90a3\u63d0\u6587
-st=\u585e\u7d22\u6258\u6587
-su=\u82cf\u4e39\u6587
-sv=\u745e\u5178\u6587
-sw=\u65af\u74e6\u5e0c\u91cc\u6587
-ta=\u6cf0\u7c73\u5c14\u6587
-te=\u6cf0\u5362\u56fa\u6587
-tg=\u5854\u5409\u514b\u6587
-th=\u6cf0\u6587
-ti=\u63d0\u683c\u91cc\u5c3c\u4e9a\u6587
-tk=\u571f\u5e93\u66fc\u6587
-tl=\u5854\u52a0\u8def\u65cf\u6587
-tn=\u7a81\u5c3c\u65af\u6587
-to=\u6c64\u52a0\u6587
-tr=\u571f\u8033\u5176\u6587
-ts=\u7279\u677e\u52a0\u6587
-tt=\u9791\u977c\u6587
-tw=\u5951\u7ef4\u6587
-ty=\u5854\u5e0c\u63d0\u6587
-ug=\u7ef4\u543e\u5c14\u6587
-uk=\u4e4c\u514b\u5170\u6587
-ur=\u4e4c\u5c14\u90fd\u6587
-uz=\u4e4c\u5179\u522b\u514b\u6587
-ve=\u6587\u8fbe\u6587
-vi=\u8d8a\u5357\u6587
-vo=\u6c83\u62c9\u666e\u514b\u6587
-wa=\u74e6\u9f99\u6587
-wo=\u6c83\u5c14\u592b\u6587
-xh=\u73ed\u56fe\u6587
-yi=\u4f9d\u5730\u6587
-yo=\u7ea6\u9c81\u5df4\u6587
-za=\u85cf\u6587
-zh=\u4e2d\u6587
-zu=\u7956\u9c81\u6587
+si=\u50E7\u4F3D\u7F57\u6587
+sk=\u65AF\u6D1B\u4F10\u514B\u6587
+sl=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6587
+sm=\u8428\u6469\u4E9A\u6587
+sn=\u4FEE\u7EB3\u6587
+so=\u7D22\u9A6C\u91CC\u6587
+sq=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u6587
+sr=\u585E\u5C14\u7EF4\u4E9A\u6587
+ss=\u65AF\u74E6\u7279\u6587
+st=\u585E\u7D22\u6258\u6587
+su=\u5DFD\u4ED6\u6587
+sv=\u745E\u5178\u6587
+sw=\u65AF\u74E6\u5E0C\u91CC\u6587
+ta=\u6CF0\u7C73\u5C14\u6587
+te=\u6CF0\u5362\u56FA\u6587
+tg=\u5854\u5409\u514B\u6587
+th=\u6CF0\u6587
+ti=\u63D0\u683C\u91CC\u5C3C\u4E9A\u6587
+tk=\u571F\u5E93\u66FC\u6587
+tl=\u5854\u52A0\u8DEF\u65CF\u6587
+tn=\u7A81\u5C3C\u65AF\u6587
+to=\u6C64\u52A0\u6587
+tr=\u571F\u8033\u5176\u6587
+ts=\u7279\u677E\u52A0\u6587
+tt=\u9791\u977C\u6587
+tw=\u5951\u7EF4\u6587
+ty=\u5854\u5E0C\u63D0\u6587
+ug=\u7EF4\u543E\u5C14\u6587
+uk=\u4E4C\u514B\u5170\u6587
+ur=\u4E4C\u5C14\u90FD\u6587
+uz=\u4E4C\u5179\u522B\u514B\u6587
+ve=\u6587\u8FBE\u6587
+vi=\u8D8A\u5357\u6587
+vo=\u6C83\u62C9\u666E\u514B\u6587
+wa=\u74E6\u9F99\u6587
+wo=\u6C83\u5C14\u592B\u6587
+xh=\u73ED\u56FE\u6587
+yi=\u4F9D\u5730\u6587
+yo=\u7EA6\u9C81\u5DF4\u6587
+za=\u58EE\u6587
+zh=\u4E2D\u6587
+zu=\u7956\u9C81\u6587
 
 # key is ISO 639.2 language code
 aar=\u963F\u6CD5\u5C14\u6587
@@ -246,7 +247,7 @@
 alt=\u5357\u963F\u5C14\u6CF0\u6587
 amh=\u963F\u59C6\u54C8\u62C9\u6587
 ang=\u53E4\u82F1\u6587
-anp=\u6602\u52A0\u8BED
+anp=\u6602\u52A0\u6587
 apa=\u963F\u5E15\u5207\u6587
 ara=\u963F\u62C9\u4F2F\u6587
 arc=\u963F\u62C9\u7C73\u6587
@@ -270,7 +271,7 @@
 bak=\u5DF4\u4EC0\u5BA2\u5C14\u6587
 bal=\u4FFE\u8DEF\u652F\u6587
 bam=\u73ED\u5DF4\u62C9\u6587
-ban=\u5DF4\u5398\u8BED
+ban=\u5DF4\u91CC\u6587
 baq=\u5DF4\u65AF\u514B\u6587
 bas=\u5DF4\u8428\u6587
 bat=\u5176\u4ED6\u6CE2\u7F57\u7684\u8BED\u7CFB
@@ -289,9 +290,9 @@
 bos=\u6CE2\u65AF\u5C3C\u4E9A\u6587
 bra=\u5E03\u62C9\u6770\u6587
 bre=\u5E03\u91CC\u591A\u5C3C\u6587
-btk=\u5DF4\u5854\u514B\u8BED
+btk=\u5DF4\u5854\u514B\u6587
 bua=\u5E03\u91CC\u4E9A\u7279\u6587
-bug=\u5E03\u5409\u8BED
+bug=\u5E03\u5409\u6587
 bul=\u4FDD\u52A0\u5229\u4E9A\u6587
 bur=\u7F05\u7538\u6587
 byn=\u5E03\u6797\u6587
@@ -317,7 +318,7 @@
 chv=\u695A\u74E6\u4EC0\u6587
 chy=\u590F\u5EF6\u6587
 cmc=\u67E5\u7C73\u514B\u6587
-cop=\u79D1\u666E\u7279\u6587
+cop=\u514B\u666E\u7279\u6587
 cor=\u5EB7\u6C83\u5C14\u6587
 cos=\u79D1\u897F\u5609\u6587
 cpe=\u5176\u4ED6\u4EE5\u82F1\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB
@@ -367,9 +368,9 @@
 fre=\u6CD5\u6587
 frm=\u4E2D\u53E4\u6CD5\u6587
 fro=\u53E4\u6CD5\u6587
-frr=\u5317\u5F17\u91CC\u897F\u4E9A\u8BED
+frr=\u5317\u5F17\u91CC\u897F\u4E9A\u6587
 frs=\u4E1C\u5F17\u91CC\u897F\u4E9A\u6587
-fry=\u897F\u5F17\u91CC\u65AF\u5170\u8BED
+fry=\u897F\u5F17\u91CC\u65AF\u5170\u6587
 ful=\u5BCC\u62C9\u6587
 fur=\u5F17\u7559\u5229\u6587
 gaa=\u52A0\u6587
@@ -380,7 +381,7 @@
 ger=\u5FB7\u6587
 gez=\u5409\u5179\u6587
 gil=\u5409\u5C14\u4F2F\u7279\u65AF\u6587
-gla=\u76D6\u5C14\u8BED
+gla=\u76D6\u5C14\u6587
 gle=\u7231\u5C14\u5170\u6587
 glg=\u52A0\u5229\u897F\u4E9A\u6587
 glv=\u9A6C\u6069\u6587
@@ -391,7 +392,7 @@
 got=\u54E5\u7279\u6587
 grb=\u683C\u5217\u535A\u6587
 grc=\u53E4\u5E0C\u814A\u6587
-gre=\u5E0C\u814A\u8BED, \u73B0\u4EE3 (1453-)
+gre=\u73B0\u4EE3\u5E0C\u814A\u6587
 grn=\u74DC\u62C9\u5C3C\u6587
 gsw=\u745E\u58EB\u5FB7\u6587
 guj=\u53E4\u52A0\u62C9\u63D0\u6587
@@ -421,7 +422,7 @@
 iku=\u7231\u65AF\u57FA\u6469\u6587
 ile=\u62C9\u4E01\u56FD\u9645\u6587
 ilo=\u4F0A\u6D1B\u5E72\u8BFA\u6587
-ina=\u62C9\u4E01\u56FD\u9645\u8BED (\u56FD\u9645\u8F85\u52A9\u8BED\u8054\u76DF)
+ina=\u62C9\u4E01\u56FD\u9645\u6587 (\u56FD\u9645\u8F85\u52A9\u8BED\u8054\u76DF)
 inc=\u5176\u4ED6\u5370\u5EA6\u8BED\u7CFB
 ind=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587
 ine=\u5176\u4ED6\u5370\u6B27\u8BED\u7CFB
@@ -440,7 +441,7 @@
 kac=\u5361\u7434\u6587
 kal=\u683C\u9675\u5170\u6587
 kam=\u5361\u59C6\u5DF4\u6587
-kan=\u5361\u7EB3\u5854\u514B\u8BED
+kan=\u57C3\u7EB3\u5FB7\u6587
 kar=\u5580\u4F26\u6587
 kas=\u514B\u4EC0\u7C73\u5C14\u6587
 kau=\u5361\u52AA\u91CC\u6587
@@ -449,7 +450,7 @@
 kbd=\u5361\u5DF4\u5C14\u8FBE\u6587
 kha=\u5361\u897F\u6587
 khi=\u5176\u4ED6\u79D1\u4F0A\u6851\u8BED\u7CFB
-khm=\u4E2D\u9AD8\u68C9\u8BED
+khm=\u4E2D\u9AD8\u68C9\u6587
 kho=\u548C\u7530\u6587
 kik=\u5409\u5E93\u5C24\u6587
 kin=\u5362\u65FA\u8FBE\u6587
@@ -458,14 +459,14 @@
 kok=\u521A\u5361\u5C3C\u6587
 kom=\u79D1\u7C73\u6587
 kon=\u521A\u679C\u6587
-kor=\u671D\u9C9C\u6587
+kor=\u97E9\u6587
 kos=\u79D1\u65AF\u62C9\u4F0A\u6587
-kpe=\u514B\u4F69\u52D2\u8BED
+kpe=\u514B\u4F69\u5217\u6587
 krc=\u5361\u62C9\u6070\u4F0A\u5DF4\u5C14\u5361\u5C14\u6587
 krl=\u5361\u7D2F\u5229\u963F\u6587
 kro=\u514B\u9C81\u6587
 kru=\u5E93\u9C81\u514B\u6587
-kua=\u5BBD\u4E9A\u739B\u8BED
+kua=\u5BBD\u4E9A\u739B\u6587
 kum=\u5E93\u6885\u514B\u6587
 kur=\u5E93\u5C14\u5FB7\u6587
 kut=\u5E93\u7279\u5185\u6587
@@ -500,10 +501,10 @@
 mao=\u6BDB\u5229\u6587
 map=\u6FB3\u65AF\u7279\u7F57\u5C3C\u897F\u4E9A\u8BED\u7CFB
 mar=\u9A6C\u62C9\u5730\u6587
-mas=\u8428\u4F0A\u8BED
+mas=\u8428\u4F0A\u6587
 may=\u9A6C\u6765\u6587
 mdf=\u83AB\u514B\u6C99\u6587
-mdr=\u66FC\u8FBE\u5C14
+mdr=\u66FC\u8FBE\u6587
 men=\u95E8\u8FEA\u6587
 mga=\u4E2D\u53E4\u7231\u5C14\u5170\u6587
 mic=\u7C73\u514B\u9A6C\u514B\u6587
@@ -530,8 +531,8 @@
 nap=\u62FF\u6CE2\u91CC\u6587
 nau=\u7459\u9C81\u6587
 nav=\u7EB3\u74E6\u970D\u6587
-nbl=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5357\u90E8
-nde=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5317\u90E8
+nbl=\u5357\u6069\u5FB7\u6BD4\u5229\u6587
+nde=\u5317\u6069\u5FB7\u6BD4\u5229\u6587
 ndo=\u6069\u4E1C\u52A0\u6587
 nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u900A\u6587
 nep=\u5C3C\u6CCA\u5C14\u6587
@@ -540,15 +541,15 @@
 nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
 niu=\u7EBD\u57C3\u6587
 nno=\u632A\u5A01\u5C3C\u8BFA\u65AF\u514B\u6587
-nob=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u8BED
+nob=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u6587
 nog=\u8BFA\u76D6\u6587
 non=\u53E4\u8BFA\u5C14\u65AF\u6587
 nor=\u632A\u5A01\u6587
-nqo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
+nqo=N'Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
 nso=\u5317\u7D22\u6258\u6587
 nub=\u52AA\u6BD4\u4E9A\u8BED\u7CFB
 nwc=\u5C3C\u74E6\u5C14\u6587
-nya=\u9F50\u5207\u74E6\u8BED
+nya=\u9F50\u5207\u74E6\u6587
 nym=\u5C3C\u4E9A\u59C6\u97E6\u9F50\u6587
 nyn=\u5C3C\u6602\u79D1\u52D2\u6587
 nyo=\u5C3C\u7EA6\u7F57\u6587
@@ -557,18 +558,18 @@
 oji=\u5965\u5409\u5E03\u74E6\u6587
 ori=\u6B27\u91CC\u4E9A\u6587
 orm=\u963F\u66FC\u6587
-osa=\u5965\u8428\u683C\u8BED
+osa=\u5965\u8428\u683C\u6587
 oss=\u5965\u585E\u68AF\u6587
 ota=\u5965\u6258\u66FC\u571F\u8033\u5176\u6587
 oto=\u5965\u6258\u7C73\u8BED\u7CFB
 paa=\u5176\u4ED6\u5DF4\u5E03\u4E9A\u6587
-pag=\u90A6\u963F\u897F\u6960\u8BED
+pag=\u90A6\u963F\u897F\u6960\u6587
 pal=\u5E15\u62C9\u7EF4\u6587
 pam=\u90A6\u677F\u7259\u6587
 pan=\u65C1\u906E\u666E\u6587
 pap=\u5E15\u76AE\u4E9A\u95E8\u6258\u6587
 pau=\u5E15\u52B3\u6587
-peo=\u53E4\u8001\u6CE2\u65AF\u8BED
+peo=\u53E4\u8001\u6CE2\u65AF\u6587
 per=\u6CE2\u65AF\u6587
 phi=\u5176\u4ED6\u83F2\u5F8B\u5BBE\u8BED\u7CFB
 phn=\u8153\u5C3C\u57FA\u6587
@@ -577,14 +578,14 @@
 pon=\u6CE2\u7EB3\u4F69\u6587
 por=\u8461\u8404\u7259\u6587
 pra=\u666E\u62C9\u514B\u91CC\u7279\u8BF8\u8BED\u8A00
-pro=\u666E\u7F57\u6587\u65AF\u6587
+pro=\u53E4\u666E\u7F57\u65FA\u65AF\u6587 (\u81F3 1500 \u5E74)
 pus=\u666E\u4EC0\u56FE\u6587
 que=\u76D6\u4E18\u4E9A\u6587
 raj=\u62C9\u8D3E\u65AF\u5766\u6587
 rap=\u62C9\u5E15\u52AA\u4F0A\u6587
 rar=\u62C9\u7F57\u6C64\u52A0\u6587
 roa=\u5176\u4ED6\u62C9\u4E01\u8BED\u7CFB
-roh=\u7F57\u66FC\u4EC0\u8BED
+roh=\u7F57\u66FC\u4EC0\u6587
 rom=\u5409\u666E\u8D5B\u6587
 rum=\u7F57\u9A6C\u5C3C\u4E9A\u6587
 run=\u57FA\u9686\u8FEA\u6587
@@ -607,7 +608,7 @@
 sgn=\u624B\u8BED
 shn=\u63B8\u6587
 sid=\u6089\u8FBE\u6469\u6587
-sin=\u8F9B\u54C8\u62C9\u8BED
+sin=\u8F9B\u54C8\u62C9\u6587
 sio=\u82CF\u8BED\u8BF8\u8BED\u8A00
 sit=\u6C49\u85CF\u8BF8\u8BED\u8A00
 sla=\u5176\u4ED6\u65AF\u62C9\u592B\u8BED\u7CFB
@@ -616,20 +617,20 @@
 sma=\u5357\u8428\u7C73\u6587
 sme=\u5317\u6C99\u5BC6\u6587
 smi=\u5176\u4ED6\u8428\u7C73\u6587
-smj=\u5F8B\u52D2\u6B27\u8428\u83AB\u65AF\u8BED
-smn=\u4F0A\u7EB3\u91CC\u8428\u7C73\u8BED
+smj=\u5F8B\u52D2\u6B27\u8428\u83AB\u65AF\u6587
+smn=\u4F0A\u7EB3\u91CC\u8428\u7C73\u6587
 smo=\u8428\u6469\u4E9A\u6587
 sms=\u65AF\u79D1\u7279\u8428\u7C73\u6587
 sna=\u4FEE\u7EB3\u6587
 snd=\u4FE1\u5FB7\u6587
 snk=\u7D22\u5C3C\u57FA\u6587
-sog=\u53E4\u7C9F\u7279\u8BED
+sog=\u53E4\u7C9F\u7279\u6587
 som=\u7D22\u9A6C\u91CC\u6587
 son=\u6851\u6D77\u6587
-sot=\u7D22\u6258\u8BED, \u5357\u90E8
+sot=\u585E\u7D22\u6258\u6587
 spa=\u897F\u73ED\u7259\u6587
 srd=\u6492\u4E01\u6587
-srn=Sranan Tongo (\u6E90\u4E8E\u514B\u91CC\u5965\u5C14\u8BED)
+srn=\u82CF\u91CC\u5357\u6C64\u52A0\u6587
 srp=\u585E\u5C14\u7EF4\u4E9A\u6587
 srr=\u8C22\u5217\u5C14\u6587
 ssa=\u975E\u6D32\u6492\u54C8\u62C9\u6C99\u6F20\u8FB9\u7F18\u5730\u5E26\u8BED\u8A00
@@ -640,14 +641,14 @@
 sux=\u82CF\u9A6C\u6587
 swa=\u65AF\u74E6\u5E0C\u91CC\u6587
 swe=\u745E\u5178\u6587
-syc=\u53E4\u5178\u53D9\u5229\u4E9A\u8BED
-syr=\u53D9\u5229\u4E9A\u8BED
+syc=\u53E4\u5178\u53D9\u5229\u4E9A\u6587
+syr=\u53D9\u5229\u4E9A\u6587
 tah=\u5854\u5E0C\u63D0\u6587
 tai=\u50A3\u8BED\u8BF8\u8BED\u8A00 (\u5176\u4ED6)
 tam=\u6CF0\u7C73\u5C14\u6587
 tat=\u9791\u977C\u6587
 tel=\u6CF0\u5362\u56FA\u6587
-tem=\u6ED5\u5185\u8BED
+tem=\u6ED5\u5185\u6587
 ter=\u7279\u5217\u7EB3\u6587
 tet=\u7279\u5854\u59C6\u6587
 tgk=\u5854\u5409\u514B\u6587
@@ -662,7 +663,7 @@
 tli=\u7279\u6797\u5409\u7279\u6587
 tmh=\u5854\u9A6C\u5947\u514B\u6587
 tog=\u6C64\u52A0\u6587 (\u5C3C\u4E9A\u8428\u5730\u533A)
-ton=\u6C64\u52A0\u8BED (\u6C64\u52A0\u5C9B)
+ton=\u6C64\u52A0\u6587 (\u6C64\u52A0\u5C9B)
 tpi=\u6258\u514B\u76AE\u8F9B\u6587
 tsi=\u8482\u59C6\u897F\u4E9A\u6587
 tsn=\u7A81\u5C3C\u65AF\u6587
@@ -709,20 +710,20 @@
 zha=\u58EE\u6587
 znd=\u8D5E\u5FB7\u6587
 zul=\u7956\u9C81\u6587
-zun=\u7956\u5C3C\u8BED
+zun=\u7956\u5C3C\u6587
 zxx=\u65E0\u8BED\u8A00\u5185\u5BB9
-zza=\u624E\u624E\u8BED
+zza=\u624E\u624E\u6587
 
 # script names
 # key is ISO 15924 script code
 
 Arab=\u963F\u62C9\u4F2F\u6587
-Armi=\u7687\u5BB6\u4E9A\u62C9\u59C6\u8BED
+Armi=\u7687\u5BB6\u4E9A\u62C9\u59C6\u6587
 Armn=\u4E9A\u7F8E\u5C3C\u4E9A\u6587
-Avst=\u963F\u7EF4\u65AF\u9640\u8BED
+Avst=\u963F\u7EF4\u65AF\u9640\u6587
 Bali=\u5DF4\u91CC\u6587
-Bamu=\u5DF4\u59C6\u7A46\u8BED
-Bass=\u5DF4\u8428\u74E6\u8D6B\u8BED
+Bamu=\u5DF4\u59C6\u7A46\u6587
+Bass=\u5DF4\u8428\u74E6\u8D6B\u6587
 Batk=\u5DF4\u5854\u514B\u6587
 Beng=\u5B5F\u52A0\u62C9\u6587
 Blis=\u5E03\u5217\u65AF\u7B26\u53F7
@@ -730,133 +731,133 @@
 Brah=\u5A46\u7F57\u7C73\u6587\u5B57
 Brai=\u5E03\u83B1\u53F6\u76F2\u6587
 Bugi=\u5E03\u5409\u6587
-Buhd=\u5E03\u5E0C\u5FB7\u8BED
-Cakm=\u67E5\u514B\u9A6C\u8BED
+Buhd=\u5E03\u5E0C\u5FB7\u6587
+Cakm=\u67E5\u514B\u9A6C\u6587
 Cans=\u52A0\u62FF\u5927\u571F\u8457\u7EDF\u4E00\u7B26\u53F7\u8BED
-Cari=\u5361\u91CC\u4E9A\u8BED
-Cham=\u5360\u8BED
+Cari=\u5361\u91CC\u4E9A\u6587
+Cham=\u5360\u6587
 Cher=\u5F7B\u7F57\u57FA\u6587
 Cirt=\u8272\u65AF\u6587
-Copt=\u514B\u666E\u7279\u8BED
-Cprt=\u585E\u6D66\u8DEF\u65AF\u8BED
-Cyrl=\u897F\u91CC\u5C14\u8BED
+Copt=\u514B\u666E\u7279\u6587
+Cprt=\u585E\u6D66\u8DEF\u65AF\u6587
+Cyrl=\u897F\u91CC\u5C14\u6587
 Cyrs=\u897F\u91CC\u5C14\u6587\u5B57 (\u53E4\u6559\u4F1A\u65AF\u62C9\u592B\u8BED\u7684\u53D8\u4F53)
 Deva=\u68B5\u6587
 Dsrt=\u5FB7\u585E\u83B1\u7279\u6587
 Dupl=Duployan \u901F\u8BB0
-Egyd=\u540E\u671F\u57C3\u53CA\u8BED
+Egyd=\u540E\u671F\u57C3\u53CA\u6587
 Egyh=\u53E4\u57C3\u53CA\u50E7\u4FA3\u4E66\u5199\u4F53
 Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587
 Elba=\u7231\u5C14\u5DF4\u6851
-Ethi=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u8BED
+Ethi=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u6587
 Geok=\u52AA\u65AF\u514B\u80E1\u91CC\u6587
 Geor=\u683C\u9C81\u5409\u4E9A\u6587
-Glag=\u683C\u62C9\u54E5\u91CC\u8BED
+Glag=\u683C\u62C9\u54E5\u91CC\u6587
 Goth=\u54E5\u7279\u6587
 Gran=\u5404\u5170\u7279\u54C8\u6587\u5B57
 Grek=\u5E0C\u814A\u6587
 Gujr=\u53E4\u52A0\u62C9\u63D0\u6587
-Guru=\u679C\u9C81\u7A46\u5947\u8BED
+Guru=\u679C\u9C81\u7A46\u5947\u6587
 Hang=\u97E9\u6587
-Hani=\u6C49\u8BED
-Hano=\u6C49\u5974\u7F57\u8BED
+Hani=\u6C49\u6587
+Hano=\u6C49\u5974\u7F57\u6587
 Hans=\u7B80\u4F53\u4E2D\u6587
 Hant=\u7E41\u4F53\u4E2D\u6587
 Hebr=\u5E0C\u4F2F\u6765\u6587
 Hira=\u5E73\u5047\u540D
 Hmng=\u6768\u677E\u5F55\u82D7\u6587
 Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D
-Hung=\u53E4\u5308\u7259\u5229\u8BED
+Hung=\u53E4\u5308\u7259\u5229\u6587
 Inds=\u5370\u5EA6\u6CB3\u6587\u5B57
-Ital=\u53E4\u610F\u5927\u5229\u8BED
+Ital=\u53E4\u610F\u5927\u5229\u6587
 Java=\u722A\u54C7\u6587
 Jpan=\u65E5\u6587
 Kali=\u514B\u8036\u674E\u6587\u5B57
 Kana=\u7247\u5047\u540D
 Khar=\u5361\u7F57\u987B\u63D0\u6587
 Khmr=\u67EC\u57D4\u5BE8\u6587
-Knda=\u57C3\u7EB3\u5FB7\u6587
+Knda=\u5361\u7EB3\u5854\u514B\u6587
 Kore=\u97E9\u6587
 Kpel=\u514B\u4F69\u5217\u6587
-Kthi=\u5361\u7F57\u987B\u63D0\u8BED
-Lana=\u5170\u62FF\u8BED
-Laoo=\u8001\u631D\u8BED
+Kthi=\u5361\u7F57\u987B\u63D0\u6587
+Lana=\u5170\u62FF\u6587
+Laoo=\u8001\u631D\u6587
 Latf=\u62C9\u4E01\u6587 (\u54E5\u7279\u5F0F\u5B57\u4F53\u53D8\u4F53)
 Latg=\u62C9\u4E01\u6587 (\u76D6\u5C14\u8BED\u53D8\u4F53)
 Latn=\u62C9\u4E01\u6587
-Lepc=\u96F7\u5E03\u67E5\u8BED
-Limb=\u6797\u5E03\u8BED
+Lepc=\u96F7\u5E03\u67E5\u6587
+Limb=\u6797\u5E03\u6587
 Lina=\u7EBF\u5F62\u6587\u5B57 A
 Linb=\u7EBF\u5F62\u6587\u5B57 B
-Lisu=\u5088\u50F3\u8BED
-Loma=\u6D1B\u9A6C\u8BED
-Lyci=\u5229\u897F\u4E9A\u8BED
-Lydi=\u5415\u5E95\u4E9A\u8BED
+Lisu=\u5088\u50F3\u6587
+Loma=\u6D1B\u9A6C\u6587
+Lyci=\u5229\u897F\u4E9A\u6587
+Lydi=\u5415\u5E95\u4E9A\u6587
 Mand=\u66FC\u8FBE\u6587
 Mani=\u6469\u5C3C\u6559\u6587
 Maya=\u739B\u96C5\u5723\u7B26\u6587
 Mend=\u95E8\u8FEA\u6587
 Merc=\u9EA6\u82E5\u63D0\u514B\u6587\u8349\u4F53
 Mero=\u9EA6\u82E5\u63D0\u514B\u6587
-Mlym=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587
+Mlym=\u9A6C\u62C9\u4E9A\u62C9\u59C6\u6587
 Mong=\u8499\u53E4\u6587
 Moon=\u6708\u4EAE\u4F53
-Mtei=\u66FC\u5C3C\u666E\u5C14\u8BED
+Mtei=\u66FC\u5C3C\u666E\u5C14\u6587
 Mymr=\u7F05\u7538
-Narb=\u53E4\u5317\u963F\u62C9\u4F2F\u8BED
-Nbat=\u7EB3\u5DF4\u6CF0\u8BED
-Nkgb=\u7EB3\u897F\u54E5\u5DF4\u8BED
-Nkoo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
-Ogam=\u6B27\u7518\u8BED
+Narb=\u53E4\u5317\u963F\u62C9\u4F2F\u6587
+Nbat=\u7EB3\u5DF4\u6CF0\u6587
+Nkgb=\u7EB3\u897F\u54E5\u5DF4\u6587
+Nkoo=N'Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00)
+Ogam=\u6B27\u7518\u6587
 Olck=\u6851\u5854\u5229\u6587
 Orkh=\u9102\u5C14\u6D51\u6587
-Orya=\u5965\u8428\u683C\u6587
-Osma=\u5965\u65AF\u66FC\u4E9A\u8BED
-Palm=\u5E15\u5C14\u8FC8\u62C9\u8BED
+Orya=\u5965\u91CC\u4E9A\u6587
+Osma=\u5965\u65AF\u66FC\u4E9A\u6587
+Palm=\u5E15\u5C14\u8FC8\u62C9\u6587
 Perm=\u53E4\u5F7C\u5C14\u59C6\u8BF8\u8BED
 Phag=\u516B\u601D\u5DF4\u6587
-Phli=\u7891\u94ED\u4F53\u5DF4\u5217\u7EF4\u8BED
-Phlp=\u8BD7\u4F53\u5DF4\u5217\u7EF4\u8BED
-Phlv=\u4E66\u4F53\u5DF4\u5217\u7EF4\u8BED
+Phli=\u7891\u94ED\u4F53\u5DF4\u5217\u7EF4\u6587
+Phlp=\u8BD7\u4F53\u5DF4\u5217\u7EF4\u6587
+Phlv=\u4E66\u4F53\u5DF4\u5217\u7EF4\u6587
 Phnx=\u8153\u5C3C\u57FA\u6587
 Plrd=\u82D7\u6587
-Prti=\u7891\u94ED\u4F53\u5E15\u63D0\u4E9A\u8BED
-Rjng=\u62C9\u8BA9\u8BED
+Prti=\u7891\u94ED\u4F53\u5E15\u63D0\u4E9A\u6587
+Rjng=\u62C9\u8BA9\u6587
 Roro=\u6717\u683C\u6717\u683C\u6587
 Runr=\u53E4\u4EE3\u5317\u6B27\u6587
-Samr=\u6492\u739B\u5229\u4E9A\u8BED
+Samr=\u6492\u739B\u5229\u4E9A\u6587
 Sara=\u6C99\u62C9\u5824\u6587
-Sarb=\u53E4\u5357\u963F\u62C9\u4F2F\u8BED
-Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u8BED
+Sarb=\u53E4\u5357\u963F\u62C9\u4F2F\u6587
+Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u6587
 Sgnw=\u4E66\u5199\u7B26\u53F7
-Shaw=\u8427\u4F2F\u7EB3\u5F0F\u8BED
+Shaw=\u8427\u4F2F\u7EB3\u5F0F\u6587
 Sind=\u4FE1\u5FB7\u6587
-Sinh=\u8F9B\u54C8\u62C9\u8BED
+Sinh=\u8F9B\u54C8\u62C9\u6587
 Sund=\u5DFD\u4ED6\u6587
 Sylo=Syloti Nagri \u4E66\u5199\u4F53
 Syrc=\u53D9\u5229\u4E9A\u6587
 Syre=\u798F\u97F3\u4F53\u53D9\u5229\u4E9A\u6587
-Syrj=\u897F\u53D9\u5229\u4E9A\u8BED
-Syrn=\u4E1C\u53D9\u5229\u4E9A\u8BED
-Tagb=\u5854\u683C\u73ED\u74E6\u8BED
-Tale=\u6CF0\u4E50\u8BED
+Syrj=\u897F\u53D9\u5229\u4E9A\u6587
+Syrn=\u4E1C\u53D9\u5229\u4E9A\u6587
+Tagb=\u5854\u683C\u73ED\u74E6\u6587
+Tale=\u6CF0\u4E50\u6587
 Talu=\u65B0\u50A3\u6587
 Taml=\u6CF0\u7C73\u5C14\u6587
-Tavt=\u8D8A\u5357\u50A3\u8BED
+Tavt=\u8D8A\u5357\u50A3\u6587
 Telu=\u6CF0\u5362\u56FA\u6587
 Teng=\u817E\u683C\u74E6\u6587\u5B57
 Tfng=\u63D0\u975E\u7EB3\u6587
 Tglg=\u5854\u52A0\u8DEF\u65CF\u6587
-Thaa=\u5854\u5B89\u5A1C\u8BED
+Thaa=\u5854\u5B89\u5A1C\u6587
 Thai=\u6CF0\u6587
-Tibt=\u897F\u85CF\u6587
+Tibt=\u85CF\u6587
 Ugar=\u4E4C\u52A0\u91CC\u7279\u6587
-Vaii=\u74E6\u4F9D\u8BED
+Vaii=\u74E6\u4F0A\u6587
 Visp=\u53EF\u89C1\u8BED\u8A00
-Wara=Warang Citi
-Xpeo=\u53E4\u6CE2\u65AF\u8BED
+Wara=Warang Citi \u4F53
+Xpeo=\u53E4\u6CE2\u65AF\u6587
 Xsux=\u82CF\u7F8E\u5C14-\u963F\u5361\u5FB7\u6954\u5F62\u6587\u5B57
-Yiii=\u5F5D\u8BED
+Yiii=\u5F5D\u6587
 Zinh=\u9057\u4F20\u5B66\u672F\u8BED
 Zmth=\u6570\u5B66\u8BB0\u53F7
 Zsym=\u7B26\u53F7
@@ -867,256 +868,256 @@
 # country names
 # key is ISO 3166 country code
 
-AD=\u5b89\u9053\u5c14
-AE=\u963f\u62c9\u4f2f\u8054\u5408\u914b\u957f\u56fd
-AF=\u963f\u5bcc\u6c57
-AG=\u5b89\u63d0\u74dc\u548c\u5df4\u5e03\u8fbe
-AI=\u5b89\u572d\u62c9
-AL=\u963f\u5c14\u5df4\u5c3c\u4e9a
-AM=\u4e9a\u7f8e\u5c3c\u4e9a
-AN=\u8377\u5c5e\u5b89\u7684\u5217\u65af\u7fa4\u5c9b
-AO=\u5b89\u54e5\u62c9
-AQ=\u5357\u6781\u6d32
-AR=\u963f\u6839\u5ef7
-AS=\u4e1c\u8428\u6469\u4e9a
+AD=\u5B89\u9053\u5C14
+AE=\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD
+AF=\u963F\u5BCC\u6C57
+AG=\u5B89\u63D0\u74DC\u548C\u5DF4\u5E03\u8FBE
+AI=\u5B89\u572D\u62C9
+AL=\u963F\u5C14\u5DF4\u5C3C\u4E9A
+AM=\u4E9A\u7F8E\u5C3C\u4E9A
+AN=\u8377\u5C5E\u5B89\u7684\u5217\u65AF\u7FA4\u5C9B
+AO=\u5B89\u54E5\u62C9
+AQ=\u5357\u6781\u6D32
+AR=\u963F\u6839\u5EF7
+AS=\u4E1C\u8428\u6469\u4E9A
 AT=\u5965\u5730\u5229
-AU=\u6fb3\u5927\u5229\u4e9a
-AW=\u963f\u9c81\u5df4
-AX=\u5965\u5170\u7fa4\u5c9b
-AZ=\u963f\u585e\u62dc\u7586
-BA=\u6ce2\u65af\u5c3c\u4e9a\u548c\u9ed1\u5c71\u5171\u548c\u56fd
-BB=\u5df4\u5df4\u591a\u65af
-BD=\u5b5f\u52a0\u62c9
-BE=\u6bd4\u5229\u65f6
-BF=\u5e03\u57fa\u7eb3\u6cd5\u7d22
-BG=\u4fdd\u52a0\u5229\u4e9a
-BH=\u5df4\u6797
-BI=\u5e03\u9686\u8fea
-BJ=\u8d1d\u5b81
+AU=\u6FB3\u5927\u5229\u4E9A
+AW=\u963F\u9C81\u5DF4
+AX=\u5965\u5170\u7FA4\u5C9B
+AZ=\u963F\u585E\u62DC\u7586
+BA=\u6CE2\u65AF\u5C3C\u4E9A\u548C\u9ED1\u5C71\u5171\u548C\u56FD
+BB=\u5DF4\u5DF4\u591A\u65AF
+BD=\u5B5F\u52A0\u62C9
+BE=\u6BD4\u5229\u65F6
+BF=\u5E03\u57FA\u7EB3\u6CD5\u7D22
+BG=\u4FDD\u52A0\u5229\u4E9A
+BH=\u5DF4\u6797
+BI=\u5E03\u9686\u8FEA
+BJ=\u8D1D\u5B81
 BL=\u5723\u5DF4\u6CF0\u52D2\u7C73\u5C9B
-BM=\u767e\u6155\u5927
-BN=\u6587\u83b1
-BO=\u73bb\u5229\u7ef4\u4e9a
+BM=\u767E\u6155\u5927
+BN=\u6587\u83B1
+BO=\u73BB\u5229\u7EF4\u4E9A
 BQ=\u535A\u5948\u5C14\u5C9B, \u5723\u5C24\u65AF\u7279\u6B47\u65AF\u5C9B\u548C\u8428\u5DF4\u5C9B
-BR=\u5df4\u897f
-BS=\u5df4\u54c8\u9a6c
-BT=\u4e0d\u4e39
-BV=\u5e03\u97e6\u5c9b
-BW=\u535a\u8328\u74e6\u7eb3
-BY=\u767d\u4fc4\u7f57\u65af
-BZ=\u4f2f\u91cc\u5179
-CA=\u52a0\u62ff\u5927
-CC=\u79d1\u5e93\u65af\u7fa4\u5c9b
-CD=\u521a\u679c\u6c11\u4e3b\u5171\u548c\u56fd
-CF=\u4e2d\u975e\u5171\u548c\u56fd
-CG=\u521a\u679c
-CH=\u745e\u58eb
-CI=\u8c61\u7259\u6d77\u5cb8
-CK=\u5e93\u514b\u7fa4\u5c9b
-CL=\u667a\u5229
-CM=\u5580\u9ea6\u9686
-CN=\u4e2d\u56fd
-CO=\u54e5\u4f26\u6bd4\u4e9a
-CR=\u54e5\u65af\u8fbe\u9ece\u52a0
-CS=\u585e\u5c14\u7ef4\u4e9a\u53ca\u9ed1\u5c71
-CU=\u53e4\u5df4
-CV=\u4f5b\u5f97\u89d2
+BR=\u5DF4\u897F
+BS=\u5DF4\u54C8\u9A6C
+BT=\u4E0D\u4E39
+BV=\u5E03\u97E6\u5C9B
+BW=\u535A\u8328\u74E6\u7EB3
+BY=\u767D\u4FC4\u7F57\u65AF
+BZ=\u4F2F\u91CC\u5179
+CA=\u52A0\u62FF\u5927
+CC=\u79D1\u5E93\u65AF\u7FA4\u5C9B
+CD=\u521A\u679C\u6C11\u4E3B\u5171\u548C\u56FD
+CF=\u4E2D\u975E\u5171\u548C\u56FD
+CG=\u521A\u679C
+CH=\u745E\u58EB
+CI=\u79D1\u7279\u8FEA\u74E6
+CK=\u5E93\u514B\u7FA4\u5C9B
+CL=\u667A\u5229
+CM=\u5580\u9EA6\u9686
+CN=\u4E2D\u56FD
+CO=\u54E5\u4F26\u6BD4\u4E9A
+CR=\u54E5\u65AF\u8FBE\u9ECE\u52A0
+CS=\u585E\u5C14\u7EF4\u4E9A\u53CA\u9ED1\u5C71
+CU=\u53E4\u5DF4
+CV=\u4F5B\u5F97\u89D2
 CW=\u5E93\u62C9\u7D22\u5C9B
-CX=\u5723\u8bde\u5c9b
-CY=\u585e\u6d66\u8def\u65af
-CZ=\u6377\u514b\u5171\u548c\u56fd
-DE=\u5fb7\u56fd
-DJ=\u5409\u5e03\u63d0
-DK=\u4e39\u9ea6
-DM=\u591a\u7c73\u5c3c\u52a0\u8054\u90a6
-DO=\u591a\u7c73\u5c3c\u52a0\u5171\u548c\u56fd
-DZ=\u963f\u5c14\u53ca\u5229\u4e9a
-EC=\u5384\u74dc\u591a\u5c14
-EE=\u7231\u6c99\u5c3c\u4e9a
-EG=\u57c3\u53ca
-EH=\u897f\u6492\u54c8\u62c9
-ER=\u5384\u91cc\u7279\u5c3c\u4e9a
-ES=\u897f\u73ed\u7259
-ET=\u57c3\u585e\u4fc4\u6bd4\u4e9a
-FI=\u82ac\u5170
-FJ=\u6590\u6d4e
-FK=\u5bcc\u514b\u5170\u7fa4\u5c9b
-FM=\u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a
-FO=\u6cd5\u7f57\u7fa4\u5c9b
-FR=\u6cd5\u56fd
-GA=\u52a0\u84ec
-GB=\u82f1\u56fd
-GD=\u683c\u6797\u7eb3\u8fbe
-GE=\u683c\u9c81\u5409\u4e9a
-GF=\u6cd5\u5c5e\u572d\u4e9a\u90a3
+CX=\u5723\u8BDE\u5C9B
+CY=\u585E\u6D66\u8DEF\u65AF
+CZ=\u6377\u514B\u5171\u548C\u56FD
+DE=\u5FB7\u56FD
+DJ=\u5409\u5E03\u63D0
+DK=\u4E39\u9EA6
+DM=\u591A\u7C73\u5C3C\u52A0\u8054\u90A6
+DO=\u591A\u7C73\u5C3C\u52A0\u5171\u548C\u56FD
+DZ=\u963F\u5C14\u53CA\u5229\u4E9A
+EC=\u5384\u74DC\u591A\u5C14
+EE=\u7231\u6C99\u5C3C\u4E9A
+EG=\u57C3\u53CA
+EH=\u897F\u6492\u54C8\u62C9
+ER=\u5384\u91CC\u7279\u5C3C\u4E9A
+ES=\u897F\u73ED\u7259
+ET=\u57C3\u585E\u4FC4\u6BD4\u4E9A
+FI=\u82AC\u5170
+FJ=\u6590\u6D4E
+FK=\u5BCC\u514B\u5170\u7FA4\u5C9B
+FM=\u5BC6\u514B\u7F57\u5C3C\u897F\u4E9A
+FO=\u6CD5\u7F57\u7FA4\u5C9B
+FR=\u6CD5\u56FD
+GA=\u52A0\u84EC
+GB=\u82F1\u56FD
+GD=\u683C\u6797\u7EB3\u8FBE
+GE=\u683C\u9C81\u5409\u4E9A
+GF=\u6CD5\u5C5E\u572D\u4E9A\u90A3
 GG=\u683C\u6069\u897F\u5C9B
-GH=\u52a0\u7eb3
-GI=\u76f4\u5e03\u7f57\u9640
-GL=\u683c\u9675\u5170
-GM=\u5188\u6bd4\u4e9a
-GN=\u51e0\u5185\u4e9a
-GP=\u74dc\u5fb7\u7f57\u666e\u5c9b
-GQ=\u8d64\u9053\u51e0\u5185\u4e9a
-GR=\u5e0c\u814a
-GS=\u5357\u4e54\u6cbb\u4e9a\u5c9b\u548c\u5357\u6851\u5fb7\u97e6\u5947\u5c9b
-GT=\u5371\u5730\u9a6c\u62c9
-GU=\u5173\u5c9b
-GW=\u51e0\u5185\u4e9a\u6bd4\u7ecd\u5171\u548c\u56fd
-GY=\u572d\u4e9a\u90a3
-HK=\u9999\u6e2f
-HM=\u8d6b\u5fb7\u548c\u9ea6\u514b\u5510\u7eb3\u7fa4\u5c9b
-HN=\u6d2a\u90fd\u62c9\u65af
-HR=\u514b\u7f57\u5730\u4e9a
-HT=\u6d77\u5730
+GH=\u52A0\u7EB3
+GI=\u76F4\u5E03\u7F57\u9640
+GL=\u683C\u9675\u5170
+GM=\u5188\u6BD4\u4E9A
+GN=\u51E0\u5185\u4E9A
+GP=\u74DC\u5FB7\u7F57\u666E\u5C9B
+GQ=\u8D64\u9053\u51E0\u5185\u4E9A
+GR=\u5E0C\u814A
+GS=\u5357\u4E54\u6CBB\u4E9A\u5C9B\u548C\u5357\u6851\u5FB7\u97E6\u5947\u5C9B
+GT=\u5371\u5730\u9A6C\u62C9
+GU=\u5173\u5C9B
+GW=\u51E0\u5185\u4E9A\u6BD4\u7ECD\u5171\u548C\u56FD
+GY=\u572D\u4E9A\u90A3
+HK=\u9999\u6E2F
+HM=\u8D6B\u5FB7\u548C\u9EA6\u514B\u5510\u7EB3\u7FA4\u5C9B
+HN=\u6D2A\u90FD\u62C9\u65AF
+HR=\u514B\u7F57\u5730\u4E9A
+HT=\u6D77\u5730
 HU=\u5308\u7259\u5229
-ID=\u5370\u5ea6\u5c3c\u897f\u4e9a
-IE=\u7231\u5c14\u5170
-IL=\u4ee5\u8272\u5217
+ID=\u5370\u5EA6\u5C3C\u897F\u4E9A
+IE=\u7231\u5C14\u5170
+IL=\u4EE5\u8272\u5217
 IM=\u66FC\u5C9B
-IN=\u5370\u5ea6
-IO=\u82f1\u5c5e\u5370\u5ea6\u6d0b\u9886\u5730
-IQ=\u4f0a\u62c9\u514b
-IR=\u4f0a\u6717
-IS=\u51b0\u5c9b
-IT=\u610f\u5927\u5229
+IN=\u5370\u5EA6
+IO=\u82F1\u5C5E\u5370\u5EA6\u6D0B\u9886\u5730
+IQ=\u4F0A\u62C9\u514B
+IR=\u4F0A\u6717
+IS=\u51B0\u5C9B
+IT=\u610F\u5927\u5229
 JE=\u6CFD\u897F\u5C9B
-JM=\u7259\u4e70\u52a0
-JO=\u7ea6\u65e6
-JP=\u65e5\u672c
-KE=\u80af\u5c3c\u4e9a
-KG=\u5409\u5c14\u5409\u514b\u65af\u5766
-KH=\u67ec\u57d4\u5be8
-KI=\u57fa\u91cc\u5df4\u65af
-KM=\u79d1\u6469\u7f57
-KN=\u5723\u57fa\u8328\u548c\u5c3c\u7ef4\u65af
-KP=\u671d\u9c9c
-KR=\u97e9\u56fd
-KW=\u79d1\u5a01\u7279
-KY=\u5f00\u66fc\u7fa4\u5c9b
-KZ=\u54c8\u8428\u514b\u65af\u5766
-LA=\u8001\u631d
-LB=\u9ece\u5df4\u5ae9
-LC=\u5723\u5362\u897f\u4e9a
-LI=\u5217\u652f\u6566\u58eb\u767b
-LK=\u65af\u91cc\u5170\u5361
-LR=\u5229\u6bd4\u91cc\u4e9a
-LS=\u83b1\u7d22\u6258
-LT=\u7acb\u9676\u5b9b
-LU=\u5362\u68ee\u5821
-LV=\u62c9\u8131\u7ef4\u4e9a
-LY=\u5229\u6bd4\u4e9a
-MA=\u6469\u6d1b\u54e5
-MC=\u6469\u7eb3\u54e5
-MD=\u6469\u5c14\u591a\u74e6
-ME=\u9ed1\u5c71
+JM=\u7259\u4E70\u52A0
+JO=\u7EA6\u65E6
+JP=\u65E5\u672C
+KE=\u80AF\u5C3C\u4E9A
+KG=\u5409\u5C14\u5409\u514B\u65AF\u5766
+KH=\u67EC\u57D4\u5BE8
+KI=\u57FA\u91CC\u5DF4\u65AF
+KM=\u79D1\u6469\u7F57
+KN=\u5723\u57FA\u8328\u548C\u5C3C\u7EF4\u65AF
+KP=\u671D\u9C9C
+KR=\u97E9\u56FD
+KW=\u79D1\u5A01\u7279
+KY=\u5F00\u66FC\u7FA4\u5C9B
+KZ=\u54C8\u8428\u514B\u65AF\u5766
+LA=\u8001\u631D
+LB=\u9ECE\u5DF4\u5AE9
+LC=\u5723\u5362\u897F\u4E9A
+LI=\u5217\u652F\u6566\u58EB\u767B
+LK=\u65AF\u91CC\u5170\u5361
+LR=\u5229\u6BD4\u91CC\u4E9A
+LS=\u83B1\u7D22\u6258
+LT=\u7ACB\u9676\u5B9B
+LU=\u5362\u68EE\u5821
+LV=\u62C9\u8131\u7EF4\u4E9A
+LY=\u5229\u6BD4\u4E9A
+MA=\u6469\u6D1B\u54E5
+MC=\u6469\u7EB3\u54E5
+MD=\u6469\u5C14\u591A\u74E6
+ME=\u9ED1\u5C71
 MF=\u5723\u9A6C\u4E01
-MG=\u9a6c\u8fbe\u52a0\u65af\u52a0
-MH=\u9a6c\u7ecd\u5c14\u7fa4\u5c9b
-MK=\u9a6c\u5176\u987f\u738b\u56fd
-ML=\u9a6c\u91cc
-MM=\u7f05\u7538
-MN=\u8499\u53e4
-MO=\u6fb3\u95e8\u7279\u533a
-MP=\u7f8e\u5c5e\u5317\u9a6c\u91cc\u4e9a\u7eb3\u7fa4\u5c9b
-MQ=\u9a6c\u63d0\u5c3c\u514b\u5c9b
-MR=\u6bdb\u91cc\u5854\u5c3c\u4e9a
-MS=\u8499\u7279\u585e\u62c9\u7fa4\u5c9b
-MT=\u9a6c\u8033\u4ed6
-MU=\u6bdb\u91cc\u6c42\u65af
-MV=\u9a6c\u5c14\u4ee3\u592b
-MW=\u9a6c\u62c9\u7ef4
-MX=\u58a8\u897f\u54e5
-MY=\u9a6c\u6765\u897f\u4e9a
-MZ=\u83ab\u6851\u6bd4\u514b
-NA=\u7eb3\u7c73\u6bd4\u4e9a
-NC=\u65b0\u514b\u91cc\u591a\u5c3c\u4e9a\u7fa4\u5c9b
-NE=\u5c3c\u65e5\u5c14
-NF=\u8bfa\u798f\u514b\u5c9b
-NG=\u5c3c\u65e5\u5229\u4e9a
-NI=\u5c3c\u52a0\u62c9\u74dc
+MG=\u9A6C\u8FBE\u52A0\u65AF\u52A0
+MH=\u9A6C\u7ECD\u5C14\u7FA4\u5C9B
+MK=\u9A6C\u5176\u987F\u738B\u56FD
+ML=\u9A6C\u91CC
+MM=\u7F05\u7538
+MN=\u8499\u53E4
+MO=\u6FB3\u95E8\u7279\u533A
+MP=\u7F8E\u5C5E\u5317\u9A6C\u91CC\u4E9A\u7EB3\u7FA4\u5C9B
+MQ=\u9A6C\u63D0\u5C3C\u514B\u5C9B
+MR=\u6BDB\u91CC\u5854\u5C3C\u4E9A
+MS=\u8499\u7279\u585E\u62C9\u7FA4\u5C9B
+MT=\u9A6C\u8033\u4ED6
+MU=\u6BDB\u91CC\u6C42\u65AF
+MV=\u9A6C\u5C14\u4EE3\u592B
+MW=\u9A6C\u62C9\u7EF4
+MX=\u58A8\u897F\u54E5
+MY=\u9A6C\u6765\u897F\u4E9A
+MZ=\u83AB\u6851\u6BD4\u514B
+NA=\u7EB3\u7C73\u6BD4\u4E9A
+NC=\u65B0\u514B\u91CC\u591A\u5C3C\u4E9A\u7FA4\u5C9B
+NE=\u5C3C\u65E5\u5C14
+NF=\u8BFA\u798F\u514B\u5C9B
+NG=\u5C3C\u65E5\u5229\u4E9A
+NI=\u5C3C\u52A0\u62C9\u74DC
 NL=\u8377\u5170
-NO=\u632a\u5a01
-NP=\u5c3c\u6cca\u5c14
-NR=\u7459\u9c81
-NU=\u7ebd\u57c3\u5c9b
-NZ=\u65b0\u897f\u5170
-OM=\u963f\u66fc
-PA=\u5df4\u62ff\u9a6c
-PE=\u79d8\u9c81
-PF=\u6cd5\u5c5e\u73bb\u5229\u5c3c\u897f\u4e9a
-PG=\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a
-PH=\u83f2\u5f8b\u5bbe
-PK=\u5df4\u57fa\u65af\u5766
-PL=\u6ce2\u5170
-PM=\u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686\u7fa4\u5c9b
-PN=\u76ae\u7279\u514b\u6069\u5c9b
-PR=\u6ce2\u591a\u9ece\u54e5
-PS=\u5df4\u52d2\u65af\u5766
+NO=\u632A\u5A01
+NP=\u5C3C\u6CCA\u5C14
+NR=\u7459\u9C81
+NU=\u7EBD\u57C3\u5C9B
+NZ=\u65B0\u897F\u5170
+OM=\u963F\u66FC
+PA=\u5DF4\u62FF\u9A6C
+PE=\u79D8\u9C81
+PF=\u6CD5\u5C5E\u73BB\u5229\u5C3C\u897F\u4E9A
+PG=\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A
+PH=\u83F2\u5F8B\u5BBE
+PK=\u5DF4\u57FA\u65AF\u5766
+PL=\u6CE2\u5170
+PM=\u5723\u76AE\u57C3\u5C14\u548C\u5BC6\u514B\u9686\u7FA4\u5C9B
+PN=\u76AE\u7279\u514B\u6069\u5C9B
+PR=\u6CE2\u591A\u9ECE\u54E5
+PS=\u5DF4\u52D2\u65AF\u5766
 PT=\u8461\u8404\u7259
-PW=\u5e15\u52b3
-PY=\u5df4\u62c9\u572d
-QA=\u5361\u5854\u5c14
-RE=\u7559\u5c3c\u6c6a\u5c9b
-RO=\u7f57\u9a6c\u5c3c\u4e9a
-RS=\u585e\u5c14\u7ef4\u4e9a
-RU=\u4fc4\u7f57\u65af
-RW=\u5362\u65fa\u8fbe
-SA=\u6c99\u7279\u963f\u62c9\u4f2f
-SB=\u6240\u7f57\u95e8\u7fa4\u5c9b
-SC=\u585e\u820c\u5c14\u7fa4\u5c9b
-SD=\u82cf\u4e39
-SE=\u745e\u5178
-SG=\u65b0\u52a0\u5761
-SH=\u5723\u8d6b\u52d2\u62ff\u5c9b
-SI=\u65af\u6d1b\u6587\u5c3c\u4e9a
-SJ=\u65af\u74e6\u5c14\u5df4\u7279\u548c\u626c\u9a6c\u5ef6\u5c9b
-SK=\u65af\u6d1b\u4f10\u514b
-SL=\u585e\u62c9\u91cc\u6602
-SM=\u5723\u9a6c\u529b\u8bfa
-SN=\u585e\u5185\u52a0\u5c14
-SO=\u7d22\u9a6c\u91cc
-SR=\u82cf\u91cc\u5357
-ST=\u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4
-SV=\u8428\u5c14\u74e6\u591a
+PW=\u5E15\u52B3
+PY=\u5DF4\u62C9\u572D
+QA=\u5361\u5854\u5C14
+RE=\u7559\u5C3C\u6C6A\u5C9B
+RO=\u7F57\u9A6C\u5C3C\u4E9A
+RS=\u585E\u5C14\u7EF4\u4E9A
+RU=\u4FC4\u7F57\u65AF
+RW=\u5362\u65FA\u8FBE
+SA=\u6C99\u7279\u963F\u62C9\u4F2F
+SB=\u6240\u7F57\u95E8\u7FA4\u5C9B
+SC=\u585E\u820C\u5C14\u7FA4\u5C9B
+SD=\u82CF\u4E39
+SE=\u745E\u5178
+SG=\u65B0\u52A0\u5761
+SH=\u5723\u8D6B\u52D2\u62FF\u5C9B
+SI=\u65AF\u6D1B\u6587\u5C3C\u4E9A
+SJ=\u65AF\u74E6\u5C14\u5DF4\u7279\u548C\u626C\u9A6C\u5EF6\u5C9B
+SK=\u65AF\u6D1B\u4F10\u514B
+SL=\u585E\u62C9\u91CC\u6602
+SM=\u5723\u9A6C\u529B\u8BFA
+SN=\u585E\u5185\u52A0\u5C14
+SO=\u7D22\u9A6C\u91CC
+SR=\u82CF\u91CC\u5357
+ST=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4
+SV=\u8428\u5C14\u74E6\u591A
 SX=\u8377\u5C5E\u5723\u9A6C\u4E01\u5C9B
-SY=\u53d9\u5229\u4e9a
-SZ=\u65af\u5a01\u58eb\u5170
-TC=\u7279\u514b\u65af\u7fa4\u5c9b\u548c\u51ef\u79d1\u65af\u7fa4\u5c9b
-TD=\u4e4d\u5f97
-TF=\u6cd5\u5c5e\u5357\u7279\u7acb\u5c3c\u8fbe
-TG=\u591a\u54e5
-TH=\u6cf0\u56fd
-TJ=\u5854\u5409\u514b\u65af\u5766
-TK=\u8054\u5408\u7fa4\u5c9b
-TL=\u4e1c\u5e1d\u6c76
-TM=\u571f\u5e93\u66fc\u65af\u5766
-TN=\u7a81\u5c3c\u65af
-TO=\u6c64\u52a0
-TR=\u571f\u8033\u5176
-TT=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5
-TV=\u56fe\u74e6\u5362
-TW=\u53f0\u6e7e\u5730\u533a
-TZ=\u5766\u6851\u5c3c\u4e9a
-UA=\u4e4c\u514b\u5170
-UG=\u4e4c\u5e72\u8fbe
-UM=\u7f8e\u5c5e\u5c0f\u5965\u7279\u5170\u7fa4\u5c9b
-US=\u7f8e\u56fd
-UY=\u4e4c\u62c9\u572d
-UZ=\u4e4c\u5179\u522b\u514b\u65af\u5766
-VA=\u68b5\u8482\u5188
-VC=\u5723\u6587\u68ee\u7279\u548c\u683c\u6797\u7eb3\u4e01\u65af
-VE=\u59d4\u5185\u745e\u62c9
-VG=\u82f1\u5c5e\u7ef4\u4eac\u7fa4\u5c9b
-VI=\u7f8e\u5c5e\u7ef4\u4eac\u7fa4\u5c9b
-VN=\u8d8a\u5357
-VU=\u74e6\u52aa\u963f\u56fe
-WF=\u74e6\u5229\u65af\u7fa4\u5c9b\u548c\u5bcc\u56fe\u7eb3\u7fa4\u5c9b
-WS=\u4e1c\u8428\u6469\u4e9a
-YE=\u4e5f\u95e8
-YT=\u9a6c\u7ea6\u7279\u5c9b
-ZA=\u5357\u975e
-ZM=\u8d5e\u6bd4\u4e9a
-ZW=\u6d25\u5df4\u5e03\u97e6
+SY=\u53D9\u5229\u4E9A
+SZ=\u65AF\u5A01\u58EB\u5170
+TC=\u7279\u514B\u65AF\u7FA4\u5C9B\u548C\u51EF\u79D1\u65AF\u7FA4\u5C9B
+TD=\u4E4D\u5F97
+TF=\u6CD5\u5C5E\u5357\u7279\u7ACB\u5C3C\u8FBE
+TG=\u591A\u54E5
+TH=\u6CF0\u56FD
+TJ=\u5854\u5409\u514B\u65AF\u5766
+TK=\u6258\u514B\u52B3
+TL=\u4E1C\u5E1D\u6C76
+TM=\u571F\u5E93\u66FC\u65AF\u5766
+TN=\u7A81\u5C3C\u65AF
+TO=\u6C64\u52A0
+TR=\u571F\u8033\u5176
+TT=\u7279\u7ACB\u5C3C\u8FBE\u548C\u591A\u5DF4\u54E5
+TV=\u56FE\u74E6\u5362
+TW=\u53F0\u6E7E\u5730\u533A
+TZ=\u5766\u6851\u5C3C\u4E9A
+UA=\u4E4C\u514B\u5170
+UG=\u4E4C\u5E72\u8FBE
+UM=\u7F8E\u5C5E\u5C0F\u5965\u7279\u5170\u7FA4\u5C9B
+US=\u7F8E\u56FD
+UY=\u4E4C\u62C9\u572D
+UZ=\u4E4C\u5179\u522B\u514B\u65AF\u5766
+VA=\u68B5\u8482\u5188
+VC=\u5723\u6587\u68EE\u7279\u548C\u683C\u6797\u7EB3\u4E01\u65AF
+VE=\u59D4\u5185\u745E\u62C9
+VG=\u82F1\u5C5E\u7EF4\u4EAC\u7FA4\u5C9B
+VI=\u7F8E\u5C5E\u7EF4\u4EAC\u7FA4\u5C9B
+VN=\u8D8A\u5357
+VU=\u74E6\u52AA\u963F\u56FE
+WF=\u74E6\u5229\u65AF\u7FA4\u5C9B\u548C\u5BCC\u56FE\u7EB3\u7FA4\u5C9B
+WS=\u8428\u6469\u4E9A
+YE=\u4E5F\u95E8
+YT=\u9A6C\u7EA6\u7279\u5C9B
+ZA=\u5357\u975E
+ZM=\u8D5E\u6BD4\u4E9A
+ZW=\u6D25\u5DF4\u5E03\u97E6
 
 # territory names
 # key is UN M.49 country and area code
@@ -1151,3 +1152,19 @@
 154=\u5317\u6B27
 155=\u897F\u6B27
 419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=\u6B27\u5143
+%%B=\u535A\u514B\u9A6C\u5C14\u6587
+%%NY=\u5C3C\u8BFA\u65AF\u514B\u6587
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties
index 9d825ab..66ff2a1 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties
@@ -1,3 +1,4 @@
+#
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -38,194 +39,194 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u963f\u6cd5\u6587
-ab=\u963f\u5e03\u54c8\u897f\u4e9e\u6587
-ae=\u963f\u672a\u65af\u5854\u6587
-af=\u5357\u975e\u8377\u862d\u6587
-ak=\u963f\u5bd2\u6587
-am=\u8863\u7d22\u6bd4\u4e9e\u6587
-an=\u4e9e\u62c9\u5ca1\u6587
-ar=\u963f\u62c9\u4f2f\u6587
-as=\u963f\u85a9\u59c6\u6587
-av=\u963f\u74e6\u96f7\u6587
-ay=\u4e9e\u6469\u62c9\u6587
-az=\u4e9e\u585e\u62dc\u7136\u6587
-ba=\u5df4\u4ec0\u5580\u723e\u6587
-be=\u767d\u4fc4\u7f85\u65af\u6587
-bg=\u4fdd\u52a0\u5229\u4e9e\u6587
-bh=\u6bd4\u54c8\u723e\u6587
-bi=\u6bd4\u65af\u62c9\u99ac\u6587
-bm=\u73ed\u5df4\u62c9\u6587
-bn=\u5b5f\u52a0\u62c9\u6587
-bo=\u897f\u85cf\u6587
-br=\u4e0d\u5217\u5854\u5c3c\u6587
-bs=\u6ce2\u58eb\u5c3c\u4e9e\u6587
-ca=\u5609\u6cf0\u7f85\u5c3c\u4e9e\u6587
-ce=\u8d64\u6b3d\u6587
-ch=\u67e5\u6469\u6d1b\u6587
-co=\u79d1\u897f\u5609\u6587
-cr=\u514b\u91cc\u6587
-cs=\u6377\u514b\u6587
-cu=\u6559\u6703\u65af\u62c9\u592b\u6587
-cv=\u695a\u74e6\u58eb\u6587
-cy=\u5a01\u723e\u65af\u6587
-da=\u4e39\u9ea5\u6587
-de=\u5fb7\u6587
-dv=\u8fea\u7dad\u897f\u6587
-dz=\u4e0d\u4e39\u6587
-ee=\u57c3\u7dad\u6587
-el=\u5e0c\u81d8\u6587
-en=\u82f1\u6587
-eo=\u4e16\u754c\u6587
-es=\u897f\u73ed\u7259\u6587
-et=\u611b\u6c99\u5c3c\u4e9e\u6587
-eu=\u5df4\u65af\u514b\u6587
-fa=\u6ce2\u65af\u6587
-ff=\u5bcc\u62c9\u6587
-fi=\u82ac\u862d\u6587
-fj=\u6590\u6fdf\u6587
-fo=\u6cd5\u7f85\u6587
-fr=\u6cd5\u6587
-fy=\u5f17\u5229\u7136\u6587
-ga=\u611b\u723e\u862d\u6587
-gd=\u8607\u683c\u862d\u84cb\u723e\u65b9\u8a00
-gl=\u52a0\u91cc\u897f\u4e9e\u6587
-gn=\u74dc\u62c9\u5c3c\u6587
-gu=\u53e4\u5409\u62c9\u7279\u6587
-gv=\u66fc\u5cf6\u6587
-ha=\u8c6a\u85a9\u6587
-he=\u5e0c\u4f2f\u4f86\u6587
-hi=\u5317\u5370\u5ea6\u6587
-ho=\u65b0\u91cc\u6728\u6258\u6587
-hr=\u514b\u7f85\u57c3\u897f\u4e9e\u6587
-ht=\u6d77\u5730\u6587
+aa=\u963F\u6CD5\u6587
+ab=\u963F\u5E03\u54C8\u897F\u4E9E\u6587
+ae=\u963F\u672A\u65AF\u5854\u6587
+af=\u5357\u975E\u8377\u862D\u6587
+ak=\u963F\u5BD2\u6587
+am=\u8863\u7D22\u6BD4\u4E9E\u6587
+an=\u4E9E\u62C9\u5CA1\u6587
+ar=\u963F\u62C9\u4F2F\u6587
+as=\u963F\u85A9\u59C6\u6587
+av=\u963F\u74E6\u96F7\u6587
+ay=\u4E9E\u6469\u62C9\u6587
+az=\u4E9E\u585E\u62DC\u7136\u6587
+ba=\u5DF4\u4EC0\u5580\u723E\u6587
+be=\u767D\u4FC4\u7F85\u65AF\u6587
+bg=\u4FDD\u52A0\u5229\u4E9E\u6587
+bh=\u6BD4\u54C8\u723E\u6587
+bi=\u6BD4\u65AF\u62C9\u99AC\u6587
+bm=\u73ED\u5DF4\u62C9\u6587
+bn=\u5B5F\u52A0\u62C9\u6587
+bo=\u897F\u85CF\u6587
+br=\u4E0D\u5217\u5854\u5C3C\u6587
+bs=\u6CE2\u58EB\u5C3C\u4E9E\u6587
+ca=\u5609\u6CF0\u7F85\u5C3C\u4E9E\u6587
+ce=\u8ECA\u81E3\u6587
+ch=\u67E5\u6469\u6D1B\u6587
+co=\u79D1\u897F\u5609\u6587
+cr=\u514B\u91CC\u6587
+cs=\u6377\u514B\u6587
+cu=\u6559\u6703\u65AF\u62C9\u592B\u6587
+cv=\u695A\u74E6\u58EB\u6587
+cy=\u5A01\u723E\u65AF\u6587
+da=\u4E39\u9EA5\u6587
+de=\u5FB7\u6587
+dv=\u8FEA\u7DAD\u897F\u6587
+dz=\u4E0D\u4E39\u6587
+ee=\u57C3\u7DAD\u6587
+el=\u5E0C\u81D8\u6587
+en=\u82F1\u6587
+eo=\u4E16\u754C\u6587
+es=\u897F\u73ED\u7259\u6587
+et=\u611B\u6C99\u5C3C\u4E9E\u6587
+eu=\u5DF4\u65AF\u514B\u6587
+fa=\u6CE2\u65AF\u6587
+ff=\u5BCC\u62C9\u6587
+fi=\u82AC\u862D\u6587
+fj=\u6590\u6FDF\u6587
+fo=\u6CD5\u7F85\u6587
+fr=\u6CD5\u6587
+fy=\u5F17\u5229\u7136\u6587
+ga=\u611B\u723E\u862D\u6587
+gd=\u8607\u683C\u862D\u84CB\u723E\u65B9\u8A00
+gl=\u52A0\u91CC\u897F\u4E9E\u6587
+gn=\u74DC\u62C9\u5C3C\u6587
+gu=\u53E4\u5409\u62C9\u7279\u6587
+gv=\u66FC\u5CF6\u6587
+ha=\u8C6A\u85A9\u6587
+he=\u5E0C\u4F2F\u4F86\u6587
+hi=\u5317\u5370\u5EA6\u6587
+ho=\u65B0\u91CC\u6728\u6258\u6587
+hr=\u514B\u7F85\u57C3\u897F\u4E9E\u6587
+ht=\u6D77\u5730\u6587
 hu=\u5308\u7259\u5229\u6587
-hy=\u4e9e\u7f8e\u5c3c\u4e9e\u6587
-hz=\u8d6b\u96f7\u7f85\u6587
-ia=\u4eba\u5de5\u570b\u969b\u6587
-id=\u5370\u5c3c\u6587
-ie=\u4eba\u5de5\u570b\u969b\u6587
-ig=\u4f0a\u5e03\u6587
-ii=\u56db\u5ddd\u5937\u6587
-ik=\u4f9d\u5974\u76ae\u7dad\u514b\u6587
-in=\u5370\u5c3c\u6587
-io=\u4f0a\u591a\u6587
-is=\u51b0\u5cf6\u6587
-it=\u7fa9\u5927\u5229\u6587
-iu=\u611b\u65af\u57fa\u6469\u6587
-iw=\u5e0c\u4f2f\u4f86\u6587
-ja=\u65e5\u6587
-ji=\u610f\u7b2c\u7dd2\u6587
-jv=\u722a\u54c7\u6587
-ka=\u55ac\u6cbb\u4e9e\u6587
-kg= \u525b\u679c\u6587
-ki=\u57fa\u5eab\u7336\u6587
-kj=\u5361\u7063\u4e9e\u99ac
-kk=\u54c8\u85a9\u514b\u6587
-kl=\u683c\u9675\u862d\u6587
-km=\u67ec\u57d4\u5be8\u6587
-kn=\u574e\u90a3\u9054\u6587
-ko=\u97d3\u6587
-kr=\u5361\u52aa\u91cc\u6587
-ks=\u5580\u4ec0\u7c73\u723e\u6587
-ku=\u5eab\u5fb7\u6587
-kv=\u79d1\u5bc6\u6587
-kw=\u5eb7\u74e6\u8033\u6587
-ky=\u5409\u723e\u5409\u65af\u6587
-la=\u62c9\u4e01\u6587
-lb=\u76e7\u68ee\u5821\u6587
-lg=\u5e72\u9054\u6587
+hy=\u4E9E\u7F8E\u5C3C\u4E9E\u6587
+hz=\u8D6B\u96F7\u7F85\u6587
+ia=\u4EBA\u5DE5\u570B\u969B\u6587
+id=\u5370\u5C3C\u6587
+ie=\u4EBA\u5DE5\u570B\u969B\u6587
+ig=\u4F0A\u5E03\u6587
+ii=\u56DB\u5DDD\u5937\u6587
+ik=\u4F9D\u5974\u76AE\u7DAD\u514B\u6587
+in=\u5370\u5C3C\u6587
+io=\u4F0A\u591A\u6587
+is=\u51B0\u5CF6\u6587
+it=\u7FA9\u5927\u5229\u6587
+iu=\u4F0A\u52AA\u4F0A\u7279\u6587
+iw=\u5E0C\u4F2F\u4F86\u6587
+ja=\u65E5\u6587
+ji=\u610F\u7B2C\u7DD2\u6587
+jv=\u722A\u54C7\u6587
+ka=\u55AC\u6CBB\u4E9E\u6587
+kg=\u525B\u679C\u6587
+ki=\u57FA\u5EAB\u7336\u6587
+kj=\u5361\u7063\u4E9E\u99AC
+kk=\u54C8\u85A9\u514B\u6587
+kl=\u683C\u9675\u862D\u6587
+km=\u67EC\u57D4\u5BE8\u6587
+kn=\u574E\u90A3\u9054\u6587
+ko=\u97D3\u6587
+kr=\u5361\u52AA\u91CC\u6587
+ks=\u5580\u4EC0\u7C73\u723E\u6587
+ku=\u5EAB\u5FB7\u6587
+kv=\u79D1\u5BC6\u6587
+kw=\u5EB7\u74E6\u8033\u6587
+ky=\u5409\u723E\u5409\u65AF\u6587
+la=\u62C9\u4E01\u6587
+lb=\u76E7\u68EE\u5821\u6587
+lg=\u5E72\u9054\u6587
 li=\u6797\u5821\u6587
-ln=\u9675\u52a0\u62c9\u6587
-lo=\u5bee\u6587
-lt=\u7acb\u9676\u5b9b\u6587
-lu=\u76e7\u5df4-\u52a0\u4e39\u52a0\u6587
-lv=\u62c9\u812b\u7dad\u4e9e\u6587 (\u5217\u7279\u6587)
-mg=\u99ac\u62c9\u52a0\u897f\u6587
-mh=\u99ac\u7d39\u723e\u7fa4\u5cf6\u6587
-mi=\u6bdb\u5229\u6587
-mk=\u99ac\u5176\u9813\u6587
-ml=\u99ac\u4f86\u4e9e\u62c9\u59c6\u6587
-mn=\u8499\u53e4\u6587
-mo=\u6469\u723e\u9054\u7dad\u4e9e\u6587
-mr=\u99ac\u62c9\u5730\u6587
-ms=\u99ac\u4f86\u6587
-mt=\u99ac\u723e\u4ed6\u6587
-my=\u7dec\u7538\u6587
-na=\u8afe\u9b6f\u6587
-nb=\u632a\u5a01\u6ce2\u514b\u9ed8\u723e\u6587
-nd=\u5317\u6069\u5fb7\u8c9d\u52d2\u6587
-ne=\u5c3c\u6cca\u723e\u6587
-ng=\u6069\u6771\u52a0\u6587
-nl=\u8377\u862d\u6587
-nn=\u632a\u5a01(\u8010\u8afe\u65af\u514b\u6587
-no=\u632a\u5a01\u6587
-nr=\u5357\u6069\u5fb7\u8c9d\u52d2\u6587
-nv=\u7d0d\u74e6\u8377\u6587
-ny=\u5c3c\u63da\u8cc8\u6587
-oc=\u5967\u897f\u5766\u6587
-oj=\u5967\u6770\u5e03\u97cb\u6587
-om=\u5967\u7f85\u8499\u6587
-or=\u6b50\u5229\u4e9e\u6587
-os=\u5967\u585e\u68af\u6587
-pa=\u65c1\u906e\u666e\u6587
-pi=\u5e15\u91cc\u6587
-pl=\u6ce2\u862d\u6587
-ps=\u666e\u4ec0\u5716\u6587
+ln=\u9675\u52A0\u62C9\u6587
+lo=\u5BEE\u6587
+lt=\u7ACB\u9676\u5B9B\u6587
+lu=\u76E7\u5DF4-\u52A0\u4E39\u52A0\u6587
+lv=\u62C9\u812B\u7DAD\u4E9E\u6587 (\u5217\u7279\u6587)
+mg=\u99AC\u62C9\u52A0\u897F\u6587
+mh=\u99AC\u7D39\u723E\u7FA4\u5CF6\u6587
+mi=\u6BDB\u5229\u6587
+mk=\u99AC\u5176\u9813\u6587
+ml=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587
+mn=\u8499\u53E4\u6587
+mo=\u6469\u723E\u9054\u7DAD\u4E9E\u6587
+mr=\u99AC\u62C9\u5730\u6587
+ms=\u99AC\u4F86\u6587
+mt=\u99AC\u723E\u4ED6\u6587
+my=\u7DEC\u7538\u6587
+na=\u8AFE\u9B6F\u6587
+nb=\u632A\u5A01\u6CE2\u514B\u9ED8\u723E\u6587
+nd=\u5317\u6069\u5FB7\u8C9D\u52D2\u6587
+ne=\u5C3C\u6CCA\u723E\u6587
+ng=\u6069\u6771\u52A0\u6587
+nl=\u8377\u862D\u6587
+nn=\u632A\u5A01\u8010\u8AFE\u65AF\u514B\u6587
+no=\u632A\u5A01\u6587
+nr=\u5357\u6069\u5FB7\u8C9D\u52D2\u6587
+nv=\u7D0D\u74E6\u8377\u6587
+ny=\u5C3C\u63DA\u8CC8\u6587
+oc=\u5967\u897F\u5766\u6587
+oj=\u5967\u6770\u5E03\u97CB\u6587
+om=\u5967\u7F85\u8499\u6587
+or=\u6B50\u5229\u4E9E\u6587
+os=\u5967\u585E\u68AF\u6587
+pa=\u65C1\u906E\u666E\u6587
+pi=\u5E15\u91CC\u6587
+pl=\u6CE2\u862D\u6587
+ps=\u666E\u4EC0\u5716\u6587
 pt=\u8461\u8404\u7259\u6587
-qu=\u84cb\u695a\u74e6\u6587
-rm=\u91cc\u6258\u7f85\u66fc\u65af\u6587
-rn=\u79d1\u9686\u5730\u6587
-ro=\u7f85\u99ac\u5c3c\u4e9e\u6587
-ru=\u4fc4\u6587
-rw=\u91d1\u63da\u842c\u7b54\u6587
-sa=\u68b5\u6587\u5b57\u6bcd
-sc=\u85a9\u4e01\u5c3c\u4e9e\u6587
-sd=\u4fe1\u5fb7\u6587
-se=\u5317\u6c99\u5bc6\u6587
-sg=\u6851\u683c\u9b6f\u6587
-si=\u932b\u862d\u6587
-sk=\u65af\u6d1b\u4f10\u514b\u6587
-sl=\u65af\u62c9\u7dad\u5c3c\u4e9e\u6587
-sm=\u85a9\u6469\u4e9e\u6587
-sn=\u980c\u54c8\u6587
-so=\u7d22\u99ac\u5229\u6587
-sq=\u963f\u723e\u5df4\u5c3c\u4e9e\u6587
-sr=\u585e\u723e\u7dad\u4e9e\u6587
-ss=\u897f\u65af\u74e6\u63d0\u6587
-st=\u8cf4\u7d22\u6258\u6587
-su=\u5dfd\u4e39\u6587
-sv=\u745e\u5178\u6587
-sw=\u53f2\u74e6\u897f\u91cc\u6587
-ta=\u5766\u7c73\u723e\u6587
-te=\u7279\u62c9\u53e4\u6587
-tg=\u5854\u5409\u514b\u6587
-th=\u6cf0\u6587
-ti=\u63d0\u683c\u5229\u5c3c\u4e9e\u6587
-tk=\u571f\u5eab\u66fc\u6587
-tl=\u5854\u52a0\u62c9\u65cf\u6587
-tn=\u585e\u8332\u74e6\u7d0d\u6587
-to=\u6771\u52a0\u6587
-tr=\u571f\u8033\u5176\u6587
-ts=\u980c\u52a0\u6587
-tt=\u97c3\u977c\u6587
-tw=\u5951\u7dad\u6587
-ty=\u5927\u6eaa\u5730\u6587
-ug=\u7dad\u543e\u723e\u6587
-uk=\u70cf\u514b\u862d\u6587
-ur=\u70cf\u90fd\u6587
-uz=\u70cf\u8332\u5225\u514b\u6587
+qu=\u84CB\u695A\u74E6\u6587
+rm=\u91CC\u6258\u7F85\u66FC\u65AF\u6587
+rn=\u79D1\u9686\u5730\u6587
+ro=\u7F85\u99AC\u5C3C\u4E9E\u6587
+ru=\u4FC4\u6587
+rw=\u91D1\u63DA\u842C\u7B54\u6587
+sa=\u68B5\u6587\u5B57\u6BCD
+sc=\u85A9\u4E01\u5C3C\u4E9E\u6587
+sd=\u4FE1\u5FB7\u6587
+se=\u5317\u6C99\u5BC6\u6587
+sg=\u6851\u683C\u9B6F\u6587
+si=\u932B\u862D\u6587
+sk=\u65AF\u6D1B\u4F10\u514B\u6587
+sl=\u65AF\u62C9\u7DAD\u5C3C\u4E9E\u6587
+sm=\u85A9\u6469\u4E9E\u6587
+sn=\u980C\u54C8\u6587
+so=\u7D22\u99AC\u5229\u6587
+sq=\u963F\u723E\u5DF4\u5C3C\u4E9E\u6587
+sr=\u585E\u723E\u7DAD\u4E9E\u6587
+ss=\u897F\u65AF\u74E6\u63D0\u6587
+st=\u8CF4\u7D22\u6258\u6587
+su=\u5DFD\u4E39\u6587
+sv=\u745E\u5178\u6587
+sw=\u53F2\u74E6\u897F\u91CC\u6587
+ta=\u5766\u7C73\u723E\u6587
+te=\u7279\u62C9\u53E4\u6587
+tg=\u5854\u5409\u514B\u6587
+th=\u6CF0\u6587
+ti=\u63D0\u683C\u5229\u5C3C\u4E9E\u6587
+tk=\u571F\u5EAB\u66FC\u6587
+tl=\u5854\u52A0\u62C9\u65CF\u6587
+tn=\u585E\u8332\u74E6\u7D0D\u6587
+to=\u6771\u52A0\u6587
+tr=\u571F\u8033\u5176\u6587
+ts=\u980C\u52A0\u6587
+tt=\u97C3\u977C\u6587
+tw=\u5951\u7DAD\u6587
+ty=\u5927\u6EAA\u5730\u6587
+ug=\u7DAD\u543E\u723E\u6587
+uk=\u70CF\u514B\u862D\u6587
+ur=\u70CF\u90FD\u6587
+uz=\u70CF\u8332\u5225\u514B\u6587
 ve=\u6587\u9054\u6587
-vi=\u8d8a\u5357\u6587
-vo=\u6c83\u62c9\u666e\u514b\u6587
-wa=\u83ef\u9686\u6587
-wo=\u6c83\u6d1b\u592b\u6587
-xh=\u5ed3\u85a9\u6587
-yi=\u610f\u7b2c\u7dd2\u6587
-yo=\u512a\u9b6f\u5df4\u6587
-za=\u58ef\u6587
-zh=\u4e2d\u6587
-zu=\u7956\u9b6f\u6587
+vi=\u8D8A\u5357\u6587
+vo=\u6C83\u62C9\u666E\u514B\u6587
+wa=\u83EF\u9686\u6587
+wo=\u6C83\u6D1B\u592B\u6587
+xh=\u5ED3\u85A9\u6587
+yi=\u610F\u7B2C\u7DD2\u6587
+yo=\u512A\u9B6F\u5DF4\u6587
+za=\u58EF\u6587
+zh=\u4E2D\u6587
+zu=\u7956\u9B6F\u6587
 
 # key is ISO 639.2 language code
 aar=\u963F\u6CD5\u6587
@@ -320,12 +321,12 @@
 cop=\u79D1\u666E\u7279\u6587
 cor=\u5EB7\u74E6\u8033\u6587
 cos=\u79D1\u897F\u5609\u6587
-cpe=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u82F1\u6587\u7684(\u5176\u4ED6)
-cpf=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u6CD5\u6587\u7684(\u5176\u4ED6)
-cpp=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u8461\u8404\u7259\u6587\u7684(\u5176\u4ED6)
+cpe=\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\uFF0C\u4EE5\u82F1\u8A9E\u70BA\u57FA\u790E
+cpf=\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\uFF0C\u4EE5\u6CD5\u8A9E\u70BA\u57FA\u790E
+cpp=\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\uFF0C\u4EE5\u8461\u8404\u7259\u8A9E\u70BA\u57FA\u790E
 cre=\u514B\u91CC\u6587
 crh=\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u571F\u8033\u5176\u6587\uFF1B\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u5854\u5854\u723E\u6587
-crp=\u5176\u4ED6\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\u7CFB
+crp=\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E
 csb=\u5361\u8212\u5E03\u6587
 cus=\u5EAB\u65BD\u7279\u8AF8\u8A9E\u8A00
 cze=\u6377\u514B\u6587
@@ -461,7 +462,7 @@
 kor=\u97D3\u6587
 kos=\u79D1\u65AF\u96F7\u6069\u6587
 kpe=\u514B\u4F69\u5217\u6587
-krc=\u5361\u62C9\u67F4-\u5305\u723E\u5361\u723E\u6587
+krc=\u5361\u62C9\u6070\u4F0A-\u5DF4\u5361\u723E\u6587
 krl=\u5361\u7D2F\u5229\u963F\u6587
 kro=\u514B\u9B6F\u6587
 kru=\u5EAB\u9B6F\u79D1\u6587
@@ -471,7 +472,7 @@
 kut=\u5EAB\u7279\u5948\u6587
 lad=\u62C9\u8FEA\u8AFE\u6587
 lah=\u62C9\u4EA8\u9054\u6587
-lam=\u862D\u5DF4\u6587
+lam=\u6717\u5DF4\u6587
 lao=\u5BEE\u6587
 lat=\u62C9\u4E01\u6587
 lav=\u62C9\u812B\u7DAD\u4E9E\u6587 (\u5217\u7279\u6587)
@@ -508,7 +509,7 @@
 mga=\u4E2D\u53E4\u611B\u723E\u862D\u6587 (900-1200)
 mic=\u7C73\u514B\u99AC\u514B\u6587
 min=\u7C73\u5357\u5361\u5821\u6587
-mis=\u6DF7\u96DC\u8A9E\u8AF8\u8A9E\u8A00
+mis=\u672A\u7DE8\u78BC\u8A9E\u8A00
 mkh=\u5B5F\u9AD8\u68C9\u8AF8\u8A9E\u8A00
 mlg=\u99AC\u62C9\u52A0\u897F\u6587
 mlt=\u99AC\u723E\u4ED6\u6587
@@ -540,11 +541,11 @@
 nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
 niu=\u7D10\u57C3\u6587
 nno=\u632A\u5A01\u8010\u8AFE\u65AF\u514B\u6587
-nob=\u535A\u514B\u99AC\u723E\u6587\uFF0C\u632A\u5A01
+nob=\u632A\u5A01\u6CE2\u514B\u9ED8\u723E\u6587
 nog=\u8AFE\u84CB\u6587
 non=\u53E4\u8AFE\u723E\u65AF\u6587
 nor=\u632A\u5A01\u6587
-nqo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko)
+nqo=\u897F\u975E\u66F8\u9762\u6587 (N'Ko)
 nso=\u5317\u7D22\u6258\u6587
 nub=\u52AA\u6BD4\u4E9E\u8AF8\u8A9E\u8A00
 nwc=\u53E4\u5C3C\u74E6\u723E\u6587
@@ -591,7 +592,7 @@
 rup=\u7F85\u99AC\u5C3C\u4E9E\u8A9E\u7CFB
 rus=\u4FC4\u6587
 sad=\u6851\u9054\u97CB\u6587
-sag=\u6851\u6208\u8A9E
+sag=\u6851\u6208\u6587
 sah=\u96C5\u5EAB\u7279\u6587
 sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587
 sal=\u85A9\u5229\u4EC0\u8AF8\u8A9E\u8A00
@@ -683,7 +684,7 @@
 und=\u672A\u78BA\u5B9A\u7684
 urd=\u70CF\u90FD\u6587
 uzb=\u70CF\u8332\u5225\u514B\u6587
-vai=\u8D8A\u5357\u6587 Vai
+vai=\u74E6\u4F0A\u6587
 ven=\u6587\u9054\u6587
 vie=\u8D8A\u5357\u6587
 vol=\u6C83\u62C9\u666E\u514B\u6587
@@ -739,7 +740,7 @@
 Cirt=\u8272\u65AF\u6587
 Copt=\u79D1\u666E\u7279\u6587
 Cprt=\u585E\u6D66\u8DEF\u65AF\u6587
-Cyrl=\u897F\u91CC\u4FC4\u8A9E
+Cyrl=\u897F\u91CC\u4FC4\u6587
 Cyrs=\u897F\u91CC\u723E\u6587 (\u53E4\u6559\u6703\u65AF\u62C9\u592B\u6587\u8B8A\u9AD4)
 Deva=\u68B5\u6587
 Dsrt=\u5FB7\u745F\u96F7\u7279\u6587
@@ -758,7 +759,7 @@
 Gujr=\u53E4\u5409\u62C9\u7279\u6587
 Guru=\u53E4\u723E\u7A46\u5947\u6587
 Hang=\u8AFA\u6587
-Hani=\u6F22\u8A9E
+Hani=\u6F22\u6587
 Hano=\u54C8\u52AA\u8AFE\u6587
 Hans=\u7C21\u9AD4\u4E2D\u6587
 Hant=\u7E41\u9AD4\u4E2D\u6587
@@ -790,12 +791,12 @@
 Linb=\u7DDA\u6027\u6587\u5B57 B
 Lisu=\u9ECE\u50F3\u6587
 Loma=\u6D1B\u99AC\u6587
-Lyci=\u5442\u897F\u4E9E\u8A9E
-Lydi=\u91CC\u5E95\u4E9E\u8A9E
+Lyci=\u5442\u897F\u4E9E\u6587
+Lydi=\u91CC\u5E95\u4E9E\u6587
 Mand=\u66FC\u5B89\u5E95\u6587
 Mani=\u6469\u5C3C\u6559\u6587
 Maya=\u746A\u96C5\u8C61\u5F62\u6587\u5B57
-Mend=\u9580\u8FEA\u8A9E
+Mend=\u9580\u8FEA\u6587
 Merc=\u9EA5\u7F85\u57C3\u6587\u884C\u8349
 Mero=\u9EA5\u7F85\u57C3\u6587
 Mlym=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587
@@ -806,7 +807,7 @@
 Narb=\u5317\u963F\u62C9\u4F2F\u53E4\u6587
 Nbat=\u7D0D\u5DF4\u6CF0\u6587
 Nkgb=\u7D0D\u897F\u8FE6\u5DF4\u6587
-Nkoo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko)
+Nkoo=\u897F\u975E\u66F8\u9762\u6587 (N'Ko)
 Ogam=\u6B50\u7518\u6587
 Olck=\u6851\u5854\u5229\u6587
 Orkh=\u9102\u723E\u6E3E\u6587
@@ -867,256 +868,256 @@
 # country names
 # key is ISO 3166 country code
 
-AD=\u5b89\u9053\u723e
-AE=\u963f\u62c9\u4f2f\u806f\u5408\u5927\u516c\u570b
-AF=\u963f\u5bcc\u6c57
-AG=\u5b89\u5730\u5361\u53ca\u5df4\u5e03\u9054
-AI=\u5b89\u572d\u62c9
-AL=\u963f\u723e\u5df4\u5c3c\u4e9e
-AM=\u4e9e\u7f8e\u5c3c\u4e9e
-AN=\u8377\u5c6c\u5b89\u66ff\u5217\u65af
-AO=\u5b89\u54e5\u62c9
-AQ=\u5357\u6975\u6d32
-AR=\u963f\u6839\u5ef7
-AS=\u7f8e\u5c6c\u85a9\u6469\u4e9e
+AD=\u5B89\u9053\u723E
+AE=\u963F\u62C9\u4F2F\u806F\u5408\u5927\u516C\u570B
+AF=\u963F\u5BCC\u6C57
+AG=\u5B89\u5730\u5361\u53CA\u5DF4\u5E03\u9054
+AI=\u5B89\u572D\u62C9
+AL=\u963F\u723E\u5DF4\u5C3C\u4E9E
+AM=\u4E9E\u7F8E\u5C3C\u4E9E
+AN=\u8377\u5C6C\u5B89\u5730\u5217\u65AF
+AO=\u5B89\u54E5\u62C9
+AQ=\u5357\u6975\u6D32
+AR=\u963F\u6839\u5EF7
+AS=\u7F8E\u5C6C\u85A9\u6469\u4E9E
 AT=\u5967\u5730\u5229
-AU=\u6fb3\u5927\u5229\u4e9e
-AW=\u963f\u8def\u5df4
-AX=\u5967\u862d\u7fa4\u5cf6
-AZ=\u4e9e\u585e\u62dc\u7136
-BA=\u6ce2\u58eb\u5c3c\u4e9e\u8d6b\u585e\u54e5\u7dad\u7d0d
-BB=\u5df4\u8c9d\u591a
-BD=\u5b5f\u52a0\u62c9
-BE=\u6bd4\u5229\u6642
-BF=\u5e03\u5409\u7d0d\u6cd5\u7d22
-BG=\u4fdd\u52a0\u5229\u4e9e
-BH=\u5df4\u6797
-BI=\u6d66\u9686\u5730
-BJ=\u8c9d\u5357
+AU=\u6FB3\u5927\u5229\u4E9E
+AW=\u963F\u8DEF\u5DF4
+AX=\u5967\u862D\u7FA4\u5CF6
+AZ=\u4E9E\u585E\u62DC\u7136
+BA=\u6CE2\u58EB\u5C3C\u4E9E\u8D6B\u585E\u54E5\u7DAD\u7D0D
+BB=\u5DF4\u8C9D\u591A
+BD=\u5B5F\u52A0\u62C9
+BE=\u6BD4\u5229\u6642
+BF=\u5E03\u5409\u7D0D\u6CD5\u7D22
+BG=\u4FDD\u52A0\u5229\u4E9E
+BH=\u5DF4\u6797
+BI=\u6D66\u9686\u5730
+BJ=\u8C9D\u5357
 BL=\u8056\u5DF4\u745F\u7C73
-BM=\u767e\u6155\u9054
-BN=\u6c76\u840a
-BO=\u73bb\u5229\u7dad\u4e9e
+BM=\u767E\u6155\u9054
+BN=\u6C76\u840A
+BO=\u73BB\u5229\u7DAD\u4E9E
 BQ=\u6CE2\u7D0D\u723E\u5CF6\u3001\u8056\u827E\u65AF\u5854\u5F97\u65AF\u5CF6\u53CA\u85A9\u5DF4\u5CF6
-BR=\u5df4\u897f
-BS=\u5df4\u54c8\u99ac
-BT=\u4e0d\u4e39
-BV=\u5e03\u5a01\u5cf6
-BW=\u6ce2\u672d\u90a3
-BY=\u767d\u4fc4\u7f85\u65af
-BZ=\u8c9d\u91cc\u65af
-CA=\u52a0\u62ff\u5927
-CC=\u53ef\u53ef\u65af\u7fa4\u5cf6
-CD=\u525b\u679c\u6c11\u4e3b\u5171\u548c\u570b
-CF=\u4e2d\u975e
-CG=\u525b\u679c
-CH=\u745e\u58eb
-CI=\u8c61\u7259\u6d77\u5cb8
-CK=\u5eab\u514b\u7fa4\u5cf6
-CL=\u667a\u5229
-CM=\u5580\u9ea5\u9686
-CN=\u4e2d\u570b
-CO=\u54e5\u502b\u6bd4\u4e9e
-CR=\u54e5\u65af\u5927\u9ece\u52a0
-CS=\u585e\u723e\u7dad\u4e9e\u53ca\u8499\u7279\u5c3c\u54e5\u7f85
-CU=\u53e4\u5df4
-CV=\u7dad\u5fb7\u89d2
+BR=\u5DF4\u897F
+BS=\u5DF4\u54C8\u99AC
+BT=\u4E0D\u4E39
+BV=\u5E03\u5A01\u5CF6
+BW=\u6CE2\u672D\u90A3
+BY=\u767D\u4FC4\u7F85\u65AF
+BZ=\u8C9D\u91CC\u65AF
+CA=\u52A0\u62FF\u5927
+CC=\u53EF\u53EF\u65AF\u7FA4\u5CF6
+CD=\u525B\u679C\u6C11\u4E3B\u5171\u548C\u570B
+CF=\u4E2D\u975E
+CG=\u525B\u679C
+CH=\u745E\u58EB
+CI=\u8C61\u7259\u6D77\u5CB8
+CK=\u5EAB\u514B\u7FA4\u5CF6
+CL=\u667A\u5229
+CM=\u5580\u9EA5\u9686
+CN=\u4E2D\u570B
+CO=\u54E5\u502B\u6BD4\u4E9E
+CR=\u54E5\u65AF\u5927\u9ECE\u52A0
+CS=\u585E\u723E\u7DAD\u4E9E\u53CA\u8499\u7279\u5C3C\u54E5\u7F85
+CU=\u53E4\u5DF4
+CV=\u7DAD\u5FB7\u89D2
 CW=\u53E4\u62C9\u679C
-CX=\u8056\u8a95\u5cf6
-CY=\u8cfd\u666e\u52d2\u65af
-CZ=\u6377\u514b\u5171\u548c\u570b
-DE=\u5fb7\u570b
-DJ=\u5409\u5e03\u5730
-DK=\u4e39\u9ea5
-DM=\u591a\u7c73\u5c3c\u514b
-DO=\u591a\u660e\u5c3c\u52a0
-DZ=\u963f\u723e\u53ca\u5229
-EC=\u5384\u74dc\u591a\u723e
-EE=\u611b\u6c99\u5c3c\u4e9e
-EG=\u57c3\u53ca
-EH=\u897f\u6492\u54c8\u62c9\u6c99\u6f20
-ER=\u5384\u5229\u5782\u4e9e
-ES=\u897f\u73ed\u7259
-ET=\u8863\u7d22\u6bd4\u4e9e
-FI=\u82ac\u862d
-FJ=\u6590\u6fdf
-FK=\u798f\u514b\u862d\u7fa4\u5cf6
-FM=\u5bc6\u514b\u7f85\u5c3c\u897f\u4e9e\u806f\u90a6
-FO=\u6cd5\u9b6f\u7fa4\u5cf6
-FR=\u6cd5\u570b
-GA=\u52a0\u5f6d
-GB=\u82f1\u570b
-GD=\u683c\u745e\u90a3\u9054
-GE=\u55ac\u6cbb\u4e9e
-GF=\u6cd5\u5c6c\u84cb\u4e9e\u7d0d
+CX=\u8056\u8A95\u5CF6
+CY=\u8CFD\u666E\u52D2\u65AF
+CZ=\u6377\u514B\u5171\u548C\u570B
+DE=\u5FB7\u570B
+DJ=\u5409\u5E03\u5730
+DK=\u4E39\u9EA5
+DM=\u591A\u7C73\u5C3C\u514B
+DO=\u591A\u660E\u5C3C\u52A0
+DZ=\u963F\u723E\u53CA\u5229\u4E9E
+EC=\u5384\u74DC\u591A\u723E
+EE=\u611B\u6C99\u5C3C\u4E9E
+EG=\u57C3\u53CA
+EH=\u897F\u6492\u54C8\u62C9
+ER=\u5384\u5229\u5782\u4E9E
+ES=\u897F\u73ED\u7259
+ET=\u8863\u7D22\u6BD4\u4E9E
+FI=\u82AC\u862D
+FJ=\u6590\u6FDF
+FK=\u798F\u514B\u862D\u7FA4\u5CF6
+FM=\u5BC6\u514B\u7F85\u5C3C\u897F\u4E9E\u806F\u90A6
+FO=\u6CD5\u9B6F\u7FA4\u5CF6
+FR=\u6CD5\u570B
+GA=\u52A0\u5F6D
+GB=\u82F1\u570B
+GD=\u683C\u745E\u90A3\u9054
+GE=\u55AC\u6CBB\u4E9E
+GF=\u6CD5\u5C6C\u84CB\u4E9E\u7D0D
 GG=\u6839\u897F\u5CF6
-GH=\u8fe6\u7d0d
-GI=\u76f4\u5e03\u7f85\u9640
-GL=\u683c\u9675\u862d
-GM=\u7518\u6bd4\u4e9e
-GN=\u5e7e\u5167\u4e9e
-GP=\u683c\u9675\u862d
-GQ=\u8d64\u9053\u5e7e\u5167\u4e9e
-GR=\u5e0c\u81d8
-GS=\u5357\u55ac\u6cbb\u4e9e\u548c\u5357\u6851\u5a01\u5947\u7fa4\u5cf6
-GT=\u74dc\u5730\u99ac\u62c9
-GU=\u95dc\u5cf6
-GW=\u6bd4\u7d22
-GY=\u84cb\u4e9e\u7d0d
-HK=\u9999\u6e2f
-HM=\u8cc0\u5f97\u5cf6\u548c\u9ea5\u514b\u5510\u7d0d\u7fa4\u5cf6
-HN=\u5b8f\u90fd\u62c9\u65af
-HR=\u514b\u7f85\u57c3\u897f\u4e9e
-HT=\u6d77\u5730
+GH=\u8FE6\u7D0D
+GI=\u76F4\u5E03\u7F85\u9640
+GL=\u683C\u9675\u862D
+GM=\u7518\u6BD4\u4E9E
+GN=\u5E7E\u5167\u4E9E
+GP=\u54E5\u5FB7\u666E\u6D1B
+GQ=\u8D64\u9053\u5E7E\u5167\u4E9E
+GR=\u5E0C\u81D8
+GS=\u5357\u55AC\u6CBB\u4E9E\u548C\u5357\u6851\u5A01\u5947\u7FA4\u5CF6
+GT=\u74DC\u5730\u99AC\u62C9
+GU=\u95DC\u5CF6
+GW=\u5E7E\u5167\u4E9E\u6BD4\u7D22
+GY=\u84CB\u4E9E\u7D0D
+HK=\u9999\u6E2F\u7279\u5225\u884C\u653F\u5340
+HM=\u8CC0\u5F97\u5CF6\u548C\u9EA5\u514B\u5510\u7D0D\u7FA4\u5CF6
+HN=\u5B8F\u90FD\u62C9\u65AF
+HR=\u514B\u7F85\u57C3\u897F\u4E9E
+HT=\u6D77\u5730
 HU=\u5308\u7259\u5229
-ID=\u5370\u5c3c
-IE=\u611b\u723e\u862d
-IL=\u4ee5\u8272\u5217
+ID=\u5370\u5C3C
+IE=\u611B\u723E\u862D
+IL=\u4EE5\u8272\u5217
 IM=\u66FC\u5CF6
-IN=\u5370\u5ea6
-IO=\u82f1\u5c6c\u5370\u5ea6\u6d0b\u5730\u5340
-IQ=\u4f0a\u62c9\u514b
-IR=\u4f0a\u6717
-IS=\u51b0\u5cf6
-IT=\u7fa9\u5927\u5229
+IN=\u5370\u5EA6
+IO=\u82F1\u5C6C\u5370\u5EA6\u6D0B\u5730\u5340
+IQ=\u4F0A\u62C9\u514B
+IR=\u4F0A\u6717
+IS=\u51B0\u5CF6
+IT=\u7FA9\u5927\u5229
 JE=\u6FA4\u897F\u5CF6
-JM=\u7259\u8cb7
-JO=\u7d04\u65e6
-JP=\u65e5\u672c
-KE=\u80af\u4e9e
-KG=\u5409\u723e\u5409\u65af
-KH=\u67ec\u57d4\u5be8
-KI=\u5409\u91cc\u5df4\u65af
-KM=\u845b\u6469
-KN=\u8056\u514b\u91cc\u65af\u591a\u798f\u53ca\u5c3c\u7dad\u65af
-KP=\u5317\u97d3
-KR=\u5357\u97d3
-KW=\u79d1\u5a01\u7279
-KY=\u958b\u66fc\u7fa4\u5cf6
-KZ=\u54c8\u85a9\u514b
-LA=\u5bee\u570b
-LB=\u9ece\u5df4\u5ae9
-LC=\u8056\u9732\u897f\u4e9e
-LI=\u5217\u652f\u6566\u65af\u767b
-LK=\u65af\u91cc\u862d\u5361
-LR=\u8cf4\u6bd4\u745e\u4e9e
-LS=\u8cf4\u7d22\u6258
-LT=\u7acb\u9676\u5b9b
-LU=\u76e7\u68ee\u5821
-LV=\u62c9\u812b\u7dad\u4e9e
-LY=\u5229\u6bd4\u4e9e
-MA=\u6469\u6d1b\u54e5
-MC=\u6469\u7d0d\u54e5
-MD=\u6469\u723e\u591a\u74e6
-ME=\u8499\u7279\u5c3c\u683c\u7f85
+JM=\u7259\u8CB7\u52A0
+JO=\u7D04\u65E6
+JP=\u65E5\u672C
+KE=\u80AF\u4E9E
+KG=\u5409\u723E\u5409\u65AF
+KH=\u67EC\u57D4\u5BE8
+KI=\u5409\u91CC\u5DF4\u65AF
+KM=\u845B\u6469
+KN=\u8056\u514B\u91CC\u65AF\u591A\u798F\u53CA\u5C3C\u7DAD\u65AF
+KP=\u5317\u97D3
+KR=\u5357\u97D3
+KW=\u79D1\u5A01\u7279
+KY=\u958B\u66FC\u7FA4\u5CF6
+KZ=\u54C8\u85A9\u514B
+LA=\u5BEE\u570B
+LB=\u9ECE\u5DF4\u5AE9
+LC=\u8056\u9732\u897F\u4E9E
+LI=\u5217\u652F\u6566\u65AF\u767B
+LK=\u65AF\u91CC\u862D\u5361
+LR=\u8CF4\u6BD4\u745E\u4E9E
+LS=\u8CF4\u7D22\u6258
+LT=\u7ACB\u9676\u5B9B
+LU=\u76E7\u68EE\u5821
+LV=\u62C9\u812B\u7DAD\u4E9E
+LY=\u5229\u6BD4\u4E9E
+MA=\u6469\u6D1B\u54E5
+MC=\u6469\u7D0D\u54E5
+MD=\u6469\u723E\u591A\u74E6
+ME=\u8499\u7279\u5C3C\u683C\u7F85
 MF=\u8056\u99AC\u4E01
-MG=\u99ac\u9054\u52a0\u65af\u52a0
-MH=\u99ac\u7d39\u723e\u7fa4\u5cf6
-MK=\u99ac\u5176\u9813
-ML=\u99ac\u5229
-MM=\u7dec\u7538
-MN=\u8499\u53e4
-MO=\u6fb3\u9580
-MP=\u99ac\u91cc\u4e9e\u7d0d\u7fa4\u5cf6
-MQ=\u6cd5\u5c6c\u73bb\u91cc\u5c3c\u897f\u4e9e
-MR=\u8305\u5229\u5854\u5c3c\u4e9e
-MS=\u8499\u7279\u8272\u62c9\u7279\u5cf6
-MT=\u99ac\u723e\u4ed6
-MU=\u6a21\u91cc\u897f\u65af
-MV=\u99ac\u723e\u5730\u592b
-MW=\u99ac\u62c9\u5a01
-MX=\u58a8\u897f\u54e5
-MY=\u99ac\u4f86\u897f\u4e9e
-MZ=\u83ab\u4e09\u6bd4\u514b
-NA=\u7d0d\u7c73\u6bd4\u4e9e
-NC=\u65b0\u5580\u91cc\u591a\u5c3c\u4e9e\u7fa4\u5cf6
-NE=\u5c3c\u65e5
-NF=\u8afe\u798f\u514b\u5cf6
-NG=\u5948\u53ca\u5229\u4e9e
-NI=\u5c3c\u52a0\u62c9\u74dc
-NL=\u8377\u862d
-NO=\u632a\u5a01
-NP=\u5c3c\u6cca\u723e
-NR=\u8afe\u9b6f
-NU=\u7d10\u5a01\u5cf6
-NZ=\u7d10\u897f\u862d
-OM=\u963f\u66fc
-PA=\u5df4\u62ff\u99ac
-PE=\u7955\u9b6f\u5171\u548c\u570b
-PF=\u6cd5\u5c6c\u73bb\u91cc\u5c3c\u897f\u4e9e
-PG=\u5df4\u5e03\u4e9e\u7d10\u5e7e\u5167\u4e9e
-PH=\u83f2\u5f8b\u8cd3
-PK=\u5df4\u57fa\u65af\u5766
-PL=\u6ce2\u862d
-PM=\u8056\u76ae\u57c3\u723e\u548c\u5bc6\u514b\u9686
-PN=\u76ae\u7279\u5eb7
-PR=\u6ce2\u591a\u9ece\u5404
-PS=\u5df4\u52d2\u65af\u5766
+MG=\u99AC\u9054\u52A0\u65AF\u52A0
+MH=\u99AC\u7D39\u723E\u7FA4\u5CF6
+MK=\u99AC\u5176\u9813
+ML=\u99AC\u5229
+MM=\u7DEC\u7538
+MN=\u8499\u53E4
+MO=\u6FB3\u9580
+MP=\u5317\u99AC\u91CC\u5B89\u7D0D\u7FA4\u5CF6
+MQ=\u99AC\u4E01\u5C3C\u514B\u5CF6
+MR=\u8305\u5229\u5854\u5C3C\u4E9E
+MS=\u8499\u7279\u8272\u62C9\u7279\u5CF6
+MT=\u99AC\u723E\u4ED6
+MU=\u6A21\u91CC\u897F\u65AF
+MV=\u99AC\u723E\u5730\u592B
+MW=\u99AC\u62C9\u5A01
+MX=\u58A8\u897F\u54E5
+MY=\u99AC\u4F86\u897F\u4E9E
+MZ=\u83AB\u4E09\u6BD4\u514B
+NA=\u7D0D\u7C73\u6BD4\u4E9E
+NC=\u65B0\u5580\u91CC\u591A\u5C3C\u4E9E\u7FA4\u5CF6
+NE=\u5C3C\u65E5
+NF=\u8AFE\u798F\u514B\u5CF6
+NG=\u5948\u53CA\u5229\u4E9E
+NI=\u5C3C\u52A0\u62C9\u74DC
+NL=\u8377\u862D
+NO=\u632A\u5A01
+NP=\u5C3C\u6CCA\u723E
+NR=\u8AFE\u9B6F
+NU=\u7D10\u5A01\u5CF6
+NZ=\u7D10\u897F\u862D
+OM=\u963F\u66FC
+PA=\u5DF4\u62FF\u99AC
+PE=\u7955\u9B6F\u5171\u548C\u570B
+PF=\u6CD5\u5C6C\u73BB\u91CC\u5C3C\u897F\u4E9E
+PG=\u5DF4\u5E03\u4E9E\u7D10\u5E7E\u5167\u4E9E
+PH=\u83F2\u5F8B\u8CD3
+PK=\u5DF4\u57FA\u65AF\u5766
+PL=\u6CE2\u862D
+PM=\u8056\u76AE\u57C3\u723E\u548C\u5BC6\u514B\u9686
+PN=\u76AE\u7279\u5EB7
+PR=\u6CE2\u591A\u9ECE\u5404
+PS=\u5DF4\u52D2\u65AF\u5766
 PT=\u8461\u8404\u7259
-PW=\u5e1b\u7409
-PY=\u5df4\u62c9\u572d
+PW=\u5E1B\u7409
+PY=\u5DF4\u62C9\u572D
 QA=\u5361\u9054
-RE=\u7559\u5c3c\u65fa\u5cf6
-RO=\u7f85\u99ac\u5c3c\u4e9e
-RS=\u585e\u723e\u7dad\u4e9e
-RU=\u4fc4\u7f85\u65af\u806f\u90a6
-RW=\u76e7\u5b89\u9054
-SA=\u6c99\u70cf\u5730\u963f\u62c9\u4f2f
-SB=\u7d22\u7f85\u9580\u7fa4\u5cf6
-SC=\u585e\u5e2d\u723e
-SD=\u8607\u4e39
-SE=\u745e\u5178
-SG=\u65b0\u52a0\u5761
-SH=\u8056\u8d6b\u62ff\u52d2\u5cf6
-SI=\u65af\u6d1b\u7dad\u5c3c\u4e9e
-SJ=\u51b7\u5cb8\u548c\u592e\u9ea5\u6069\u5cf6
-SK=\u65af\u6d1b\u4f10\u514b
-SL=\u7345\u5b50\u5c71
-SM=\u8056\u99ac\u529b\u8afe
-SN=\u585e\u5167\u52a0\u723e
-SO=\u7d22\u99ac\u5229\u4e9e
+RE=\u7559\u5C3C\u65FA\u5CF6
+RO=\u7F85\u99AC\u5C3C\u4E9E
+RS=\u585E\u723E\u7DAD\u4E9E
+RU=\u4FC4\u7F85\u65AF\u806F\u90A6
+RW=\u76E7\u5B89\u9054
+SA=\u6C99\u70CF\u5730\u963F\u62C9\u4F2F
+SB=\u7D22\u7F85\u9580\u7FA4\u5CF6
+SC=\u585E\u5E2D\u723E
+SD=\u8607\u4E39
+SE=\u745E\u5178
+SG=\u65B0\u52A0\u5761
+SH=\u8056\u8D6B\u52D2\u62FF\u5CF6
+SI=\u65AF\u6D1B\u7DAD\u5C3C\u4E9E
+SJ=\u51B7\u5CB8\u53CA\u592E\u9EA5\u6069\u5CF6
+SK=\u65AF\u6D1B\u4F10\u514B
+SL=\u7345\u5B50\u5C71
+SM=\u8056\u99AC\u529B\u8AFE
+SN=\u585E\u5167\u52A0\u723E
+SO=\u7D22\u99AC\u5229\u4E9E
 SR=\u8607\u5229\u5357
-ST=\u8056\u591a\u7f8e
-SV=\u85a9\u723e\u74e6\u591a
+ST=\u8056\u591A\u7F8E
+SV=\u85A9\u723E\u74E6\u591A
 SX=\u8056\u99AC\u4E01 (\u8377\u862D\u90E8\u4EFD)
-SY=\u6558\u5229\u4e9e
-SZ=\u53f2\u74e6\u6fdf\u862d
-TC=\u571f\u514b\u65af\u548c\u958b\u5361\u65af\u7fa4\u5cf6
-TD=\u67e5\u5fb7
-TF=\u6cd5\u570b\u5357\u65b9\u9818\u5730
-TG=\u591a\u54e5
-TH=\u6cf0\u570b
-TJ=\u5854\u5409\u514b
-TK=\u6258\u514b\u52de\u7fa4\u5cf6
-TL=\u6771\u5e1d\u6c76
-TM=\u571f\u5eab\u66fc
-TN=\u7a81\u5c3c\u897f\u4e9e
-TO=\u6771\u52a0
-TR=\u571f\u8033\u5176
-TT=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5
-TV=\u5410\u74e6\u9b6f
-TW=\u53f0\u7063
-TZ=\u5766\u5c1a\u5c3c\u4e9e
-UA=\u70cf\u514b\u862d
-UG=\u70cf\u5e72\u9054
-UM=\u7f8e\u570b\u5916\u5cf6
-US=\u7f8e\u570b
-UY=\u70cf\u62c9\u572d
-UZ=\u70cf\u8332\u5225\u514b\u65af\u5766
-VA=\u68b5\u5e1d\u5d17
-VC=\u8056\u6587\u68ee\u53ca\u683c\u745e\u90a3\u4e01
-VE=\u59d4\u5167\u745e\u62c9
-VG=\u82f1\u5c6c\u7dad\u723e\u4eac\u7fa4\u5cf6
-VI=\u7f8e\u5c6c\u7dad\u723e\u4eac\u7fa4\u5cf6
-VN=\u8d8a\u5357
-VU=\u842c\u90a3\u675c
-WF=\u6c83\u5229\u65af\u548c\u5bcc\u7a81\u7d0d
-WS=\u85a9\u6469\u4e9e
+SY=\u6558\u5229\u4E9E
+SZ=\u53F2\u74E6\u6FDF\u862D
+TC=\u571F\u514B\u65AF\u548C\u958B\u5361\u65AF\u7FA4\u5CF6
+TD=\u67E5\u5FB7
+TF=\u6CD5\u570B\u5357\u65B9\u9818\u5730
+TG=\u591A\u54E5
+TH=\u6CF0\u570B
+TJ=\u5854\u5409\u514B
+TK=\u6258\u514B\u52DE\u7FA4\u5CF6
+TL=\u6771\u5E1D\u6C76
+TM=\u571F\u5EAB\u66FC
+TN=\u7A81\u5C3C\u897F\u4E9E
+TO=\u6771\u52A0
+TR=\u571F\u8033\u5176
+TT=\u5343\u91CC\u9054\u53CA\u6258\u5DF4\u54E5
+TV=\u5410\u74E6\u9B6F
+TW=\u53F0\u7063
+TZ=\u5766\u5C1A\u5C3C\u4E9E
+UA=\u70CF\u514B\u862D
+UG=\u70CF\u5E72\u9054
+UM=\u7F8E\u570B\u5916\u5CF6
+US=\u7F8E\u570B
+UY=\u70CF\u62C9\u572D
+UZ=\u70CF\u8332\u5225\u514B\u65AF\u5766
+VA=\u68B5\u5E1D\u5CA1
+VC=\u8056\u6587\u68EE\u53CA\u683C\u745E\u90A3\u4E01
+VE=\u59D4\u5167\u745E\u62C9
+VG=\u82F1\u5C6C\u7DAD\u723E\u4EAC\u7FA4\u5CF6
+VI=\u7F8E\u5C6C\u7DAD\u723E\u4EAC\u7FA4\u5CF6
+VN=\u8D8A\u5357
+VU=\u842C\u90A3\u675C
+WF=\u6C83\u5229\u65AF\u548C\u5BCC\u7A81\u7D0D
+WS=\u85A9\u6469\u4E9E
 YE=\u8449\u9580
-YT=\u99ac\u7d04\u7279\u5cf6
-ZA=\u5357\u975e
-ZM=\u5c1a\u6bd4\u4e9e
-ZW=\u8f9b\u5df4\u5a01
+YT=\u99AC\u7D04\u7279\u5CF6
+ZA=\u5357\u975E
+ZM=\u5C1A\u6BD4\u4E9E
+ZW=\u8F9B\u5DF4\u5A01
 
 # territory names
 # key is UN M.49 country and area code
@@ -1151,3 +1152,19 @@
 154=\u5317\u6B50
 155=\u897F\u6B50
 419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77
+
+# variant names
+# key is %%variant
+# rarely localized
+
+%%EURO=\u6B50\u5143
+%%B=\u6CE2\u514B\u9ED8\u723E\u6587
+%%NY=\u8010\u8AFE\u65AF\u514B\u6587
+
+
+# locale name patterns
+# rarely localized
+
+DisplayNamePattern={0,choice,0#|1#{1}|2#{1} ({2})}
+ListPattern={0,choice,0#|1#{1}|2#{1},{2}|3#{1},{2},{3}}
+ListCompositionPattern={0},{1}
diff --git a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
index 777e1cf..a8121d6 100644
--- a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
+++ b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
@@ -3,13 +3,6 @@
 
 Title=\u30E1\u30E2\u5E33
 ElementTreeFrameTitle=\u8981\u7D20
-ViewportBackingStore=false
-
-# menubar definition
-#
-# Each of the strings that follow form a key to be 
-# used to the actual menu definition.
-menubar=file edit debug
 
 # file Menu definition
 #
@@ -20,7 +13,7 @@
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
-file=new open save - exit
+
 fileLabel=\u30D5\u30A1\u30A4\u30EB
 openLabel=\u958B\u304F
 openImage=resources/open.gif
@@ -36,29 +29,23 @@
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
-edit=cut copy paste - undo redo
+
 editLabel=\u7DE8\u96C6
 cutLabel=\u5207\u53D6\u308A
-cutAction=cut-to-clipboard
 cutImage=resources/cut.gif
 copyLabel=\u30B3\u30D4\u30FC
-copyAction=copy-to-clipboard
 copyImage=resources/copy.gif
 pasteLabel=\u8CBC\u4ED8\u3051
-pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u5143\u306B\u623B\u3059
-undoAction=Undo
 redoLabel=\u518D\u5B9F\u884C
-redoAction=Redo
 
 #
 # debug Menu definition
 #
-debug=dump showElementTree
+
 debugLabel=\u30C7\u30D0\u30C3\u30B0
 dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
-dumpAction=dump-model
 showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
 
 # toolbar definition
@@ -67,7 +54,7 @@
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
-toolbar=new open save - cut copy paste
+
 newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B
 openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
 saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
diff --git a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
index be6ec06..fa08c7f 100644
--- a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
+++ b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
@@ -3,13 +3,6 @@
 
 Title=\u8BB0\u4E8B\u672C
 ElementTreeFrameTitle=\u5143\u7D20
-ViewportBackingStore=false
-
-# menubar definition
-#
-# Each of the strings that follow form a key to be 
-# used to the actual menu definition.
-menubar=file edit debug
 
 # file Menu definition
 #
@@ -20,7 +13,7 @@
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
-file=new open save - exit
+
 fileLabel=\u6587\u4EF6
 openLabel=\u6253\u5F00
 openImage=resources/open.gif
@@ -36,29 +29,23 @@
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
-edit=cut copy paste - undo redo
+
 editLabel=\u7F16\u8F91
 cutLabel=\u526A\u5207
-cutAction=cut-to-clipboard
 cutImage=resources/cut.gif
 copyLabel=\u590D\u5236
-copyAction=copy-to-clipboard
 copyImage=resources/copy.gif
 pasteLabel=\u7C98\u8D34
-pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u64A4\u6D88
-undoAction=Undo
 redoLabel=\u91CD\u505A
-redoAction=Redo
 
 #
 # debug Menu definition
 #
-debug=dump showElementTree
+
 debugLabel=\u8C03\u8BD5
 dumpLabel=\u5C06\u6A21\u578B\u8F6C\u50A8\u5230 System.err
-dumpAction=dump-model
 showElementTreeLabel=\u663E\u793A\u5143\u7D20
 
 # toolbar definition
@@ -67,7 +54,7 @@
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
-toolbar=new open save - cut copy paste
+
 newTooltip=\u521B\u5EFA\u65B0\u6587\u4EF6
 openTooltip=\u6253\u5F00\u6587\u4EF6
 saveTooltip=\u4FDD\u5B58\u6587\u4EF6
diff --git a/langtools/.hgtags b/langtools/.hgtags
index f8c7633..fb95e67 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -177,3 +177,4 @@
 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10
 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11
 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12
+fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
index 27305c3..48400e5 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
+++ b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2006, 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
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
index b2565bc..20b0b49 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
+++ b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2006, 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
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
index d3057a2..f887dcd 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
@@ -32,6 +32,7 @@
 doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
 doclet.navAnnotationTypeMember=\u8981\u7D20
 doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.navEnum=\u5217\u6319\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
@@ -40,6 +41,7 @@
 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
 doclet.Help=\u30D8\u30EB\u30D7
 doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
+doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
 doclet.New_Page=NewPage
 doclet.None=\u306A\u3057
 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
@@ -189,7 +191,9 @@
 doclet.ClassUse_TypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30AF\u30E9\u30B9
 doclet.ClassUse_MethodTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
 doclet.ClassUse_FieldTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.ClassUse_PropertyTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.ClassUse_FieldAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.ClassUse_PropertyAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.ClassUse_MethodAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
 doclet.ClassUse_MethodParameterAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
 doclet.ClassUse_MethodReturnTypeParameter={0}\u578B\u306E\u5F15\u6570\u3092\u6301\u3064\u578B\u3092\u8FD4\u3059{1}\u306E\u30E1\u30BD\u30C3\u30C9
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
index 2223970..9260d65 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
@@ -32,6 +32,7 @@
 doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700
 doclet.navAnnotationTypeMember=\u5143\u7D20
 doclet.navField=\u5B57\u6BB5
+doclet.navProperty=\u5C5E\u6027
 doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
 doclet.navConstructor=\u6784\u9020\u5668
 doclet.navMethod=\u65B9\u6CD5
@@ -40,6 +41,7 @@
 doclet.Window_Split_Index={0} - \u7D22\u5F15
 doclet.Help=\u5E2E\u52A9
 doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
+doclet.Navigation=\u5BFC\u822A
 doclet.New_Page=NewPage
 doclet.None=\u65E0
 doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
@@ -189,7 +191,9 @@
 doclet.ClassUse_TypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u7C7B
 doclet.ClassUse_MethodTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
 doclet.ClassUse_FieldTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
+doclet.ClassUse_PropertyTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5C5E\u6027
 doclet.ClassUse_FieldAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
+doclet.ClassUse_PropertyAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5C5E\u6027
 doclet.ClassUse_MethodAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
 doclet.ClassUse_MethodParameterAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5\u53C2\u6570
 doclet.ClassUse_MethodReturnTypeParameter=\u8FD4\u56DE\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684\u7C7B\u578B\u7684{1}\u4E2D\u7684\u65B9\u6CD5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
index 0ca7929..83c4b66 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
@@ -6,6 +6,7 @@
 doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
 doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
 doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.Serialized_Form_properties=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
 doclet.Class_0_implements_serializable=Class {0} implements Serializable
 doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
@@ -37,6 +38,12 @@
 doclet.Error_taglet_not_registered=\u30A8\u30E9\u30FC - \u30BF\u30B0\u30EC\u30C3\u30C8{1}\u3092\u767B\u9332\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4F8B\u5916{0}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F...
 doclet.Error_invalid_custom_tag_argument=\u30A8\u30E9\u30FC - {0}\u306F-tag\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5BFE\u3057\u3066\u7121\u52B9\u306A\u5F15\u6570\u3067\u3059...
 doclet.Author=\u4F5C\u6210\u8005:
+doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
+doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
+doclet.PropertyGetter=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059
+doclet.PropertySetter=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+doclet.PropertyGetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+doclet.PropertySetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
 doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
 doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
 doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
@@ -58,6 +65,7 @@
 doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
 doclet.malformed_html_link_tag=<a> \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}"
 doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
+doclet.javafx_tag_misuse=\u30BF\u30B0@propertyGetter\u3001@propertySetter\u304A\u3088\u3073@propertyDescription\u306F\u3001JavaFX\u306E\u30D7\u30ED\u30D1\u30C6\u30A3getter\u3068setter\u306E\u307F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
 doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
 doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
 doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
@@ -69,6 +77,7 @@
 doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
 doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981
+doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
 doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
@@ -115,12 +124,15 @@
 doclet.Methods_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
 doclet.Fields_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Fields_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.Properties_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
+doclet.Properties_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Serializable=\u76F4\u5217\u5316\u53EF\u80FD
 doclet.Externalizable=\u5916\u90E8\u5316\u53EF\u80FD
 doclet.Annotation_Type_Member_Detail=\u8981\u7D20\u306E\u8A73\u7D30
 doclet.Enum_Constant_Detail=\u5217\u6319\u578B\u5B9A\u6570\u306E\u8A73\u7D30
 doclet.Constants_Summary=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
 doclet.Field_Detail=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u8A73\u7D30
+doclet.Property_Detail=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8A73\u7D30
 doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
 doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30
 doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
@@ -135,6 +147,8 @@
 doclet.Member_Table_Summary={0}\u8868\u3001{1}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E
 doclet.fields=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.properties=\u30D7\u30ED\u30D1\u30C6\u30A3
+doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.methods=\u30E1\u30BD\u30C3\u30C9
@@ -152,6 +166,7 @@
 doclet.Modifier=\u4FEE\u98FE\u5B50
 doclet.Type=\u30BF\u30A4\u30D7
 doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.Method=\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
index 3e1fa62..9371b26 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
@@ -6,6 +6,7 @@
 doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
 doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
 doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
+doclet.Serialized_Form_properties=\u5E8F\u5217\u5316\u5C5E\u6027
 doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
 doclet.Class_0_implements_serializable=\u7C7B{0}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
 doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
@@ -37,6 +38,12 @@
 doclet.Error_taglet_not_registered=\u9519\u8BEF - \u5C1D\u8BD5\u6CE8\u518C Taglet {1}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF{0}...
 doclet.Error_invalid_custom_tag_argument=\u9519\u8BEF - \u5BF9\u4E8E -tag \u9009\u9879, {0}\u662F\u65E0\u6548\u53C2\u6570...
 doclet.Author=\u4F5C\u8005:
+doclet.DefaultValue=\u9ED8\u8BA4\u503C:
+doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
+doclet.PropertyGetter=\u83B7\u53D6\u5C5E\u6027\u7684\u503C
+doclet.PropertySetter=\u8BBE\u7F6E\u5C5E\u6027\u7684\u503C
+doclet.PropertyGetterWithName=\u83B7\u53D6\u5C5E\u6027{0}\u7684\u503C\u3002
+doclet.PropertySetterWithName=\u8BBE\u7F6E\u5C5E\u6027{0}\u7684\u503C\u3002
 doclet.Default=\u9ED8\u8BA4\u503C:
 doclet.Parameters=\u53C2\u6570:
 doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
@@ -58,6 +65,7 @@
 doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
 doclet.malformed_html_link_tag=<a> \u6807\u8BB0\u683C\u5F0F\u9519\u8BEF: \n"{0}"
 doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
+doclet.javafx_tag_misuse=\u6807\u8BB0 @propertyGetter, @propertySetter \u548C @propertyDescription \u53EA\u80FD\u5728 JavaFX \u5C5E\u6027 getter \u548C setter \u4E2D\u4F7F\u7528\u3002
 doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
 doclet.Interface_Summary=\u63A5\u53E3\u6982\u8981
 doclet.Annotation_Types_Summary=\u6CE8\u91CA\u7C7B\u578B\u6982\u8981
@@ -69,6 +77,7 @@
 doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
 doclet.Field_Summary=\u5B57\u6BB5\u6982\u8981
+doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
 doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
 doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
 doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
@@ -115,12 +124,15 @@
 doclet.Methods_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u65B9\u6CD5
 doclet.Fields_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5B57\u6BB5
 doclet.Fields_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5B57\u6BB5
+doclet.Properties_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5C5E\u6027
+doclet.Properties_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5C5E\u6027
 doclet.Serializable=\u53EF\u5E8F\u5217\u5316
 doclet.Externalizable=\u53EF\u5916\u90E8\u5316
 doclet.Annotation_Type_Member_Detail=\u5143\u7D20\u8BE6\u7EC6\u8D44\u6599
 doclet.Enum_Constant_Detail=\u679A\u4E3E\u5E38\u91CF\u8BE6\u7EC6\u8D44\u6599
 doclet.Constants_Summary=\u5E38\u91CF\u5B57\u6BB5\u503C
 doclet.Field_Detail=\u5B57\u6BB5\u8BE6\u7EC6\u8D44\u6599
+doclet.Property_Detail=\u5C5E\u6027\u8BE6\u7EC6\u4FE1\u606F
 doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
 doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599
 doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002
@@ -135,6 +147,8 @@
 doclet.Member_Table_Summary={0}\u8868, \u5217\u8868{1}\u548C\u89E3\u91CA
 doclet.fields=\u5B57\u6BB5
 doclet.Fields=\u5B57\u6BB5
+doclet.properties=\u5C5E\u6027
+doclet.Properties=\u5C5E\u6027
 doclet.constructors=\u6784\u9020\u5668
 doclet.Constructors=\u6784\u9020\u5668
 doclet.methods=\u65B9\u6CD5
@@ -152,6 +166,7 @@
 doclet.Modifier=\u9650\u5B9A\u7B26
 doclet.Type=\u7C7B\u578B
 doclet.Field=\u5B57\u6BB5
+doclet.Property=\u5C5E\u6027
 doclet.Constructor=\u6784\u9020\u5668
 doclet.Method=\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
@@ -167,4 +182,4 @@
 #Documentation for Enums
 doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n<pre>\nfor ({0} c : {0}.values())\n&nbsp;   System.out.println(c);\n</pre>\n@\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
 
-doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@throws \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@throws \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
+doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index 574f061..4b2f872 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -246,7 +246,7 @@
                                    final Name name,
                                    final Env<AttrContext> env) {
         if (tsym.kind != TYP) {
-            log.error(pos, "static.imp.only.classes.and.interfaces");
+            log.error(DiagnosticFlag.RECOVERABLE, pos, "static.imp.only.classes.and.interfaces");
             return;
         }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties b/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
index 74f9acd..07deaf2 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
+++ b/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
diff --git a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties b/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
index 8059d5e..5aedc94 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
+++ b/langtools/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, 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
diff --git a/langtools/test/tools/javac/T7159016.java b/langtools/test/tools/javac/T7159016.java
new file mode 100644
index 0000000..4c74f26
--- /dev/null
+++ b/langtools/test/tools/javac/T7159016.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010, 2012, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7159016
+ * @summary Static import of member in processor-generated class fails in JDK 7
+ * @library lib
+ * @build JavacTestingAbstractProcessor
+ * @run main T7159016
+ * @author Jesse Glick
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+
+public class T7159016 {
+    public static void main(String[] args) throws Exception {
+        File src = new File("C.java");
+        Writer w = new FileWriter(src);
+        try {
+            w.write("import static p.Generated.m;\nclass C { {m(); } }\n");
+            w.flush();
+        } finally {
+            w.close();
+        }
+        JavaCompiler jc = ToolProvider.getSystemJavaCompiler();
+        JavaCompiler.CompilationTask task = jc.getTask(null, null, null, null, null,
+                                                       jc.getStandardFileManager(null, null, null).getJavaFileObjects(src));
+        task.setProcessors(Collections.singleton(new Proc()));
+        if (!task.call()) {
+            throw new Error("Test failed");
+        }
+    }
+
+    private static class Proc extends JavacTestingAbstractProcessor {
+        int written;
+        @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+            if (roundEnv.processingOver() || written++ > 0) {
+                return false;
+            }
+            messager.printMessage(Diagnostic.Kind.NOTE, "writing Generated.java");
+            try {
+                Writer w = processingEnv.getFiler().createSourceFile("p.Generated").openWriter();
+                try {
+                    w.write("package p; public class Generated { public static void m() { } }");
+                } finally {
+                    w.close();
+                }
+            } catch (IOException x) {
+                messager.printMessage(Diagnostic.Kind.ERROR, x.toString());
+            }
+            return true;
+        }
+    }
+}