diff --git a/src/app/i18n/ja/resource.json b/src/app/i18n/ja/resource.json
index 5d18b515c..3356cea3e 100644
--- a/src/app/i18n/ja/resource.json
+++ b/src/app/i18n/ja/resource.json
@@ -27,7 +27,7 @@
     "Password": "パスワード",
     "Sign In": "サインイン",
     "Forgot your password?": "パスワードを忘れましたか？",
-    "A web-based interface for CNC milling controller running Grbl, Smoothieware, or TinyG": "",
+    "A web-based interface for CNC milling controller running Grbl, Smoothieware, or TinyG": "Grbl, Smoothieware, TinyGをベースとしたCNCフライスコントローラ向けのウェブベースインターフェースです。",
     "Learn more": "詳細情報",
     "Downloads": "ダウンロード",
     "Checking for updates...": "更新プログラムを確認しています...",
@@ -40,7 +40,7 @@
     "Name": "名前",
     "Confirm Password": "パスワードの確認",
     "Cancel": "キャンセル",
-    "OK": "",
+    "OK": "了解",
     "An unexpected error has occurred.": "予期しないエラーが発生しました。",
     "Loading...": "ロード中...",
     "No data to display": "表示する情報がありません",
@@ -227,37 +227,37 @@
     "Go To Machine Zero On A Axis (G53 G0 A0)": "A軸を機械原点へ移動 (G53 G0 A0)",
     "Zero Out Machine A Axis (G28.3 A0)": "A軸をゼロにする (G28.3 A0)",
     "Home Machine A Axis (G28.2 A0)": "A軸をホームに戻す (G28.2 A0)",
-    "Go To Work Zero On B Axis (G0 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P1 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P2 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P3 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P4 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P5 B0)": "",
-    "Zero Out Work B Axis (G10 L20 P6 B0)": "",
-    "Zero Out Temporary B Axis (G92 B0)": "",
-    "Un-Zero Out Temporary B Axis (G92.1 B0)": "",
-    "Go To Machine Zero On B Axis (G53 G0 B0)": "",
-    "Zero Out Machine B Axis (G28.3 B0)": "",
-    "Home Machine B Axis (G28.2 B0)": "",
-    "Go To Work Zero On C Axis (G0 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P1 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P2 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P3 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P4 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P5 C0)": "",
-    "Zero Out Work C Axis (G10 L20 P6 C0)": "",
-    "Zero Out Temporary C Axis (G92 C0)": "",
-    "Un-Zero Out Temporary C Axis (G92.1 C0)": "",
-    "Go To Machine Zero On C Axis (G53 G0 C0)": "",
-    "Zero Out Machine C Axis (G28.3 C0)": "",
-    "Home Machine C Axis (G28.2 C0)": "",
+    "Go To Work Zero On B Axis (G0 B0)": "B軸をワーク原点へ移動 (G0 B0)",
+    "Zero Out Work B Axis (G10 L20 P1 B0)": "B軸のP1をゼロにする (G10 L20 P1 B0)",
+    "Zero Out Work B Axis (G10 L20 P2 B0)": "B軸のP2をゼロにする (G10 L20 P2 B0)",
+    "Zero Out Work B Axis (G10 L20 P3 B0)": "B軸のP3をゼロにする (G10 L20 P3 B0)",
+    "Zero Out Work B Axis (G10 L20 P4 B0)": "B軸のP4をゼロにする (G10 L20 P4 B0)",
+    "Zero Out Work B Axis (G10 L20 P5 B0)": "B軸のP5をゼロにする (G10 L20 P5 B0)",
+    "Zero Out Work B Axis (G10 L20 P6 B0)": "B軸のP6をゼロにする (G10 L20 P6 B0)",
+    "Zero Out Temporary B Axis (G92 B0)": "B軸を一時的に0にする (G92 B0)",
+    "Un-Zero Out Temporary B Axis (G92.1 B0)": "B軸を0から戻す (G92.1 B0)",
+    "Go To Machine Zero On B Axis (G53 G0 B0)": "B軸を機械原点へ移動 (G53 G0 B0)",
+    "Zero Out Machine B Axis (G28.3 B0)": "B軸をゼロにする (G28.3 B0)",
+    "Home Machine B Axis (G28.2 B0)": "B軸をホームに戻す (G28.2 B0)",
+    "Go To Work Zero On C Axis (G0 C0)": "C軸をワーク原点へ移動 (G0 C0)",
+    "Zero Out Work C Axis (G10 L20 P1 C0)": "C軸のP1をゼロにする (G10 L20 P1 C0)",
+    "Zero Out Work C Axis (G10 L20 P2 C0)": "C軸のP2をゼロにする (G10 L20 P2 C0)",
+    "Zero Out Work C Axis (G10 L20 P3 C0)": "C軸のP3をゼロにする (G10 L20 P3 C0)",
+    "Zero Out Work C Axis (G10 L20 P4 C0)": "C軸のP4をゼロにする (G10 L20 P4 C0)",
+    "Zero Out Work C Axis (G10 L20 P5 C0)": "C軸のP5をゼロにする (G10 L20 P5 C0)",
+    "Zero Out Work C Axis (G10 L20 P6 C0)": "C軸のP6をゼロにする (G10 L20 P6 C0)",
+    "Zero Out Temporary C Axis (G92 C0)": "C軸を一時的に0にする (G92 C0)",
+    "Un-Zero Out Temporary C Axis (G92.1 C0)": "C軸を0から戻す (G92.1 C0)",
+    "Go To Machine Zero On C Axis (G53 G0 C0)": "C軸を機械原点へ移動 (G53 G0 C0)",
+    "Zero Out Machine C Axis (G28.3 C0)": "C軸をゼロにする (G28.3 C0)",
+    "Home Machine C Axis (G28.2 C0)": "C軸をホームに戻す (G28.2 C0)",
     "mm": "mm",
     "in": "in",
     "deg": "度",
