diff --git a/src/components/IntlLink.js b/src/components/IntlLink.js
index 34bc1490a..ce225a060 100644
--- a/src/components/IntlLink.js
+++ b/src/components/IntlLink.js
@@ -6,7 +6,11 @@ import { useIntl } from 'react-intl'
 const IntlLink = ({ to, children, type, ...rest }) => {
   const intl = useIntl()
 
-  const localeTo = `${intl.locale === 'en' ? '' : '/' + intl.locale}${to}`
+  const localeTo = `${
+    (intl.locale === 'ja' && to === '/appdev/dev') || intl.locale === 'zh'
+      ? '/' + intl.locale
+      : ''
+  }${to}`
   const linkType = type
 
   return (
diff --git a/src/components/footer.js b/src/components/footer.js
index c5564d0df..e0cff8b27 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -5,7 +5,11 @@ import AddIcon from '@material-ui/icons/Add'
 import LanguageIcon from '@material-ui/icons/Language'
 import Socials from './socials'
 import IntlLink from '../components/IntlLink'
-import { footerColumnsZh, footerColumnsEn } from '../data/footer'
+import {
+  footerColumnsZh,
+  footerColumnsEn,
+  footerColumnsJa,
+} from '../data/footer'
 import { useLocation } from '@reach/router'
 import { useSelector } from 'react-redux'
 import { FormattedMessage } from 'react-intl'
@@ -15,7 +19,14 @@ const Footer = React.memo((prop) => {
   const switchableLangs = prop.switchableLangs
   const location = useLocation()
   const currentPathname = location.pathname
-  const footerColumns = locale === 'zh' ? footerColumnsZh : footerColumnsEn
+  const footerColumns =
+    locale === 'en'
+      ? footerColumnsEn
+      : locale === 'zh'
+      ? footerColumnsZh
+      : footerColumnsJa
+
+  console.log('footerColumns: ', footerColumns)
 
   const { FooterLogoSVG } = useStaticQuery(
     graphql`
diff --git a/src/components/navbar.js b/src/components/navbar.js
index 11a259355..359195aeb 100644
--- a/src/components/navbar.js
+++ b/src/components/navbar.js
@@ -107,7 +107,7 @@ const Navbar = (prop) => {
             </IntlLink>
 
             <IntlLink
-              to="/tools/"
+              to="/tools"
               className={`navbar-item with-main-section ${
                 (activeNav === 'tools' ||
                   activeNav === 'tidb-data-migration' ||
@@ -120,7 +120,7 @@ const Navbar = (prop) => {
             >
               <FormattedMessage id="navbar.tools" />
             </IntlLink>
-            {locale === 'en' && (
+            {locale !== 'zh' && (
               <IntlLink
                 to="/tidbcloud/public-preview"
                 className={`navbar-item with-main-section ${
diff --git a/src/intl/ja.json b/src/intl/ja.json
index c02e67740..3323bce69 100644
--- a/src/intl/ja.json
+++ b/src/intl/ja.json
@@ -1,109 +1,82 @@
 {
-    "navbar": {
-      "tidb": "TiDB",
-      "tools": "周辺ツール",
-      "appdev": "開発ガイド",
-      "download": "免费试用",
-      "contactUs": "联系我们",
-      "searchDocs": "搜索文档"
-    },
-    "doc": {
-      "mobileDocMenu": "文档目录",
-      "toc": "本页导航",
-      "improveDocLink": "修改本文",
-      "feedbackDocLink": "反馈文档问题",
-      "deprecation": {
-        "tidb": {
-          "firstContext": "你正在查看 TiDB 数据库的较旧版本 (TiDB { curDocVersion }) 的文档。",
-          "secondContext": "如无特殊需求，建议使用 TiDB 数据库的{ link }。",
-          "link": "最新稳定版本"
-        },
-        "tidb-in-kubernetes": {
-          "firstContext": "你正在查看 TiDB Operator 工具的较旧主版本 (TiDB Operator { curDocVersion }) 的文档。",
-          "secondContext": "TiDB Operator { stableVersion } 是 TiDB Operator 的最新稳定主版本，如无特殊需求，建议使用该版本。点击{ link }查看 TiDB Operator { stableVersion } 文档。",
-          "link": "此处"
-        },
-        "tidb-data-migration": {
-          "firstContext": "你正在查看 TiDB Data Migration 工具的较旧主版本 (TiDB Data Migration { curDocVersion }) 的文档。",
-          "secondContext": "TiDB Data Migration { stableVersion } 是 TiDB Data Migration 的最新稳定主版本，如无特殊需求，建议使用该版本。点击{ link }查看 TiDB Data Migration { stableVersion } 文档。",
-          "link": "此处"
-        }
-      }
-    },
-    "shortcodes": {
-      "note": "注意",
-      "warning": "警告",
-      "tip": "小贴士",
-      "error": "错误",
-      "important": "重要"
-    },
-    "syntaxDiagram": {
-      "syntaxDiagram": "语法图",
-      "ebnf": "代码"
-    },
-    "search": {
-      "type": "タイプ：",
-      "version": "バージョン：",
-      "resultTips": {
-        "counts": "{counts} 件の結果が見つかりました...",
-        "title": "ごめん。探しているものが見つかりませんでした。",
-        "content1": "予期しない言語のページにアクセスした場合は、中国語のドキュメントにアクセスして再試行してください。",
-        "content2": "英語のコンテンツを入手したい場合は、PingCAPホームページの方が適しているかもしれません。"
-      }
-    },
-    "download-pdf": "下载 PDF",
-    "latestCommit": "更新于",
-    "footerColumnsTitle": {
-      "product": "产品",
-      "resources": "资源",
-      "learn": "学习",
-      "support": "支持",
-      "company": "公司"
-    },
-    "footerColumnItem": {
-      "tidb": "TiDB",
-      "tools": "Tools",
-      "quickStart": "快速上手",
-      "bestPractices": "最佳实践",
-      "faq": "常见问题解答",
-      "releaseNotes": "版本发布",
-      "blog": "博客",
-      "github": "GitHub",
-      "docs": "文档",
-      "case": "案例",
-      "pu": "PingCAP University",
-      "tidbInAction": "TiDB in Action",
-      "communityEvents": "社区活动",
-      "asktug": "AskTUG",
-      "aboutUs": "关于我们",
-      "recruit": "招贤纳士",
-      "news": "新闻报道"
-    },
-    "toolsCard": {
-      "tidbOperator": {
-        "type": "TiDB Operator",
-        "desc": "TiDB Operator 是 Kubernetes 上的 TiDB 集群自动运维系统，提供包括部署、升级、扩缩容、备份恢复、配置变更的 TiDB 全生命周期管理。借助 TiDB Operator，TiDB 可以无缝运行在公有云或私有部署的 Kubernetes 集群上。"
+  "navbar": {
+    "tidb": "TiDB",
+    "tools": "Tools",
+    "cloud": "Cloud",
+    "appdev": "App Dev",
+    "download": "Get TiDB",
+    "contactUs": "Contact Us",
+    "searchDocs": "Search Docs"
+  },
+  "doc": {
+    "mobileDocMenu": "Doc Menu",
+    "toc": "What’s on this page",
+    "improveDocLink": "Edit this page",
+    "feedbackDocLink": "Request docs changes",
+    "deprecation": {
+      "tidb": {
+        "firstContext": "You are viewing the documentation of an older version of the TiDB database (TiDB { curDocVersion }).",
+        "secondContext": "It is recommended that you use { link } of the TiDB database. ",
+        "link": "the latest stable version"
       },
-      "tidbDataMigration": {
-        "type": "TiDB Data Migration",
-        "desc": "TiDB Data Migration (DM) 是一体化的数据同步任务管理平台，支持从 MySQL 或 MariaDB 到 TiDB 的全量数据迁移和增量数据同步。使用 DM 工具有利于简化错误处理流程，降低运维成本。"
+      "tidb-in-kubernetes": {
+        "firstContext": "You are viewing the documentation for an older major version of the TiDB Operator tool (TiDB Operator { curDocVersion }).",
+        "secondContext": "TiDB Operator { stableVersion }, the latest major version of TiDB Operator, is now stable and recommended for general use. To view this page for TiDB Operator { stableVersion }, click { link }.",
+        "link": "here"
       },
-      "databaseTools": {
-        "type": "TiDB 数据库工具",
-        "desc": "TiDB 数据库工具是处理 TiDB 导入导出数据的命令行实用程序的集合，包括全量导出工具 Dumpling、全量导入工具 TiDB Lightning、备份恢复工具 BR、增量同步工具 TiCDC、校验工具 sync-diff-inspector 等。"
-      },
-      "tiup": {
-        "type": "TiUP",
-        "desc": "TiUP 承担着包管理器的角色，管理着 TiDB 生态下众多的组件，如 TiDB、PD、TiKV 等。用户想要运行 TiDB 生态中任何组件时，只需要执行 TiUP 一行命令即可，相比以前，极大地降低了管理难度。"
+      "tidb-data-migration": {
+        "firstContext": "You are viewing the documentation for an older major version of the TiDB Data Migration tool (TiDB Data Migration { curDocVersion }).",
+        "secondContext": "TiDB Data Migration { stableVersion }, the latest major version of TiDB Data Migration, is now stable and recommended for general use. To view this page for TiDB Data Migration { stableVersion }, click { link }.",
+        "link": "here"
       }
+    }
+  },
+  "shortcodes": {
+    "note": "Note",
+    "warning": "Warning",
+    "tip": "Tip",
+    "error": "Error",
+    "important": "Important"
+  },
+  "syntaxDiagram": {
+    "syntaxDiagram": "Diagram",
+    "ebnf": "Source"
+  },
+  "search": {
+    "type": "Type:",
+    "version": "Version:",
+    "resultTips": {
+      "counts": "{counts} results found...",
+      "title": "Sorry. We couldn't find what you're looking for.",
+      "content1": "If you've come to pages of an unexpected language, go to Chinese documentation and try again.",
+      "content2": "If you do want to get some English content, PingCAP home page might be a better place for you to go."
+    }
+  },
+  "download-pdf": "Download PDF",
+  "latestCommit": "was last updated",
+  "toolsCard": {
+    "tidbOperator": {
+      "type": "TiDB Operator",
+      "desc": "TiDB Operator is an automated operation and maintenance system for TiDB clusters in Kubernetes. It provides full life-cycle management for TiDB. With TiDB Operator, TiDB can run seamlessly in the Kubernetes clusters deployed on a public or private cloud."
+    },
+    "tidbDataMigration": {
+      "type": "TiDB Data Migration",
+      "desc": "TiDB Data Migration (DM) is an integrated data replication task management platform that supports full data migration and incremental data migration from MySQL or MariaDB to TiDB. It can help reduce the operations cost and simplify the troubleshooting process."
+    },
+    "databaseTools": {
+      "type": "Database Tools",
+      "desc": "TiDB database tools are a collection of useful toolkits for migrating to or from TiDB, including Dumpling, TiDB Lightning, Backup & Restore (BR), TiCDC, sync-diff-inspector, and so on."
     },
-
-    "langSwitchTip": "The English version of this page is temporarily not available.",
-
-    "docHelpful": {
-      "header": "文档内容是否有帮助？",
-      "thumbUp": "是",
-      "thumbDown": "否"
+    "tiup": {
+      "type": "TiUP",
+      "desc": "TiUP is a package manager that manages components in the TiDB ecosystem, such as TiDB, PD, TiKV, and so on. You can run any component with only a single line of TiUP commands, which is far easier to manage."
     }
-
+  },
+  "langSwitchTip": "暂未提供本页面对应的中文页面",
+  "cloudLangSwitchTip": "暂不提供 TiDB Cloud 中文文档",
+  "docHelpful": {
+    "header": "Was this page helpful?",
+    "thumbUp": "Yes",
+    "thumbDown": "No"
   }
+}