diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index eee51477ff99e7e71ab5ac77ab7ee5d8b05eba00..94c10f1173d060a207b01c60532b48cdcb3a9625 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -24,13 +24,11 @@
 package jenkins.security;
 
 import hudson.Extension;
-import hudson.Functions;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
-import hudson.util.FormValidation;
 import hudson.util.HttpResponses;
 import hudson.util.Secret;
 import jenkins.model.Jenkins;
@@ -96,7 +94,7 @@ public class ApiTokenProperty extends UserProperty {
     @Extension
     public static final class DescriptorImpl extends UserPropertyDescriptor {
         public String getDisplayName() {
-            return "API Token";
+            return Messages.ApiTokenProperty_DisplayName();
         }
 
         /**
@@ -120,7 +118,7 @@ public class ApiTokenProperty extends UserProperty {
                 p.changeApiToken();
             }
             rsp.setHeader("script","document.getElementById('apiToken').value='"+p.getApiToken()+"'");
-            return HttpResponses.html("<div>Updated</div>");
+            return HttpResponses.html(Messages.ApiTokenProperty_ChangeToken_Success());
         }
     }
 
diff --git a/core/src/main/resources/jenkins/security/ApiTokenProperty/config.groovy b/core/src/main/resources/jenkins/security/ApiTokenProperty/config.groovy
index 7f4652317be8bcbce779de02ec8c1eb51c551767..e2b25ce5d901783027b1d0ad0562e4fb9ce0a381 100644
--- a/core/src/main/resources/jenkins/security/ApiTokenProperty/config.groovy
+++ b/core/src/main/resources/jenkins/security/ApiTokenProperty/config.groovy
@@ -25,11 +25,11 @@ package jenkins.security.ApiTokenProperty;
 
 f=namespace(lib.FormTagLib)
 
-f.advanced(title:"Show API Token", align:"left") {
+f.advanced(title:_("Show API Token"), align:"left") {
     f.entry(title:_("API Token"), field:"apiToken") {
         f.readOnlyTextbox(id:"apiToken") // TODO: need to figure out the way to do this without using ID.
     }
-    f.validateButton(title:"Change API Token",method:"changeToken")
+    f.validateButton(title:_("Change API Token"),method:"changeToken")
 }
 
 //f.entry(title:_("API Token"),field:"apiToken") {
diff --git a/core/src/main/resources/jenkins/security/ApiTokenProperty/config_ja.properties b/core/src/main/resources/jenkins/security/ApiTokenProperty/config_ja.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1ba9cbe07d7c4567be169821137ec489394b8a40
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/ApiTokenProperty/config_ja.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright 2011 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.
+
+Show\ API\ Token=API\u30c8\u30fc\u30af\u30f3\u306e\u8868\u793a
+API\ Token=API\u30c8\u30fc\u30af\u30f3
+Change\ API\ Token=API\u30c8\u30fc\u30af\u30f3\u306e\u5909\u66f4
diff --git a/core/src/main/resources/jenkins/security/ApiTokenProperty/help-apiToken_ja.html b/core/src/main/resources/jenkins/security/ApiTokenProperty/help-apiToken_ja.html
new file mode 100644
index 0000000000000000000000000000000000000000..ffd0e327c6c5693e24f40b64236213986bdb01d5
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/ApiTokenProperty/help-apiToken_ja.html
@@ -0,0 +1,5 @@
+<div>
+    APIトークンは、REST API使用時の認証に使用されます。
+    詳細は<a href="https://wiki.jenkins-ci.org/display/JA/Remote+access+API">Wiki</a>を参照してください。
+    APIトークンはパスワードと同様に保護すル必要があります。そうしないと、他人が詐称してJenkinsにアクセス可能になります。
+</div>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f953dd554f560321db1f89038a02fe5452b8c51b
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/Messages.properties
@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright 2011 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.
+
+ApiTokenProperty.DisplayName=API Token
+ApiTokenProperty.ChangeToken.Success=<div>Updated</div>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/security/Messages_ja.properties b/core/src/main/resources/jenkins/security/Messages_ja.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7a336bccd561a9222451e4ffe303b2496c62dd8a
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/Messages_ja.properties
@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright 2011 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.
+
+ApiTokenProperty.DisplayName=API\u30c8\u30fc\u30af\u30f3
+ApiTokenProperty.ChangeToken.Success=<div>\u66f4\u65b0\u3057\u307e\u3057\u305f</div>