-    "Zero Out Machine": "",
-    "Home Machine": "",
-    "Zero Out Work Offsets": "",
-    "Set Work Offsets": "",
+    "Zero Out Machine": "ゼロにする",
+    "Home Machine": "原点へ移動",
+    "Zero Out Work Offsets": "ワークオフセットを0に",
+    "Set Work Offsets": "ワークオフセットをセット",
     "Axis": "軸",
     "Machine Position": "機械位置",
     "Work Position": "ワーク位置",
@@ -282,32 +282,32 @@
     "Move X+ Y-": "移動 X+ Y-",
     "Move Z-": "移動 Z-",
     "Units": "単位",
-    "G20 (inch)": "",
-    "G21 (mm)": "",
-    "Imperial": "",
-    "Metric": "",
-    "Right": "",
-    "Left": "",
-    "Up": "",
-    "Down": "",
-    "Page Up": "",
-    "Page Down": "",
-    "Right Square Bracket": "",
-    "Left Square Bracket": "",
+    "G20 (inch)": "G20 (inch)",
+    "G21 (mm)": "G21 (mm)",
+    "Imperial": "インペリアル",
+    "Metric": "メトリック",
+    "Right": "右",
+    "Left": "左",
+    "Up": "上",
+    "Down": "下",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Right Square Bracket": "右大括弧",
+    "Left Square Bracket": "左大括弧",
     "0.1x Move": "0.1x 移動",
-    "Alt": "",
+    "Alt": "Alt",
     "10x Move": "10x移動",
-    "⇧ Shift": "",
+    "⇧ Shift": "⇧ Shift",
     "X-axis": "X軸",
     "Y-axis": "Y軸",
     "Z-axis": "Z軸",
     "A-axis": "A軸",
-    "B-axis": "",
-    "C-axis": "",
+    "B-axis": "B軸",
+    "C-axis": "C軸",
     "Custom Commands": "カスタムコマンド",
     "Axes Settings": "軸の設定",
     "ShuttleXpress": "シャトルエクスプレス(ShuttleXpress)",
-    "Feed Rate Range: {{min}} - {{max}} mm/min": "",
+    "Feed Rate Range: {{min}} - {{max}} mm/min": "フィードレート範囲: {{min}} - {{max}} mm/min",
     "Repeat Rate: {{hertz}}Hz": "繰り返しレート: {{hertz}}Hz",
     "60 Times per Second": "60回/秒",
     "45 Times per Second": "45回/秒",
@@ -325,7 +325,7 @@
     "Refresh": "表示更新",
     "Baud rate": "ボーレート",
     "Choose a baud rate": "ボーレートを選択",
-    "Enable hardware flow control": "",
+    "Enable hardware flow control": "ハードウェアフローコントロールを有効",
     "Connect automatically": "自動的に接続",
     "Open": "開く",
     "Error opening serial port '{{- port}}'": "シリアルポート '{{- port}}' を開くのに失敗しました",
@@ -334,8 +334,8 @@
     "Connected to {{-port}} with a baud rate of {{baudrate}}": "{{-port}} にボーレート {{baudrate}} で接続中",
     "Console": "コンソール",
     "Clear all": "全消去",
-    "Select All": "",
-    "Clear Selection": "",
+    "Select All": "全選択",
+    "Clear Selection": "選択を削除",
     "URL not configured": "URLが設定されていません",
     "The widget is currently disabled": "ウィジェットは現在無効になっています",
     "Enable": "有効",
@@ -369,7 +369,7 @@
     "Distance": "距離",
     "Program": "プログラム",
     "Coolant": "冷却液",
-    "Status Report (?)": "",
+    "Status Report (?)": "ステータスレポート (?)",
     "Check G-code Mode ($C)": "Gコードモードを確認 ($C)",
     "Homing ($H)": "ホーミング ($H)",
     "Kill Alarm Lock ($X)": "アラームロックを停止 ($X)",
