Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 10759:bed34ce12413
Merge
| author | coffeys |
|---|---|
| date | Thu, 26 Feb 2015 10:06:22 +0000 |
| parents | af5d189cd4dd (current diff) 97f258823d7d (diff) |
| children | e1ca700aaa1f |
| files | .hgtags |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Feb 26 10:00:01 2015 +0000 +++ b/.hgtags Thu Feb 26 10:06:22 2015 +0000 @@ -373,6 +373,10 @@ 5c31204d19e5976f025026db3d5c17331e8c44db jdk8u40-b19 7784dab075ed82be2275f4694164bbb9cc1cde3f jdk8u40-b20 564bca490631e4ed4f7993e6633ed9ee62067624 jdk8u40-b21 +d168113f9841a77b3cee3a6a45fcd85b7351ac90 jdk8u40-b22 +41fe61722ce96b75dd3a1ba5072473122e21e5a0 jdk8u40-b23 +9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24 +f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25 5c31204d19e5976f025026db3d5c17331e8c44db jdk8u60-b00 c46daef6edb5385d11876ed40f292a4b62e96867 jdk8u60-b01 c10fd784956cc7099657181029ac3e790267b678 jdk8u60-b02
--- a/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Thu Feb 26 10:00:01 2015 +0000 +++ b/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Thu Feb 26 10:06:22 2015 +0000 @@ -104,7 +104,7 @@ 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: \u60C5\u5831 -HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html +HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=https://docs.oracle.com/javase/{0}/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)
--- a/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Thu Feb 26 10:00:01 2015 +0000 +++ b/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Thu Feb 26 10:06:22 2015 +0000 @@ -104,7 +104,7 @@ 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_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html +HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=https://docs.oracle.com/javase/{0}/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)