diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index e97d290de9..89da99e3bd 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -411,12 +411,12 @@ public class JDKInstaller extends ToolInstaller { @Extension public static final class DescriptorImpl extends ToolInstallerDescriptor { public String getDisplayName() { - return "Install from java.sun.com"; // XXX I18N + return Messages.JDKInstaller_DescriptorImpl_displayName(); } public FormValidation doCheckId(@QueryParameter String value) { if (Util.fixEmpty(value) == null) { - return FormValidation.error("Define JDK ID"); // XXX I18N and improve message + return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckId()); // improve message } else { // XXX further checks? return FormValidation.ok(); @@ -435,7 +435,7 @@ public class JDKInstaller extends ToolInstaller { if (value) { return FormValidation.ok(); } else { - return FormValidation.error("You must agree to the license to download the JDK."); // XXX I18N + return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckAcceptLicense()); } } } diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java index a1e55c9e96..a1f8fca905 100644 --- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java +++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java @@ -108,7 +108,7 @@ public class ToolLocationNodeProperty extends NodeProperty { public static class DescriptorImpl extends NodePropertyDescriptor { public String getDisplayName() { - return Messages.ToolLocationNodeProperty_DisplayName(); + return Messages.ToolLocationNodeProperty_displayName(); } public DescriptorExtensionList> getToolDescriptors() { diff --git a/core/src/main/resources/hudson/model/Hudson/configure_ja.properties b/core/src/main/resources/hudson/model/Hudson/configure_ja.properties index 12fad4db38..32cc693e21 100644 --- a/core/src/main/resources/hudson/model/Hudson/configure_ja.properties +++ b/core/src/main/resources/hudson/model/Hudson/configure_ja.properties @@ -49,3 +49,5 @@ Save=\u4FDD\u5B58 statsBlurb=\ \u5229\u7528\u72B6\u6CC1\u3068\u30AF\u30E9\u30C3\u30B7\u30E5\u30EC\u30DD\u30FC\u30C8\u3092Hudson\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u533F\u540D\u3067\u5831\u544A Global\ properties=\u30B0\u30ED\u30FC\u30D0\u30EB \u30D7\u30ED\u30D1\u30C6\u30A3 +Add\ JDK=\u8FFD\u52A0 + diff --git a/core/src/main/resources/hudson/model/JDK/config_ja.properties b/core/src/main/resources/hudson/model/JDK/config_ja.properties index 0c94b38d7e..2d766331ef 100644 --- a/core/src/main/resources/hudson/model/JDK/config_ja.properties +++ b/core/src/main/resources/hudson/model/JDK/config_ja.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. name=\u540D\u524D +Delete\ JDK=\u524A\u9664 \ No newline at end of file diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_ja.properties b/core/src/main/resources/hudson/tools/CommandInstaller/config_ja.properties new file mode 100644 index 0000000000..63309e863e --- /dev/null +++ b/core/src/main/resources/hudson/tools/CommandInstaller/config_ja.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Command=\u30B3\u30DE\u30F3\u30C9 +Tool\ Home=\u30C4\u30FC\u30EB\u30DB\u30FC\u30E0 diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command_ja.html b/core/src/main/resources/hudson/tools/CommandInstaller/help-command_ja.html new file mode 100644 index 0000000000..b6bf0d0e4f --- /dev/null +++ b/core/src/main/resources/hudson/tools/CommandInstaller/help-command_ja.html @@ -0,0 +1,4 @@ +
+ スレーブ上でツールをインストールするコマンドです。 + コマンドは常に実行されるので、ツールがインストール済みであれば、コマンドは何もしないようにすべきです。 +
diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help_ja.html b/core/src/main/resources/hudson/tools/CommandInstaller/help_ja.html new file mode 100644 index 0000000000..3dc9ccc699 --- /dev/null +++ b/core/src/main/resources/hudson/tools/CommandInstaller/help_ja.html @@ -0,0 +1,21 @@ +

+ 選択したシェルを起動してツールをインストールします。 + 例えば、UbuntuにおいてHudsonのユーザーは/etc/sudoersに登録されているとすれば、 +

+
sudo apt-get --yes install openjdk-6-jdk
+

+ (この場合、ツールホームとして/usr/lib/jvm/java-6-openjdkを設定します) +

+

+ 別の例として、Sun JDK 6 for (x86) Linuxをインストールする場合、 + DLJを使用することができます。 +

+
bin=jdk-6u13-dlj-linux-i586.bin
+if [ \! -f $bin ]
+then
+    wget --no-verbose http://download.java.net/dlj/binaries/$bin
+    sh $bin --unpack --accept-license
+fi
+

+ (この場合、ツールホームとしてjdk1.6.0_13を設定します) +

diff --git a/core/src/main/resources/hudson/tools/InstallSourceProperty/help_ja.html b/core/src/main/resources/hudson/tools/InstallSourceProperty/help_ja.html new file mode 100644 index 0000000000..e71f07f6f9 --- /dev/null +++ b/core/src/main/resources/hudson/tools/InstallSourceProperty/help_ja.html @@ -0,0 +1,12 @@ +
+ このオプションを選択すると、ツールを上記で設定した場所に必要に応じてインストールします。 + +

+ このオプションを選択すると、このツールの一連の"インストーラ"を設定することができます。 + 各インストーラではどのようにツールのインストールを試みるかを定義します。 + +

+ Antのようなプラットフォームに依存していないツールでは、複数のインストーラを設定してもあまり意味がありません。 + しかし、プラットフォーム依存のツールでは、複数のインストーラを設定することで、 + スレーブの環境に応じた異なるセットアップスクリプトを実行することができます。 +

\ No newline at end of file diff --git a/core/src/main/resources/hudson/tools/JDKInstaller/config_ja.properties b/core/src/main/resources/hudson/tools/JDKInstaller/config_ja.properties new file mode 100644 index 0000000000..720aec4acc --- /dev/null +++ b/core/src/main/resources/hudson/tools/JDKInstaller/config_ja.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Version=\u30D0\u30FC\u30B8\u30E7\u30F3 diff --git a/core/src/main/resources/hudson/tools/Messages.properties b/core/src/main/resources/hudson/tools/Messages.properties index ece3067b8b..eafa4c3069 100644 --- a/core/src/main/resources/hudson/tools/Messages.properties +++ b/core/src/main/resources/hudson/tools/Messages.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ToolLocationNodeProperty.DisplayName=Tool Locations +ToolLocationNodeProperty.displayName=Tool Locations CommandInstaller.DescriptorImpl.displayName=Run Command CommandInstaller.no_command=Must provide a command to run. CommandInstaller.no_toolHome=Must provide a tool home directory. @@ -29,3 +29,6 @@ ZipExtractionInstaller.bad_connection=Server rejected connection. ZipExtractionInstaller.malformed_url=Malformed URL. ZipExtractionInstaller.could_not_connect=Could not connect to URL. InstallSourceProperty.DescriptorImpl.displayName=Install automatically +JDKInstaller.DescriptorImpl.displayName=Install from java.sun.com +JDKInstaller.DescriptorImpl.doCheckId=Define JDK ID +JDKInstaller.DescriptorImpl.doCheckAcceptLicense=You must agree to the license to download the JDK. \ No newline at end of file diff --git a/core/src/main/resources/hudson/tools/Messages_fr.properties b/core/src/main/resources/hudson/tools/Messages_fr.properties index 2e189c386a..73c551945b 100644 --- a/core/src/main/resources/hudson/tools/Messages_fr.properties +++ b/core/src/main/resources/hudson/tools/Messages_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ToolLocationNodeProperty.DisplayName=Emplacement des outils +ToolLocationNodeProperty.displayName=Emplacement des outils diff --git a/core/src/main/resources/hudson/tools/Messages_ja.properties b/core/src/main/resources/hudson/tools/Messages_ja.properties index 420a71c37a..3f955e8fb6 100644 --- a/core/src/main/resources/hudson/tools/Messages_ja.properties +++ b/core/src/main/resources/hudson/tools/Messages_ja.properties @@ -20,4 +20,16 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ToolLocationNodeProperty.DisplayName=\u30C4\u30FC\u30EB\u30D1\u30B9 +ToolLocationNodeProperty.displayName=\u30C4\u30FC\u30EB\u30D1\u30B9 +CommandInstaller.DescriptorImpl.displayName=\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C +CommandInstaller.no_command=\u5B9F\u884C\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +CommandInstaller.no_toolHome=\u30C4\u30FC\u30EB\u306E\u30DB\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +ZipExtractionInstaller.DescriptorImpl.displayName=*.zip/*.tar.gz\u5C55\u958B +ZipExtractionInstaller.bad_connection=\u30B5\u30FC\u30D0\u304C\u63A5\u7D9A\u3092\u62D2\u5426\u3057\u307E\u3057\u305F\u3002 +ZipExtractionInstaller.malformed_url=URL\u306E\u5F62\u5F0F\u304C\u8AA4\u3063\u3066\u3044\u307E\u3059\u3002 +ZipExtractionInstaller.could_not_connect=URL\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002 +InstallSourceProperty.DescriptorImpl.displayName=\u81EA\u52D5\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB +JDKInstaller.DescriptorImpl.displayName=java.sun.com\u304B\u3089\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB +JDKInstaller.DescriptorImpl.doCheckId=JDK\u306EID\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +JDKInstaller.DescriptorImpl.doCheckAcceptLicense=JDK\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u306B\u306F\u30E9\u30A4\u30BB\u30F3\u30B9\u306B\u540C\u610F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 + diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config_ja.properties b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config_ja.properties new file mode 100644 index 0000000000..93be0d68a3 --- /dev/null +++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config_ja.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Download\ URL\ for\ binary\ archive=\u30A2\u30FC\u30AB\u30A4\u30D6\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9URL +Subdirectory\ of\ extracted\ archive=\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u5C55\u958B\u3059\u308B\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-subdir_ja.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-subdir_ja.html new file mode 100644 index 0000000000..6bac2b4b69 --- /dev/null +++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-subdir_ja.html @@ -0,0 +1,3 @@ +
+ ツールのホームディレクトリとして使用する、アーカイブを弾ロードして展開するサブディレクトリです(オプション)。 +
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html index 5ec03bb608..c5f96b2e09 100644 --- a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html +++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help-url.html @@ -1,7 +1,7 @@
- URL from which to download the tool in binary form. - Should be either a ZIP or a GZip-compressed TAR file. - The timestamp on the server will be compared to the local version (if any) - so you can publish updates easily. - The URL must be accessible from the Hudson master but need not be accessible from slaves. + バイナリ形式でツールをダウンロードするURLです。 + ZIPかGzipで圧縮したTARファイルのいずれかの形式である必要があります。 + サーバーにあるアーカイブのタイムスタンプと、(もしあれば)ローカルのファイルのタイムスタンプを比較するので、 + 容易にアップデートを配布できます。 + URLはマスターからアクセス可能でなければなりませんが、スレーブからはアクセス可能である必要はありません。
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help_ja.html b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help_ja.html new file mode 100644 index 0000000000..e23ba62f9e --- /dev/null +++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/help_ja.html @@ -0,0 +1,6 @@ +
+ ツールのアーカイブをダウンロードして、Hudsonのワークディレクトリにインストールします。 + 例えば: http://apache.promopeddler.com/ant/binaries/apache-ant-1.7.1-bin.zip + (もしくは、あなたのサーバーに一番近いミラーサイト) + そして、サブディレクトリにapache-ant-1.7.1を指定します。 +
diff --git a/core/src/main/resources/hudson/tools/label_ja.properties b/core/src/main/resources/hudson/tools/label_ja.properties new file mode 100644 index 0000000000..77cc3f8f10 --- /dev/null +++ b/core/src/main/resources/hudson/tools/label_ja.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Label=\u30E9\u30D9\u30EB diff --git a/war/resources/help/tools/help-label_ja.html b/war/resources/help/tools/help-label_ja.html new file mode 100644 index 0000000000..76c0082732 --- /dev/null +++ b/war/resources/help/tools/help-label_ja.html @@ -0,0 +1,4 @@ +
+ このインストールの使用を制限するためのラベルです(オプション)。 + このラベルを持つノードのみ対象になります。 +