merge: resolve dev conflicts for CH9329 macOS drag compatibility

web/src/i18n/en-US.ts

@@ -1,4 +1,86 @@
 export default {
+  hidGuide: {
+    missingDevice: 'The previous device {device} is unavailable. Check the current selection.',
+    connectionTimeout: 'Connection timed out. Check the data cable and the controlled computer’s USB port. You can connect later or reconfigure.',
+    "deviceTitle": "Driver and device",
+    "features": "Feature configuration",
+    "saveFeatures": "Save features",
+    "configure": "Configure driver",
+    "reconfigure": "Reconfigure",
+    "driver": "HID driver",
+    "driver_otg": "USB OTG",
+    "driver_ch9329": "CH9329",
+    "driver_bluetooth": "Bluetooth HID",
+    "driver_none": "Disabled",
+    "device_otg": "UDC",
+    "device_ch9329": "Serial port",
+    "device_bluetooth": "Local Bluetooth adapter",
+    "host": "Controlled computer",
+    "hostUsb": "Host USB",
+    "otgPort": "One-KVM OTG USB",
+    "serialLink": "CH340 → Serial connection → CH9329",
+    "integratedCable": "CH340 + CH9329 integrated cable",
+    "dataCable": "USB data cable",
+    "wireless": "Bluetooth connection",
+    "wiring_otg": "One-KVM OTG USB port → USB data cable → controlled computer USB port.",
+    "wiring_ch9329": "Connect One-KVM to CH9329 over serial, then connect CH9329 USB to the controlled computer.",
+    "wiring_bluetooth": "On the controlled computer, open System Settings → Add Bluetooth device → select the advertised HID name.",
+    "disabledHelp": "One-KVM cannot send keyboard or mouse input while HID is disabled.",
+    "selectDevice": "Select a device",
+    "noDevices": "No devices found. Check the connection and refresh.",
+    "nameInvalid": "Use 1–64 UTF-8 bytes without control characters.",
+    "unconfigured": "HID is not configured",
+    "disabled": "HID is disabled",
+    "legacyAuto": "Automatic (legacy configuration)",
+    "unknown": "Unknown or unable to read status",
+    "ready": "HID ready",
+    "preparing": "Connected, preparing HID",
+    "paired": "Paired, waiting for connection",
+    "pairing": "Waiting for pairing",
+    "waiting": "Applied, waiting for connection",
+    "initializing": "Initializing",
+    "appliedHelp": "Configuration applied. Closing keeps the configuration and completed pairing.",
+    "draftHelp": "Choose a driver and device. The running configuration changes only when you apply.",
+    "dirty": "There are unsaved feature changes. Return to save them, or discard them to continue.",
+    "returnSave": "Return to save",
+    "discard": "Discard changes and continue",
+    "pairInstructions": "Add a Bluetooth device in the controlled computer’s system settings and select “{name}”. The pairing window lasts 120 seconds.",
+    "pairTimeout": "The pairing window ended. You can open it again.",
+    "reopenPairing": "Reopen pairing",
+    "resetWarning": "Previous One-KVM HID bonds will be cleared. Remove the old device on the controlled computer before adding it again.",
+    "disableUsb": "Leaving USB OTG will disable: {functions}.",
+    "msd": "Virtual disk",
+    "network": "USB network",
+    "audio": "USB audio",
+    "done": "Done",
+    "later": "Connect later",
+    "configureLater": "Configure later",
+    "useConfiguration": "Use this configuration",
+    "repair": "Pair again",
+    "uncertain": "The previous request has an unknown result. Check the connection first; applying again will clear bonds again.",
+    "checkConnection": "Check applied configuration",
+    "resumeRetry": "The current configuration differs from the pending selection. Review it and retry."
+},
+  bluetoothHid: {
+    paired: 'Paired; waiting for the computer to connect keyboard and mouse',
+    "description": "Classic Bluetooth keyboard and relative mouse.",
+    "adapter": "Bluetooth adapter",
+    "name": "Device name",
+    "peer": "Computer address (optional)",
+    "peerHelp": "Leave blank to reuse the only bonded device, or select a computer during pairing.",
+    "ready": "Keyboard and mouse ready",
+    "pairing": "Pairing open: {seconds}s",
+    "connected": "Connected; waiting for HID channels",
+    "waiting": "Waiting for the paired computer",
+    "unavailable": "Bluetooth unavailable or starting",
+    "openPairing": "Pair for 2 minutes",
+    "closePairing": "Close pairing",
+    "disconnect": "Disconnect",
+    "forget": "Forget computer",
+    "windows": "Windows 11: Settings → Bluetooth & devices → Add device → Bluetooth. After forgetting, remove the device in Windows before pairing again.",
+    "applyFirst": "Apply the HID settings first, then open pairing."
+},
+
   videoInput: {
     format: 'Input Format',
     resolution: 'Resolution',
@@ -96,12 +178,19 @@ export default {
     backToPassword: 'Back to password',
   },
   status: {
+    no_signal: 'No signal',
+    busy: 'Device busy',
     connected: 'Connected',
     connecting: 'Connecting',
     disconnected: 'Disconnected',
     error: 'Error',
   },
   actionbar: {
+    muted: 'Muted',
+    more: 'More actions',
+    collapseToolbar: 'Collapse toolbar',
+    expandToolbar: 'Expand toolbar',
+
     paste: 'Paste Text',
     micStart: 'Start Transfer',
     micStop: 'Stop Transfer',
@@ -144,6 +233,7 @@ export default {
     streamSettings: 'Stream Settings',
     deviceSettings: 'Device Settings',
     videoMode: 'Mode',
+    videoRotation: 'Rotation',
     selectMode: 'Select mode...',
     videoModeHint: 'HTTP uses more bandwidth but offers broad compatibility; WebRTC has stricter network requirements but uses less bandwidth',
     videoDevice: 'Device',
@@ -190,6 +280,8 @@ export default {
     selectAudioDevice: 'Select device...',
   },
   infobar: {
+    pointerCaptured: 'Mouse captured · Esc to release',
+
     keys: 'Keys',
     pointer: 'Pointer',
     caps: 'Caps',
@@ -439,6 +531,7 @@ export default {
     uploadFailed: 'File upload failed',
     driveUnreadable: 'Format unsupported',
     driveUnreadableTooltip: 'Unable to parse the exFAT filesystem. It may have been formatted with an unsupported format.',
+    driveFilesystemUnsupportedHint: 'Web file browsing does not support this filesystem, but you can still connect the drive to the target machine.',
     reinitializeDrive: 'Re-initialize',
     diskMode: 'Drive Mode',
     singleDiskMode: 'Single',
@@ -484,7 +577,7 @@ export default {
       downloadIncomplete: 'The remote image download was incomplete.',
       driveNotInitialized: 'The virtual drive is not initialized.',
       driveConnected: 'The virtual drive is connected to the controlled computer. Disconnect it before editing files.',
-      driveFilesystemUnsupported: 'The virtual drive filesystem is unsupported. Reinitialize it to continue.',
+      driveFilesystemUnsupported: 'Web file management does not support this format, but the drive can still be mounted on the controlled computer.',
       driveSizeInvalid: 'The virtual drive size is invalid.',
       storageSpaceUnavailable: 'Available virtual media storage space could not be determined.',
       storageFull: 'Virtual media storage does not have enough free space.',
@@ -551,6 +644,18 @@ export default {
     networkAddresses: 'Network Addresses',
     language: 'Language',
     theme: 'Theme',
+    consoleLayout: 'Console layout',
+    consoleLayoutDesc: 'Choose how console controls are arranged. The preference is saved in this browser.',
+    consoleLayoutHints: {
+      current: 'Full status and labeled tools for configuration and troubleshooting.',
+      sidebar: 'Compact status and fixed icons for frequent actions.',
+      floating: 'Essential floating controls that collapse to keep the video clear.',
+    },
+    consoleLayoutOptions: {
+      current: 'Top bar',
+      floating: 'Floating bar',
+      sidebar: 'Sidebar',
+    },
     lightMode: 'Light',
     darkMode: 'Dark',
     systemMode: 'System',
@@ -950,6 +1055,8 @@ export default {
     },
   },
   statusCard: {
+    connectionDetails: 'Connection details',
+
     device: 'Device',
     video: 'Video',
     hid: 'HID',
@@ -1074,6 +1181,13 @@ export default {
     rustdesk: {
       title: 'RustDesk Remote',
       desc: 'Configure the RustDesk service; the selected codec will be locked',
+      mode: 'Access Mode',
+      modeId: 'ID Service',
+      modeIdDesc: 'Register with an ID server and use the configured relay when direct connections fail',
+      modeDirectIp: 'Direct IP',
+      modeDirectIpDesc: 'Listen on the device only, without connecting to an ID or relay server',
+      directAccessPort: 'Direct Access Port',
+      directAccessPortInvalid: 'The direct access port must be between 1 and 65535',
       rendezvousServer: 'ID Server',
       rendezvousServerPlaceholder: 'hbbs.example.com:21116',
       rendezvousServerRequired: 'Enter the RustDesk ID server',
@@ -1081,7 +1195,6 @@ export default {
       relayServerPlaceholder: 'hbbr.example.com:21117',
       relayKey: 'Relay Key',
       codec: 'Codec',
-      deviceInfo: 'Device Info',
       deviceId: 'Device ID',
       devicePassword: 'Device Password',
       showPassword: 'Show Password',
@@ -1097,7 +1210,6 @@ export default {
       notInitialized: 'Not Initialized',
       copyId: 'Copy ID',
       copyPassword: 'Copy Password',
-      keypairGenerated: 'Keypair Generated',
     },
     rtsp: {
       title: 'RTSP Streaming',

web/src/i18n/zh-CN.ts

@@ -1,4 +1,86 @@
 export default {
+  hidGuide: {
+    missingDevice: '原设备 {device} 已不可用，请检查当前选择。',
+    connectionTimeout: '等待连接超时，请检查数据线及被控机 USB 端口。可稍后连接或重新配置。',
+    "deviceTitle": "驱动与设备",
+    "features": "功能配置",
+    "saveFeatures": "保存功能配置",
+    "configure": "配置驱动",
+    "reconfigure": "重新配置",
+    "driver": "HID 驱动",
+    "driver_otg": "USB OTG",
+    "driver_ch9329": "CH9329",
+    "driver_bluetooth": "蓝牙 HID",
+    "driver_none": "禁用",
+    "device_otg": "UDC",
+    "device_ch9329": "串口",
+    "device_bluetooth": "本机蓝牙适配器",
+    "host": "被控机",
+    "hostUsb": "被控机 USB",
+    "otgPort": "One-KVM OTG USB",
+    "serialLink": "CH340 → 串口连接 → CH9329",
+    "integratedCable": "CH340 + CH9329 一体线",
+    "dataCable": "USB 数据线",
+    "wireless": "蓝牙无线连接",
+    "wiring_otg": "One-KVM 的 OTG USB 端口 → USB 数据线 → 被控机 USB 端口。",
+    "wiring_ch9329": "One-KVM 通过串口连接 CH9329，CH9329 的 USB 连接被控机。",
+    "wiring_bluetooth": "在被控机打开系统设置 → 添加蓝牙设备 → 选择广播的 HID 设备名称。",
+    "disabledHelp": "禁用后 One-KVM 无法发送键盘和鼠标输入。",
+    "selectDevice": "请选择具体设备",
+    "noDevices": "未找到可用设备，请检查连接后刷新。",
+    "nameInvalid": "名称须为 1–64 个 UTF-8 字节，且不能含控制字符。",
+    "unconfigured": "尚未配置 HID",
+    "disabled": "HID 已禁用",
+    "legacyAuto": "自动选择（旧配置）",
+    "unknown": "状态未知或读取失败",
+    "ready": "HID 可用",
+    "preparing": "已连接，HID 准备中",
+    "paired": "已配对，等待连接",
+    "pairing": "等待配对",
+    "waiting": "已应用，等待连接",
+    "initializing": "正在初始化",
+    "appliedHelp": "配置已应用。关闭引导会保留配置和已完成的配对。",
+    "draftHelp": "选择驱动和设备，点击应用后才会更改当前配置。",
+    "dirty": "功能配置有未保存的修改。请返回保存，或放弃修改后继续。",
+    "returnSave": "返回保存",
+    "discard": "放弃修改并继续",
+    "pairInstructions": "请在被控机的系统设置中添加蓝牙设备，选择“{name}”。配对窗口为 120 秒。",
+    "pairTimeout": "配对窗口已结束，可重新开启。",
+    "reopenPairing": "重新开启配对",
+    "resetWarning": "将清除原 One-KVM HID 绑定；请在被控机中删除旧设备后重新添加。",
+    "disableUsb": "切出 USB OTG 将关闭：{functions}。",
+    "msd": "虚拟磁盘",
+    "network": "USB 网络",
+    "audio": "USB 音频",
+    "done": "完成",
+    "later": "稍后连接",
+    "configureLater": "稍后配置",
+    "useConfiguration": "使用此配置",
+    "repair": "重新配对",
+    "uncertain": "上次请求结果不明。可先检查连接；再次应用将重新清除绑定。",
+    "checkConnection": "检查已应用配置",
+    "resumeRetry": "已读取当前配置，与待应用选择不一致。请检查选择后重试。"
+},
+  bluetoothHid: {
+    paired: '已配对，等待电脑建立键鼠连接',
+    "description": "经典蓝牙键盘和相对鼠标。",
+    "adapter": "蓝牙适配器",
+    "name": "设备名称",
+    "peer": "被控电脑地址（可选）",
+    "peerHelp": "留空时复用唯一的已绑定设备，或在配对时选择电脑。",
+    "ready": "键盘和鼠标已就绪",
+    "pairing": "配对窗口剩余 {seconds} 秒",
+    "connected": "已连接，等待 HID 通道建立",
+    "waiting": "等待已配对电脑连接",
+    "unavailable": "蓝牙不可用或正在启动",
+    "openPairing": "开启配对（2 分钟）",
+    "closePairing": "关闭配对",
+    "disconnect": "断开连接",
+    "forget": "忘记电脑",
+    "windows": "Windows 11：设置 → 蓝牙和其他设备 → 添加设备 → 蓝牙。忘记设备后，请同时在 Windows 删除设备再重新配对。",
+    "applyFirst": "先应用 HID 设置，再开启配对。"
+},
+
   videoInput: {
     format: '输入格式',
     resolution: '分辨率',
@@ -96,12 +178,19 @@ export default {
     backToPassword: '返回密码登录',
   },
   status: {
+    no_signal: '无信号',
+    busy: '设备占用中',
     connected: '已连接',
     connecting: '连接中',
     disconnected: '已断开',
     error: '错误',
   },
   actionbar: {
+    muted: '已静音',
+    more: '更多操作',
+    collapseToolbar: '收起工具栏',
+    expandToolbar: '展开工具栏',
+
     paste: '粘贴文本',
     micStart: '开始传声',
     micStop: '停止传声',
@@ -144,6 +233,7 @@ export default {
     streamSettings: '流设置',
     deviceSettings: '设备配置',
     videoMode: '视频模式',
+    videoRotation: '视频旋转',
     selectMode: '选择模式...',
     videoModeHint: 'HTTP 对带宽占用较大但模式兼容性好；WebRTC 对网络要求较高但带宽占用低',
     videoDevice: '视频设备',
@@ -190,6 +280,8 @@ export default {
     selectAudioDevice: '选择设备...',
   },
   infobar: {
+    pointerCaptured: '鼠标已捕获 · Esc 释放',
+
     keys: '按键',
     pointer: '指针',
     caps: 'Caps',
@@ -438,6 +530,7 @@ export default {
     uploadFailed: '文件上传失败',
     driveUnreadable: '格式不支持',
     driveUnreadableTooltip: '无法解析 exFAT 文件系统，可能已被格式化为不支持的格式。',
+    driveFilesystemUnsupportedHint: '网页暂不支持浏览此文件系统，但仍可连接到被控机使用。',
     reinitializeDrive: '重新初始化',
     diskMode: '驱动器模式',
     singleDiskMode: '单驱动器',
@@ -483,7 +576,7 @@ export default {
       downloadIncomplete: '远程镜像下载不完整。',
       driveNotInitialized: '虚拟盘尚未初始化。',
       driveConnected: '虚拟盘已连接到被控机，请先断开连接再操作文件。',
-      driveFilesystemUnsupported: '虚拟盘文件系统不受支持，请重新初始化后再操作。',
+      driveFilesystemUnsupported: '网页文件管理不支持此格式，但仍可挂载到被控机使用。',
       driveSizeInvalid: '虚拟盘大小无效。',
       storageSpaceUnavailable: '无法获取虚拟媒体存储空间信息。',
       storageFull: '虚拟媒体存储空间不足。',
@@ -550,6 +643,18 @@ export default {
     networkAddresses: '网络地址',
     language: '语言',
     theme: '主题',
+    consoleLayout: '控制台布局',
+    consoleLayoutDesc: '选择控制台操作区的排列方式，设置将保存在当前浏览器。',
+    consoleLayoutHints: {
+      current: '完整状态与文字工具栏，适合配置和排障。',
+      sidebar: '精简状态与固定图标入口，适合频繁操作。',
+      floating: '常用操作悬浮显示，可收起以专注画面。',
+    },
+    consoleLayoutOptions: {
+      current: '顶栏',
+      floating: '浮动栏',
+      sidebar: '侧边栏',
+    },
     lightMode: '浅色模式',
     darkMode: '深色模式',
     systemMode: '跟随系统',
@@ -949,6 +1054,8 @@ export default {
     },
   },
   statusCard: {
+    connectionDetails: '连接详情',
+
     device: '设备',
     video: '视频',
     hid: 'HID',
@@ -1073,6 +1180,13 @@ export default {
     rustdesk: {
       title: 'RustDesk 远程',
       desc: '配置 RustDesk 服务，将会锁定所选编码',
+      mode: '接入模式',
+      modeId: 'ID 服务',
+      modeIdDesc: '通过 ID 服务器注册，并在直连失败时按配置使用中继服务器',
+      modeDirectIp: 'IP 直连',
+      modeDirectIpDesc: '仅监听设备端口，不连接 ID 或中继服务器',
+      directAccessPort: '直连端口',
+      directAccessPortInvalid: '直连端口必须在 1 到 65535 之间',
       rendezvousServer: 'ID 服务器',
       rendezvousServerPlaceholder: 'hbbs.example.com:21116',
       rendezvousServerRequired: '请填写 RustDesk ID 服务器',
@@ -1080,7 +1194,6 @@ export default {
       relayServerPlaceholder: 'hbbr.example.com:21117',
       relayKey: '中继密钥',
       codec: '编码格式',
-      deviceInfo: '设备信息',
       deviceId: '设备 ID',
       devicePassword: '设备密码',
       showPassword: '显示密码',
@@ -1096,7 +1209,6 @@ export default {
       notInitialized: '未初始化',
       copyId: '复制 ID',
       copyPassword: '复制密码',
-      keypairGenerated: '密钥对已生成',
     },
     rtsp: {
       title: 'RTSP 视频流',