changeset 10623:d55c202b2b8e

Merge
author asaha
date Fri, 12 Dec 2014 08:47:31 -0800
parents 599e53ff3189 1fbdd5d80d06
children 21888626b77e
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 03 09:28:25 2014 -0800
+++ b/.hgtags	Fri Dec 12 08:47:31 2014 -0800
@@ -350,3 +350,4 @@
 1c0cc3bbe07d52906d7ffbb72fa4733c327f1326 jdk8u31-b09
 291505d802d9075e227f9ee865a67234e1d737cf jdk8u31-b10
 a21dd7999d1e4ba612c951c2c78504d23eb7243a jdk8u31-b11
+6a12f34816d2ee12368274fc21225384a8893426 jdk8u31-b12
--- a/src/share/classes/sun/awt/resources/awt_ja.properties	Wed Dec 03 09:28:25 2014 -0800
+++ b/src/share/classes/sun/awt/resources/awt_ja.properties	Fri Dec 12 08:47:31 2014 -0800
@@ -176,8 +176,8 @@
 AWT.InputMethodLanguage.ja=\u65E5\u672C\u8A9E
 AWT.InputMethodLanguage.ko=\u97D3\u56FD\u8A9E
 AWT.InputMethodLanguage.zh=\u4E2D\u56FD\u8A9E
-AWT.InputMethodLanguage.zh_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E
-AWT.InputMethodLanguage.zh_TW=\u7E41\u4F53\u5B57\u4E2D\u56FD\u8A9E
+AWT.InputMethodLanguage.zh_CN=\u4E2D\u56FD\u8A9E(\u7C21\u4F53\u5B57)
+AWT.InputMethodLanguage.zh_TW=\u4E2D\u56FD\u8A9E(\u7E41\u4F53\u5B57)
 AWT.InputMethodCreationFailed={0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u7406\u7531: {1}
 
 # Property to select between on-the-spot and below-the-spot