@@ -385,7 +385,7 @@
     "Laser Test": "レーザーテスト",
     "Power (%)": "パワー (%)",
     "Test duration": "テスト時間",
-    "ms": "",
+    "ms": "ms",
     "Maximum value": "最大値",
     "Laser Off": "レーザーオフ",
     "New Macro": "新マクロ",
@@ -406,7 +406,7 @@
     "Get Firmware Version and Capabilities (M115)": "ファームウェアのバージョンと機能を取得する（M115）",
     "Heater Control": "ヒーターコントロール",
     "Extruder": "エクストルーダー",
-    "°C": "",
+    "°C": "°C",
     "Set the target temperature for the extruder": "エクストルーダーの目標温度を設定",
     "Heated Bed": "ヒーテッドベッド",
     "Set the target temperature for the heated bed": "ヒーテッドベッドの目標温度を設定",
@@ -433,7 +433,7 @@
     "Probe X Axis": "X軸",
     "Probe Y Axis": "Y軸",
     "Spindle Speed": "スピンドルの速度",
-    "RPM": "",
+    "RPM": "RPM",
     "Queue Flush (%)": "キューを流す (%)",
     "Kill Job (^d)": "ジョブ削除 (^d)",
     "Clear Alarm ($clear)": "アラームクリア ($clear)",
@@ -493,45 +493,45 @@
     "Flip Horizontally": "水平に反転",
     "Flip Vertically": "垂直に反転",
     "Crosshair": "十字照準",
-    "Manual Data Input": "",
-    "MDI": "",
-    "Button Width": "",
-    "Order": "",
-    "Move Up": "",
-    "Move Down": "",
+    "Manual Data Input": "手動データ入力",
+    "MDI": "MDI",
+    "Button Width": "ボタン幅",
+    "Order": "順序",
+    "Move Up": "上に移動",
+    "Move Down": "下に移動",
     "Remove": "削除",
-    "Waiting for the planner to empty...": "",
-    "No video devices available": "",
-    "Choose a video device": "",
-    "Automatic detection": "",
-    "Front View": "",
-    "Move Backward": "",
-    "Move Forward": "",
-    "Top View": "",
-    "Zoom to Fit": "",
-    "Right Side View": "",
-    "Left Side View": "",
+    "Waiting for the planner to empty...": "プランナーが空になるのを待っています...",
+    "No video devices available": "ビデオデバイスが見つかりません",
+    "Choose a video device": "ビデオデバイスを選択",
+    "Automatic detection": "自動検出",
+    "Front View": "正面",
+    "Move Backward": "奥に移動",
+    "Move Forward": "手前に移動",
+    "Top View": "俯瞰視点",
+    "Zoom to Fit": "自動ズーム",
+    "Right Side View": "右側視点",
+    "Left Side View": "左側視点",
     "Custom range...": "カスタム範囲...",
     "Today": "今日",
     "Last {{n}} days": "過去{{n}}日間",
     "Apply": "適用",
     "Add": "追加",
-    "Custom Jog Distance (mm)": "",
-    "Custom Jog Distance (inches)": "",
-    "Machine Profiles": "",
-    "No machine profile selected": "",
-    "Delete machine profile": "",
-    "Machine Profile": "",
-    "Limits": "",
+    "Custom Jog Distance (mm)": "カスタムジョグ距離 (mm)",
+    "Custom Jog Distance (inches)": "カスタムジョグ距離 (inches)",
+    "Machine Profiles": "マシンプロファイル",
+    "No machine profile selected": "マシンプロファイルが選択されていません",
+    "Delete machine profile": "マシンプロファイルを削除",
+    "Machine Profile": "マシンプロファイル",
+    "Limits": "限界",
     "User Accounts": "ユーザアカウント",
     "New Account": "新規アカウント",
-    "Hide Limits": "",
-    "Show Limits": "",
+    "Hide Limits": "限界を隠す",
+    "Show Limits": "限界を表示する",
     "WebGL: <1>Enabled</1>": "WebGL: <1>有効</1>",
     "WebGL: <1>Disabled</1>": "WebGL: <1>無効</1>",
-    "Hide Cutting Tool": "",
-    "Show Cutting Tool": "",
-    "Ready to start": "",
-    "Connect to an IP camera": "",
-    "The URL must be for a Motion JPEG (mjpeg) HTTP or RTSP stream.": ""
+    "Hide Cutting Tool": "工具を隠す",
+    "Show Cutting Tool": "工具を表示する",
+    "Ready to start": "スタートの準備ができました",
+    "Connect to an IP camera": "IPカメラと接続",
+    "The URL must be for a Motion JPEG (mjpeg) HTTP or RTSP stream.": "このURLはモーションJPEG (mjpeg) HTTP もしくは RTSP ストリームである必要があります。"
 }