diff --git a/apps/.i18n/native/ja-JP.json b/apps/.i18n/native/ja-JP.json
index 07a9cfa8088..08253f7aaae 100644
--- a/apps/.i18n/native/ja-JP.json
+++ b/apps/.i18n/native/ja-JP.json
@@ -1044,14 +1044,44 @@
       "translated": "オンライン"
     },
     {
-      "id": "native.android.d42fe72f8e76b450",
-      "source": "OPENCLAW",
-      "translated": "OPENCLAW"
+      "id": "native.android.9ac2d4498b17d478",
+      "source": "Trust",
+      "translated": "信頼"
     },
     {
-      "id": "native.android.a5c2d7f27576f0c4",
-      "source": "Your personal AI assistant.\nExfoliate! Exfoliate!",
-      "translated": "あなた専用のAIアシスタント。\nExfoliate! Exfoliate!"
+      "id": "native.android.e26ee07a1d1911be",
+      "source": "Cancel",
+      "translated": "キャンセル"
+    },
+    {
+      "id": "native.android.64c8db13ef91513c",
+      "source": "Welcome to OpenClaw",
+      "translated": "OpenClaw へようこそ"
+    },
+    {
+      "id": "native.android.cc878f72a6b70b23",
+      "source": "Connect to your Gateway",
+      "translated": "Gateway に接続"
+    },
+    {
+      "id": "native.android.bf3750bf264f0063",
+      "source": "Choose device permissions",
+      "translated": "デバイス権限を選択"
+    },
+    {
+      "id": "native.android.3bfe29d4d13d3c3e",
+      "source": "Use OpenClaw from your phone",
+      "translated": "スマートフォンから OpenClaw を使用"
+    },
+    {
+      "id": "native.android.c0b539eeb4612f5d",
+      "source": "Security notice",
+      "translated": "セキュリティに関する通知"
+    },
+    {
+      "id": "native.android.5aed4b5c8d6b246d",
+      "source": "The connected OpenClaw agent can use device capabilities you enable. Continue only if you trust the Gateway and agent you connect to.",
+      "translated": "接続された OpenClaw エージェントは、有効にしたデバイス機能を使用できます。接続先の Gateway とエージェントを信頼できる場合にのみ続行してください。"
     },
     {
       "id": "native.android.63c31ee564d63347",
@@ -1059,20 +1089,135 @@
       "translated": "Gatewayに接続"
     },
     {
-      "id": "native.android.afdd3e2c10f56b75",
-      "source": "Setup code issue",
-      "translated": "セットアップコードの問題"
+      "id": "native.android.58d80589d9d4b7ff",
+      "source": "Could not open setup guide.",
+      "translated": "セットアップガイドを開けませんでした。"
     },
     {
-      "id": "native.android.084eda7046e91737",
-      "source": "Advanced",
-      "translated": "詳細設定"
+      "id": "native.android.18d6dd32cfcc1c9a",
+      "source": "Scan QR or setup code",
+      "translated": "QR またはセットアップコードをスキャン"
+    },
+    {
+      "id": "native.android.8b8acc5b98b8c99f",
+      "source": "Set up manually",
+      "translated": "手動で設定"
+    },
+    {
+      "id": "native.android.debd7b3e59db6ab2",
+      "source": "Before you start",
+      "translated": "始める前に"
+    },
+    {
+      "id": "native.android.9cfcf68aae2c05c6",
+      "source": "Access to the Gateway device",
+      "translated": "Gateway デバイスへのアクセス"
+    },
+    {
+      "id": "native.android.71ce00f359981a0b",
+      "source": "Phone can reach the Gateway",
+      "translated": "スマートフォンが Gateway に到達できること"
+    },
+    {
+      "id": "native.android.68a31cee94a9db86",
+      "source": "Android setup guide",
+      "translated": "Android セットアップガイド"
+    },
+    {
+      "id": "native.android.d514a981f80779e9",
+      "source": "Setup Gateway",
+      "translated": "Gateway をセットアップ"
+    },
+    {
+      "id": "native.android.6a45e2dae35ab5a7",
+      "source": "Start your Gateway.",
+      "translated": "Gateway を起動します。"
+    },
+    {
+      "id": "native.android.c6f9da7008df05a6",
+      "source": "Generate a QR code.",
+      "translated": "QR コードを生成します。"
+    },
+    {
+      "id": "native.android.96d40475de2885d6",
+      "source": "Choose from gallery",
+      "translated": "ギャラリーから選択"
+    },
+    {
+      "id": "native.android.fd83bd36419ef526",
+      "source": "QR code not accepted",
+      "translated": "QR コードが受け付けられません"
+    },
+    {
+      "id": "native.android.4dde43318559c65d",
+      "source": "Choose another image",
+      "translated": "別の画像を選択"
+    },
+    {
+      "id": "native.android.54bab6e4054484d0",
+      "source": "Scan QR code",
+      "translated": "QRコードをスキャン"
+    },
+    {
+      "id": "native.android.05987e822ac102ec",
+      "source": "Open the camera and frame the code from openclaw qr.",
+      "translated": "カメラを開き、openclaw qrのコードを枠内に収めてください。"
+    },
+    {
+      "id": "native.android.90fa932d2e0adbd9",
+      "source": "Align the QR code inside the square.",
+      "translated": "QRコードを四角形の内側に合わせてください。"
+    },
+    {
+      "id": "native.android.7a817ddf54373dbf",
+      "source": "Camera access is needed to scan the setup QR.",
+      "translated": "セットアップ用QRをスキャンするにはカメラへのアクセスが必要です。"
+    },
+    {
+      "id": "native.android.c8d5f12cb28f3853",
+      "source": "Allow camera",
+      "translated": "カメラを許可"
+    },
+    {
+      "id": "native.android.7efba153567b1232",
+      "source": "Close scanner",
+      "translated": "スキャナーを閉じる"
+    },
+    {
+      "id": "native.android.b8d5431e1e441f74",
+      "source": "Enter setup code",
+      "translated": "セットアップコードを入力"
     },
     {
       "id": "native.android.41e3fbccb2ad5a4c",
       "source": "Setup code",
       "translated": "セットアップコード"
     },
