diff --git a/src/main/java/hudson/plugins/build_timeout/BuildStepWithTimeout.java b/src/main/java/hudson/plugins/build_timeout/BuildStepWithTimeout.java
index 9c8e4a0e..2f9f8c27 100644
--- a/src/main/java/hudson/plugins/build_timeout/BuildStepWithTimeout.java
+++ b/src/main/java/hudson/plugins/build_timeout/BuildStepWithTimeout.java
@@ -120,7 +120,7 @@ public BuildStepWithTimeout newInstance(StaplerRequest req, JSONObject formData)
 
         @Override
         public String getDisplayName() {
-            return "Run with timeout";
+            return Messages.BuildStepWithTimeout_DisplayName();
         }
 
         @Override
diff --git a/src/main/resources/hudson/plugins/build_timeout/BuildStepWithTimeout/config_ja.properties b/src/main/resources/hudson/plugins/build_timeout/BuildStepWithTimeout/config_ja.properties
new file mode 100644
index 00000000..4763ac8e
--- /dev/null
+++ b/src/main/resources/hudson/plugins/build_timeout/BuildStepWithTimeout/config_ja.properties
@@ -0,0 +1,28 @@
+T License
+#
+# Copyright (c) 20016-, 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.
+
+Build\ Step=\u30d3\u30eb\u30c9\u624b\u9806
+Time-out\ strategy=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306e\u5224\u5b9a\u65b9\u6cd5
+Time-out\ actions=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u6642\u306e\u30a2\u30af\u30b7\u30e7\u30f3
+Add\ action=\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u8ffd\u52a0
+
+
diff --git a/src/main/resources/hudson/plugins/build_timeout/BuildTimeoutWrapper/config_ja.properties b/src/main/resources/hudson/plugins/build_timeout/BuildTimeoutWrapper/config_ja.properties
old mode 100755
new mode 100644
index 6dac7255..157c006b
--- a/src/main/resources/hudson/plugins/build_timeout/BuildTimeoutWrapper/config_ja.properties
+++ b/src/main/resources/hudson/plugins/build_timeout/BuildTimeoutWrapper/config_ja.properties
@@ -20,13 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-#Time-out\ actions=タイムアウト時のアクション
 Time-out\ actions=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u6642\u306e\u30a2\u30af\u30b7\u30e7\u30f3
-#Add\ action=処理を追加する
-Add\ action=\u51e6\u7406\u3092\u8ffd\u52a0\u3059\u308b
-#Time-out\ strategy=タイムアウトの判定方法
+Add\ action=\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u8ffd\u52a0
 Time-out\ strategy=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306e\u5224\u5b9a\u65b9\u6cd5
-#Time-out\ variable=タイムアウト時間の保存先
 Time-out\ variable=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u6642\u9593\u306e\u4fdd\u5b58\u5148
-#Set\ a\ build\ timeout\ environment\ variable=使用されたタイムアウト時間 (ミリ秒) を保存する変数名
 Set\ a\ build\ timeout\ environment\ variable=\u4f7f\u7528\u3055\u308c\u305f\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u6642\u9593 (\u30df\u30ea\u79d2) \u3092\u4fdd\u5b58\u3059\u308b\u5909\u6570\u540d
diff --git a/src/main/resources/hudson/plugins/build_timeout/Messages.properties b/src/main/resources/hudson/plugins/build_timeout/Messages.properties
index bbb09007..eeebc5d0 100644
--- a/src/main/resources/hudson/plugins/build_timeout/Messages.properties
+++ b/src/main/resources/hudson/plugins/build_timeout/Messages.properties
@@ -3,3 +3,5 @@ Descriptor.DisplayName=Abort the build if it''s stuck
 Timeout.Message=Build timed out (after {0} minutes). Marking the build as {1}.
 Timeout.Aborted=aborted
 Timeout.Failed=failed
