Merge

3e19cfc9 · asaha · 82c6f0dd · f7fe66d9 · 3e19cfc9 · 3e19cfc9
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

.hgtags .hgtags +2 -0

src/share/classes/sun/awt/resources/awt_ja.properties src/share/classes/sun/awt/resources/awt_ja.properties +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -348,6 +348,8 @@ b6aeaae6dd9d3a17564130af142b4734c643267e jdk8u31-b06
 ca1adc7c848370dda8dbf9e3a970c3e6427fb05b jdk8u31-b08
 1c0cc3bbe07d52906d7ffbb72fa4733c327f1326 jdk8u31-b09
 291505d802d9075e227f9ee865a67234e1d737cf jdk8u31-b10
+a21dd7999d1e4ba612c951c2c78504d23eb7243a jdk8u31-b11
+6a12f34816d2ee12368274fc21225384a8893426 jdk8u31-b12
 e6ed015afbbf3459ba3297e270b4f3170e989c80 jdk8u40-b00
 6e223d48080ef40f4ec11ecbcd19b4a20813b9eb jdk8u40-b01
 4797cd0713b44b009525f1276d571ade7e24f3f5 jdk8u40-b02

--- a/src/share/classes/sun/awt/resources/awt_ja.properties
+++ b/src/share/classes/sun/awt/resources/awt_ja.properties
@@ -176,8 +176,8 @@ AWT.HostInputMethodDisplayName=\u30B7\u30B9\u30C6\u30E0\u5165\u529B\u30E1\u30BD\
 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