Mercurial > hg > openjdk > jdk6 > jdk
changeset 1508:5246ba6cc300
6566218: l10n of 6476932
Reviewed-by: yhuang
author | mfang |
---|---|
date | Sun, 04 Dec 2016 17:18:06 +0000 |
parents | 9f0c0a077605 |
children | e1632b96e60d |
files | src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java |
diffstat | 3 files changed, 24 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Thu Sep 09 23:01:43 2010 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Sun Dec 04 17:18:06 2016 +0000 @@ -439,8 +439,8 @@ "Usage: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n" + " -interval Set the update interval to n seconds (default is 4 seconds)\n" + " -notile Do not tile windows initially (for two or more connections)\n" + - " -pluginpath Specify the path that jconsole uses to look up the plugins\n\n" + - " -version Print program version\n" + + " -pluginpath Specify the path that jconsole uses to look up the plugins\n" + + " -version Print program version\n\n" + " connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n" + " pid The process id of a target process\n" + " host A remote host name or IP address\n" +
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Thu Sep 09 23:01:43 2010 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Sun Dec 04 17:18:06 2016 +0000 @@ -46,8 +46,6 @@ */ public class JConsoleResources_ja extends JConsoleResources { - private static final String cr = System.getProperty("line.separator"); - /** * Returns the contents of this <code>ResourceBundle</code>. * @@ -56,7 +54,7 @@ * @return the contents of this <code>ResourceBundle</code>. */ protected Object[][] getContents0() { - return new Object[][] { + Object[][] temp = new Object[][] { // NOTE 1: The value strings in this file containing "{0}" are // processed by the java.text.MessageFormat class. Any // single quotes appearing in these strings need to be @@ -426,6 +424,16 @@ "\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"}, // END OF MATERIAL TO LOCALIZE }; + + String ls = System.getProperty("line.separator"); + for(int i=0;i<temp.length;i++) { + if (temp[i][1] instanceof String){ + temp[i][1] = temp[i][1].toString().replaceAll("\n",ls); + } + } + + return temp; + } public synchronized Object[][] getContents() {
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Thu Sep 09 23:01:43 2010 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Sun Dec 04 17:18:06 2016 +0000 @@ -46,8 +46,6 @@ */ public class JConsoleResources_zh_CN extends JConsoleResources { - private static final String cr = System.getProperty("line.separator"); - /** * Returns the contents of this <code>ResourceBundle</code>. * @@ -56,7 +54,7 @@ * @return the contents of this <code>ResourceBundle</code>. */ protected Object[][] getContents0() { - return new Object[][] { + Object[][] temp = new Object[][] { // NOTE 1: The value strings in this file containing "{0}" are // processed by the java.text.MessageFormat class. Any // single quotes appearing in these strings need to be @@ -426,6 +424,16 @@ "\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"}, // END OF MATERIAL TO LOCALIZE }; + + String ls = System.getProperty("line.separator"); + for(int i=0;i<temp.length;i++) { + if (temp[i][1] instanceof String){ + temp[i][1] = temp[i][1].toString().replaceAll("\n",ls); + } + } + + return temp; + } public synchronized Object[][] getContents() {