changeset 7868:9af83882ca9e jdk7u76-b12

Merge
author asaha
date Mon, 08 Dec 2014 12:52:19 -0800
parents be9307f90760 16043c4cefc3
children d068a9354e80
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 02 10:54:11 2014 -0800
+++ b/.hgtags	Mon Dec 08 12:52:19 2014 -0800
@@ -523,6 +523,7 @@
 0a1fe04693dd9f65176c35dc0631652086795f01 jdk7u75-b09
 c43642c55cd483f1d270e9ce55b9721fc32f900c jdk7u75-b10
 7bac76091c46f667f69aa9e426c29cc8e3a2d861 jdk7u75-b11
+1a37584734ff241c0c4c4382f7870efedef7e706 jdk7u75-b12
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
--- a/src/share/classes/sun/awt/resources/awt_ja.properties	Tue Dec 02 10:54:11 2014 -0800
+++ b/src/share/classes/sun/awt/resources/awt_ja.properties	Mon Dec 08 12:52:19 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