diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index f38a82d459..5a13b4b1bb 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -38,7 +38,7 @@
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "ステップを追加"
     }
   ],
   "label.add-website": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "比較"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "回数"
     }
   ],
   "label.countries": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "作成者"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "現在"
     }
   ],
   "label.current-password": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "最終ステップ"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "訪問時のURL"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "退出時のURL"
     }
   ],
   "label.false": [
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "初回ログイン"
     }
   ],
   "label.funnel": [
@@ -494,19 +494,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "目標"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "目標"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "ページビューとイベントの目標を追跡します。"
     }
   ],
   "label.greater-than": [
@@ -524,13 +524,13 @@
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "ホスト"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "ホスト"
     }
   ],
   "label.insights": [
@@ -584,13 +584,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "ジャーニー"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "ユーザーがWebサイト内をどのように移動するかを把握します。"
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "過去"
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": "月間"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "最終ログイン"
     }
   ],
   "label.leave": [
@@ -704,7 +704,7 @@
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "管理者"
     }
   ],
   "label.max": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "パス"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "パス"
     }
   ],
   "label.powered-by": [
@@ -898,19 +898,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "以前"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "前期"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "前年"
     }
   ],
   "label.profile": [
@@ -922,13 +922,13 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "プロパティ"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "プロパティ"
     }
   ],
   "label.queries": [
@@ -1042,19 +1042,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "レベニュー"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "時間あたりの売上高を確認します。"
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "レベニュープロパティ"
     }
   ],
   "label.role": [
@@ -1114,7 +1114,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "セッション"
     }
   ],
   "label.sessions": [
@@ -1144,13 +1144,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "最初のステップ"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "ステップ"
     }
   ],
   "label.sum": [
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "チーム管理者"
     }
   ],
   "label.team-member": [
@@ -1198,7 +1198,7 @@
   "label.team-owner": [
     {
       "type": 0,
-      "value": "チーム所有者"
+      "value": "チームオーナー"
     }
   ],
   "label.team-view-only": [
@@ -1288,7 +1288,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "トランザクション"
     }
   ],
   "label.transfer": [
@@ -1330,7 +1330,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "ユニーク顧客数"
     }
   ],
   "label.unknown": [
@@ -1348,7 +1348,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "更新"
     }
   ],
   "label.url": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "ユーザープロパティ"
     }
   ],
   "label.username": [
@@ -1396,7 +1396,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "UTMパラメーターを使用してキャンペーンを追跡します。"
     }
   ],
   "label.value": [
@@ -1432,7 +1432,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "訪問あたりの閲覧数"
     }
   ],
   "label.visit-duration": [
@@ -1450,7 +1450,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "訪問者数"
     }
   ],
   "label.website": [
@@ -1534,7 +1534,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "収集されたデータ"
     }
   ],
   "message.confirm-delete": [
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index 72e2998b5c..bc59f1140b 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -5,7 +5,7 @@
   "label.add": "追加",
   "label.add-description": "説明を追加",
   "label.add-member": "メンバーの追加",
-  "label.add-step": "Add step",
+  "label.add-step": "ステップを追加",
   "label.add-website": "Webサイトの追加",
   "label.admin": "管理者",
   "label.after": "直後",
@@ -24,12 +24,12 @@
   "label.cities": "都市",
   "label.city": "都市",
   "label.clear-all": "すべてクリア",
-  "label.compare": "Compare",
+  "label.compare": "比較",
   "label.confirm": "確認",
   "label.confirm-password": "パスワード(確認)",
   "label.contains": "コンテンツ",
   "label.continue": "続ける",
-  "label.count": "Count",
+  "label.count": "回数",
   "label.countries": "国名",
   "label.country": "国",
   "label.create": "作成",
@@ -37,8 +37,8 @@
   "label.create-team": "チームの作成",
   "label.create-user": "ユーザーの作成",
   "label.created": "作成されました",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "作成者",
+  "label.current": "現在",
   "label.current-password": "現在のパスワード",
   "label.custom-range": "範囲指定",
   "label.dashboard": "ダッシュボード",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "ダッシュボードの編集",
   "label.edit-member": "メンバーの編集",
   "label.enable-share-url": "共有URLを有効にする",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "最終ステップ",
+  "label.entry": "訪問時のURL",
   "label.event": "イベント",
   "label.event-data": "イベントデータ",
   "label.events": "イベント",
-  "label.exit": "Exit URL",
+  "label.exit": "退出時のURL",
   "label.false": "偽",
   "label.field": "フィールド",
   "label.fields": "フィールド",
@@ -78,16 +78,16 @@
   "label.filter-combined": "結合",
   "label.filter-raw": "RAW",
   "label.filters": "フィルター",
-  "label.first-seen": "First seen",
+  "label.first-seen": "初回ログイン",
   "label.funnel": "ファネル",
   "label.funnel-description": "ユーザーのコンバージョン率と離脱率を分析します。",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "目標",
+  "label.goals": "目標",
+  "label.goals-description": "ページビューとイベントの目標を追跡します。",
   "label.greater-than": "超過",
   "label.greater-than-equals": "以上",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "ホスト",
+  "label.hosts": "ホスト",
   "label.insights": "インサイト",
   "label.insights-description": "セグメントとフィルタを使用して、データをさらに詳しく分析します。",
   "label.is": "に等しい",
@@ -96,15 +96,15 @@
   "label.is-set": "設定済み",
   "label.join": "参加",
   "label.join-team": "チームに参加",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "ジャーニー",
+  "label.journey-description": "ユーザーがWebサイト内をどのように移動するかを把握します。",
   "label.language": "言語",
   "label.languages": "言語",
   "label.laptop": "ノートPC",
   "label.last-days": "過去{x}日間",
   "label.last-hours": "過去{x}時間",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "過去{x}月間",
+  "label.last-seen": "最終ログイン",
   "label.leave": "離脱",
   "label.leave-team": "チームを離脱",
   "label.less-than": "未満",
@@ -112,7 +112,7 @@
   "label.login": "ログイン",
   "label.logout": "ログアウト",
   "label.manage": "管理",
-  "label.manager": "Manager",
+  "label.manager": "管理者",
   "label.max": "最大",
   "label.member": "メンバー",
   "label.members": "メンバー",
@@ -134,15 +134,15 @@
   "label.pageTitle": "ページタイトル",
   "label.pages": "ページ",
   "label.password": "パスワード",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "パス",
+  "label.paths": "パス",
   "label.powered-by": "Powered by {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "以前",
+  "label.previous-period": "前期",
+  "label.previous-year": "前年",
   "label.profile": "プロフィール",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.properties": "プロパティ",
+  "label.property": "プロパティ",
   "label.queries": "クエリ",
   "label.query": "クエリ",
   "label.query-parameters": "クエリパラメーター",
@@ -161,9 +161,9 @@
   "label.reset-website": "Webサイトをリセットする",
   "label.retention": "リテンション",
   "label.retention-description": "ユーザーの再訪問回数を記録して、Webサイトのリテンション率を計測します。",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "レベニュー",
+  "label.revenue-description": "時間あたりの売上高を確認します。",
+  "label.revenue-property": "レベニュープロパティ",
   "label.role": "ロール",
   "label.run-query": "クエリ実行",
   "label.save": "保存",
@@ -173,21 +173,21 @@
   "label.select-date": "日付を選択",
   "label.select-role": "ロールを選択",
   "label.select-website": "Webサイトを選択",
-  "label.session": "Session",
+  "label.session": "セッション",
   "label.sessions": "セッション",
   "label.settings": "設定",
   "label.share-url": "共有URL",
   "label.single-day": "一日",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "最初のステップ",
+  "label.steps": "ステップ",
   "label.sum": "合計",
   "label.tablet": "タブレット",
   "label.team": "チーム",
   "label.team-id": "チームID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "チーム管理者",
   "label.team-member": "チームメンバー",
   "label.team-name": "チーム名",
-  "label.team-owner": "チーム所有者",
+  "label.team-owner": "チームオーナー",
   "label.team-view-only": "チーム表示のみ",
   "label.team-websites": "チームのWebサイト",
   "label.teams": "チーム",
@@ -202,34 +202,34 @@
   "label.total": "累計",
   "label.total-records": "総記録数",
   "label.tracking-code": "トラッキングコード",
-  "label.transactions": "Transactions",
+  "label.transactions": "トランザクション",
   "label.transfer": "移管",
   "label.transfer-website": "Webサイトの移管",
   "label.true": "真",
   "label.type": "種別",
   "label.unique": "ユニーク",
   "label.unique-visitors": "ユニーク訪問者数",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "ユニーク顧客数",
   "label.unknown": "不明",
   "label.untitled": "無題",
-  "label.update": "Update",
+  "label.update": "更新",
   "label.url": "URL",
   "label.urls": "URL",
   "label.user": "ユーザー",
-  "label.user-property": "User Property",
+  "label.user-property": "ユーザープロパティ",
   "label.username": "ユーザー名",
   "label.users": "ユーザー",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "UTMパラメーターを使用してキャンペーンを追跡します。",
   "label.value": "値",
   "label.view": "表示",
   "label.view-details": "詳細を表示",
   "label.view-only": "表示のみ",
   "label.views": "表示",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "訪問あたりの閲覧数",
   "label.visit-duration": "平均滞在時間",
   "label.visitors": "訪問者",
-  "label.visits": "Visits",
+  "label.visits": "訪問者数",
   "label.website": "Webサイト",
   "label.website-id": "WebサイトID",
   "label.websites": "Webサイト",
@@ -237,7 +237,7 @@
   "label.yesterday": "昨日",
   "message.action-confirmation": "承認する場合は、下のフォームに「{confirmation}」と入力してください。",
   "message.active-users": "{x} {x, plural, one {アクティブな訪問者} other {アクティブな訪問者}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "収集されたデータ",
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.confirm-leave": "{target}から離脱してもよろしいですか？",
   "message.confirm-remove": "{target}を削除してもよろしいですか？",