+
+BuildStepWithTimeout.DisplayName=Run with timeout
diff --git a/src/main/resources/hudson/plugins/build_timeout/Messages_ja.properties b/src/main/resources/hudson/plugins/build_timeout/Messages_ja.properties
old mode 100755
new mode 100644
index 63ad2594..7dd15bdc
--- a/src/main/resources/hudson/plugins/build_timeout/Messages_ja.properties
+++ b/src/main/resources/hudson/plugins/build_timeout/Messages_ja.properties
@@ -26,3 +26,5 @@ Descriptor.DisplayName=\u6ede\u7559\u3057\u305f\u5834\u5408\u306b\u30d3\u30eb\u3
 Timeout.Message=\u30d3\u30eb\u30c9\u304c\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u3057\u307e\u3057\u305f({0}\u5206)\u3002\u30d3\u30eb\u30c9\u3092"{1}"\u306b\u5909\u66f4\u3057\u307e\u3059\u3002
 Timeout.Aborted=\u4e2d\u6b62
 Timeout.Failed=\u5931\u6557
+
+BuildStepWithTimeout.DisplayName=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u4ed8\u304d\u306e\u8d77\u52d5
diff --git a/src/main/resources/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategy/config_ja.properties b/src/main/resources/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategy/config_ja.properties
old mode 100755
new mode 100644
index 126bee22..e6c0c575
--- a/src/main/resources/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategy/config_ja.properties
+++ b/src/main/resources/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategy/config_ja.properties
@@ -25,7 +25,6 @@ Timeout\ as\ a\ percentage\ of\ recent\ non-failing\ builds=\
  \u5931\u6557\u3057\u3066\u3044\u306a\u3044\u30d3\u30eb\u30c9\u306e\u5e73\u5747\u6240\u8981\u6642\u9593\u304b\u3089\u7b97\u51fa
 Timeout\ to\ use\ if\ there\ are\ no\ previous\ successful\ or\ unstable\ builds=\
  \u6210\u529f\u3082\u3057\u304f\u306f\u4e0d\u5b89\u5b9a\u30d3\u30eb\u30c9\u304c\u306a\u3044\u5834\u5408\u306e\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
-# Number\ of\ Builds=ビルドの数
 Number\ of\ Builds=\u30d3\u30eb\u30c9\u306e\u6570
-#Number\ of\ builds\ to\ consider\ computing\ average\ duration=平均所要時間の算出に使用するビルドの数
 Number\ of\ builds\ to\ consider\ computing\ average\ duration=\u5e73\u5747\u6240\u8981\u6642\u9593\u306e\u7b97\u51fa\u306b\u4f7f\u7528\u3059\u308b\u30d3\u30eb\u30c9\u306e\u6570
+Timeout\ minutes\ as\ the\ shortest\ timeout=
diff --git a/src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/help_ja.html b/src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/help_ja.html
deleted file mode 100644
index 220e8b77..00000000
--- a/src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/help_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<p>
-Jenkins の Executor.html#isLikelyStuck() で使用されている方法を用い、ビルドが過去の実績から推定される最大のビルド時間を超えている場合にタイムアウトします。
-<br/>
-</p>
diff --git a/src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/config_ja.properties b/src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/config_ja.properties
old mode 100755
new mode 100644
similarity index 85%
rename from src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/config_ja.properties
rename to src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/config_ja.properties
index 2fec0adb..80d954fc
--- a/src/main/resources/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy/config_ja.properties
+++ b/src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/config_ja.properties
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2004-2012, Sun Microsystems, Inc., Seiji Sogabe
+# Copyright (c) 2004-2016, 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
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Likely\ stuck=\u6ede\u7559\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u9ad8\u3044\u306a\u3089\u3070\u4e2d\u6b62
+Maximum\ restarts=\u6700\u5927\u518d\u8d77\u52d5\u56de\u6570
\ No newline at end of file
diff --git a/src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/help-maxRestarts_ja.html b/src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/help-maxRestarts_ja.html
new file mode 100644
index 00000000..f0de3636
--- /dev/null
+++ b/src/main/resources/hudson/plugins/build_timeout/operations/AbortAndRestartOperation/help-maxRestarts_ja.html
@@ -0,0 +1,3 @@
+<div>
+最大再起動回数。0は制限なしを表します。    
+</div>