+    {
+      "id": "native.android.06a2214da1eee841",
+      "source": "Paste setup code",
+      "translated": "セットアップコードを貼り付け"
+    },
+    {
+      "id": "native.android.35aec8a97ac12e1c",
+      "source": "Setup code was not accepted",
+      "translated": "セットアップコードが受け付けられませんでした"
+    },
+    {
+      "id": "native.android.9aaee5a05de93dbe",
+      "source": "Use setup code",
+      "translated": "セットアップコードを使用"
+    },
+    {
+      "id": "native.android.073c93545602b198",
+      "source": "Manual setup",
+      "translated": "手動セットアップ"
+    },
+    {
+      "id": "native.android.46d58ca58c32ad52",
+      "source": "Gateway URL",
+      "translated": "Gateway URL"
+    },
     {
       "id": "native.android.d54b9e3433ffd809",
       "source": "Host",
@@ -1084,24 +1229,29 @@
       "translated": "ポート"
     },
     {
-      "id": "native.android.20d94e1cedd3f319",
-      "source": "TLS off",
-      "translated": "TLSオフ"
+      "id": "native.android.1b0d9893ae4c0682",
+      "source": "Use the Gateway computer's LAN address or secure remote hostname.",
+      "translated": "GatewayコンピューターのLANアドレスまたは安全なリモートホスト名を使用してください。"
     },
     {
-      "id": "native.android.a3a158b4a10d34ba",
-      "source": "TLS on",
-      "translated": "TLSオン"
+      "id": "native.android.bfc48711d6deed92",
+      "source": "Token",
+      "translated": "トークン"
     },
     {
-      "id": "native.android.a02f48c59c8b7b9d",
-      "source": "Local",
-      "translated": "ローカル"
+      "id": "native.android.7ac2b9aec9d78cda",
+      "source": "Paste token",
+      "translated": "トークンを貼り付け"
     },
     {
-      "id": "native.android.aae4212f2ff4df98",
-      "source": "Token optional",
-      "translated": "トークン（任意）"
+      "id": "native.android.96ba0e3919c3955a",
+      "source": "Paste a shared Gateway token or operator-issued token.",
+      "translated": "共有されたGatewayトークンまたはオペレーター発行のトークンを貼り付けてください。"
+    },
+    {
+      "id": "native.android.4a5a1702f0130328",
+      "source": "Password",
+      "translated": "パスワード"
     },
     {
       "id": "native.android.e7045d344dd32ddc",
@@ -1109,24 +1259,99 @@
       "translated": "パスワード（任意）"
     },
     {
-      "id": "native.android.369ee061f6d7881f",
-      "source": "Pair with Gateway",
-      "translated": "Gatewayとペアリング"
+      "id": "native.android.1259d0d0d1671ed7",
+      "source": "Connection type",
+      "translated": "接続タイプ"
     },
     {
-      "id": "native.android.82b296ed39647687",
-      "source": "Last gateway",
-      "translated": "最後のGateway"
+      "id": "native.android.278d9abb3abc12e6",
+      "source": "Local network",
+      "translated": "ローカルネットワーク"
     },
     {
-      "id": "native.android.e0e5d2bb055863fb",
-      "source": "Edit connection",
-      "translated": "接続を編集"
+      "id": "native.android.4aa2b8be11a971eb",
+      "source": "Secure remote",
+      "translated": "セキュアリモート"
     },
     {
-      "id": "native.android.ea2f18dad7749613",
-      "source": "Copy diagnostic",
-      "translated": "診断情報をコピー"
+      "id": "native.android.8c31e2762b496d61",
+      "source": "Local works for LAN or emulator hosts. Secure remote is for wss:// or Tailscale Serve/Funnel.",
+      "translated": "ローカルは LAN またはエミュレーター ホスト用です。セキュアリモートは wss:// または Tailscale Serve/Funnel 用です。"
+    },
+    {
+      "id": "native.android.24a0a4819f223b87",
+      "source": "Could not test connection",
+      "translated": "接続をテストできませんでした"
+    },
+    {
+      "id": "native.android.9a8f8ba539d4dd68",
+      "source": "Test connection",
+      "translated": "接続をテスト"
+    },
+    {
+      "id": "native.android.a1c6ad798cdb4e32",
+      "source": "View details",
+      "translated": "詳細を表示"
+    },
+    {
+      "id": "native.android.ebdc41fd34eab0a5",
+      "source": "Connection details",
+      "translated": "接続の詳細"
+    },
+    {
+      "id": "native.android.f982d1f6ad7b3e5d",
+      "source": "Copy",
+      "translated": "コピー"
+    },
+    {
+      "id": "native.android.fa2a2369f23aa195",
+      "source": "Close",
+      "translated": "閉じる"
+    },
+    {
+      "id": "native.android.50cca1e186823cd6",
+      "source": "Details copied",
+      "translated": "詳細をコピーしました"
+    },
+    {
+      "id": "native.android.31a4bf3ed4071f7c",
+      "source": "Approve node access",
+      "translated": "ノードアクセスを承認"
+    },
+    {
+      "id": "native.android.f43cb6ed03dc6766",
+      "source": "Gateway pairing is complete. Approve this phone as a node so OpenClaw can use the device capabilities you enable.",
+      "translated": "Gateway のペアリングが完了しました。このスマートフォンをノードとして承認すると、有効にしたデバイス機能を OpenClaw が使用できるようになります。"
+    },
+    {
+      "id": "native.android.8e49feba12c350ac",
+      "source": "On the Gateway computer, run:",
+      "translated": "Gateway コンピューターで次を実行します:"
+    },
+    {
+      "id": "native.android.6189b5e2af7cc793",
+      "source": "Use the requestId from the pending command in the approve command.",
+      "translated": "保留中のコマンドの requestId を approve コマンドで使用します。"
+    },
+    {
+      "id": "native.android.53bcd45eeb574d74",
+      "source": "I have approved",
+      "translated": "承認しました"
+    },
+    {
+      "id": "native.android.cdc44aaeb8bd6e4a",
+      "source": "Still waiting for approval",
+      "translated": "まだ承認を待っています"
+    },
+    {
+      "id": "native.android.df5cc00eb95c21ad",
+      "source": "Run the approve command on the Gateway computer, then check again.",
+      "translated": "Gateway コンピューターで approve コマンドを実行してから、もう一度確認してください。"
+    },
+    {
+      "id": "native.android.f579f91c216dd6c4",
+      "source": "OK",
+      "translated": "OK"
     },
     {
       "id": "native.android.b80462122abbe312",
@@ -1134,44 +1359,9 @@
       "translated": "承認コマンドをコピー"
     },
     {
-      "id": "native.android.a31f2beb68298aa8",
-      "source": "Allow permissions",
-      "translated": "権限を許可"
-    },
-    {
-      "id": "native.android.b82104d8df1d4b4a",
-      "source": "These permissions keep OpenClaw secure\nand useful.",
-      "translated": "これらの権限により、OpenClaw を安全で\n便利に保てます。"
-    },
-    {
-      "id": "native.android.03b95088ba72bd8e",
-      "source": "Open $title",
-      "translated": "$title を開く"
-    },
-    {
-      "id": "native.android.f38ca3445453a6bb",
-      "source": "Choose what this phone can share with OpenClaw. You can change these later in Settings.",
-      "translated": "この電話が OpenClaw と共有できる内容を選択します。これらは後で設定で変更できます。"
-    },
-    {
-      "id": "native.android.44549cfd7e6a1ab8",
-      "source": "Back",
-      "translated": "戻る"
-    },
-    {
-      "id": "native.android.4b54af42d17dec84",
-      "source": "Permission Setup",
-      "translated": "権限の設定"
-    },
-    {
-      "id": "native.android.437599c024df158e",
-      "source": "Granted",
-      "translated": "許可済み"
-    },
-    {
-      "id": "native.android.cf8344d3562e28e3",
-      "source": "Not granted",
-      "translated": "未許可"
+      "id": "native.android.d4c3bcf880727fb3",
+      "source": "Only enable access you are comfortable letting OpenClaw use while this phone is connected. You can change these later in Android Settings.",
+      "translated": "このスマートフォンが接続されている間に OpenClaw に使用を許可してもよいアクセス権のみを有効にしてください。これらは後で Android 設定で変更できます。"
     },
     {
       "id": "native.android.d7ea800cc2475013",
@@ -1179,24 +1369,19 @@
       "translated": "続行"
     },
     {
-      "id": "native.android.547f11a819721ffb",
-      "source": "Scan fresh setup code",
-      "translated": "新しいセットアップコードをスキャン"
+      "id": "native.android.44549cfd7e6a1ab8",
+      "source": "Back",
+      "translated": "戻る"
     },
     {
-      "id": "native.android.3b169db8b57795b5",
-      "source": "Retry connection",
-      "translated": "接続を再試行"
+      "id": "native.android.f3f0527db434d756",
+      "source": "Permissions",
+      "translated": "権限"
     },
     {
-      "id": "native.android.e44224ed4df1700f",
-      "source": "Setup code expired. Scan a fresh setup QR.",
-      "translated": "セットアップコードの有効期限が切れました。新しいセットアップ QR をスキャンしてください。"
-    },
-    {
-      "id": "native.android.e03bb4ea463ba7a5",
-      "source": "Gateway access needs review. Check gateway authentication scopes, then retry.",
-      "translated": "Gateway アクセスの確認が必要です。Gateway の認証スコープを確認してから、再試行してください。"
+      "id": "native.android.29732759e050c874",
+      "source": "The code may have expired or been generated for another Gateway.",
+      "translated": "コードの有効期限が切れているか、別の Gateway 用に生成された可能性があります。"
     },
     {
       "id": "native.android.511925b4321aae31",
@@ -1224,9 +1409,9 @@
       "translated": "保存された認証情報が無効です。再認証するか、この Gateway 接続をリセットしてください。"
     },
     {
-      "id": "native.android.3f61f2c34784ed0f",
-      "source": "Gateway authentication is not configured. Configure it on the gateway host, then retry.",
-      "translated": "Gateway 認証が設定されていません。Gateway ホストで設定してから、再試行してください。"
+      "id": "native.android.214b03b4cd2199b1",
+      "source": "Gateway authentication is not configured. Edit this connection and try again.",
+      "translated": "Gateway 認証が構成されていません。この接続を編集して、もう一度お試しください。"
     },
     {
       "id": "native.android.1ccbb6f3911e7219",
@@ -1244,9 +1429,14 @@
       "translated": "承認コマンドをコピーしました"
     },
     {
-      "id": "native.android.bc9715de99c769c7",
-      "source": "Diagnostic copied",
-      "translated": "診断情報をコピーしました"
+      "id": "native.android.437599c024df158e",
+      "source": "Granted",
+      "translated": "許可済み"
+    },
+    {
+      "id": "native.android.cf8344d3562e28e3",
+      "source": "Not granted",
+      "translated": "未許可"
     },
     {
       "id": "native.android.561d07951dc36959",
@@ -2458,6 +2648,11 @@
       "source": "Needs attention",
       "translated": "確認が必要"
     },
+    {
+      "id": "native.android.8452bcda8a619361",
+      "source": "Open ${row.title}",
+      "translated": "${row.title}を開く"
+    },
     {
       "id": "native.android.a65477861c7203aa",
       "source": "Open session",
@@ -2568,11 +2763,6 @@
       "source": "Open profile",
       "translated": "プロフィールを開く"
     },
-    {
-      "id": "native.android.8452bcda8a619361",
-      "source": "Open ${row.title}",
-      "translated": "${row.title}を開く"
-    },
     {
       "id": "native.android.22d755834386db07",
       "source": "Main session",
@@ -3403,51 +3593,6 @@
       "source": "Resolved endpoint",
       "translated": "解決済みエンドポイント"
     },
-    {
-      "id": "native.android.3d9d01cc0af8727d",
-      "source": "Gateway Setup",
-      "translated": "Gatewayのセットアップ"
-    },
-    {
-      "id": "native.android.fff6a6f130e88354",
-      "source": "Connect to your Gateway",
-      "translated": "Gatewayに接続"
-    },
-    {
-      "id": "native.android.77a54beda22bfeb7",
-      "source": "Scan setup code",
-      "translated": "セットアップコードをスキャン"
-    },
-    {
-      "id": "native.android.8f525f9218215b42",
-      "source": "Use your Gateway QR or setup code",
-      "translated": "GatewayのQRコードまたはセットアップコードを使用"
-    },
-    {
-      "id": "native.android.40da32c36971b959",
-      "source": "Nearby gateway",
-      "translated": "近くのGateway"
-    },
-    {
-      "id": "native.android.7423bd0086e6897e",
-      "source": "Enter gateway URL",
-      "translated": "Gateway URLを入力"
-    },
-    {
-      "id": "native.android.c9420b6801f5a76f",
-      "source": "Connect using a manual URL",
-      "translated": "手動URLで接続"
-    },
-    {
-      "id": "native.android.4b55356d9bf6e444",
-      "source": "Permissions",
-      "translated": "権限"
-    },
-    {
-      "id": "native.android.c49a911b95af5d5d",
-      "source": "Done",
-      "translated": "完了"
-    },
     {
       "id": "native.android.288b83f93172c633",
       "source": "Verify the certificate fingerprint before trusting this gateway.\n\n%1$s",
@@ -3458,11 +3603,6 @@
       "source": "The gateway certificate changed. Continue only if you expected this.\n\nOld SHA-256:\n%1$s\n\nNew SHA-256:\n%2$s",
       "translated": "Gatewayの証明書が変更されました。想定していた場合にのみ続行してください。\n\n古いSHA-256:\n%1$s\n\n新しいSHA-256:\n%2$s"
     },
-    {
-      "id": "native.android.6ffa3d752514836d",
-      "source": "Gateway Recovery",
-      "translated": "Gatewayの復旧"
-    },
     {
       "id": "native.apple.8f741d09cc1d5495",
       "source": "OpenClaw Activity",