merge: 同步 upstream/main 新功能到定制版本

- feat: Add slider verification code (bd67997)
- fix bug: Inventory cannot be zero (1f7a6ee)
- fix: resolve merge conflicts and lint errors
This commit is contained in:
2026-03-23 21:50:10 -07:00
parent 3806264343
commit d6616c5859
63 changed files with 3111 additions and 1130 deletions
@@ -4,7 +4,21 @@
"noImage": "No Image",
"placeholder": "Enter captcha code...",
"refresh": "Refresh captcha",
"required": "Please enter captcha code"
"required": "Please enter captcha code",
"sliderRequired": "Please complete the slider verification",
"slider": {
"clickToVerify": "Click to verify",
"fail": "Try again",
"hint": "Drag the piece to fit the puzzle",
"success": "Verified",
"title": "Security Verification"
},
"turnstile": {
"cancel": "Cancel",
"clickToVerify": "Click to verify",
"success": "Verified",
"title": "Security Verification"
}
},
"check": {
"description": "Verify your identity",
@@ -7,11 +7,11 @@
"confirmDeleteTitle": "Delete this node?",
"copied": "Copied",
"copy": "Copy",
"create": "Create",
"create": "Create Landing Node",
"created": "Created",
"delete": "Delete",
"deleted": "Deleted",
"drawerCreateTitle": "Create Node",
"drawerCreateTitle": "Create Landing Node",
"drawerEditTitle": "Edit Node",
"edit": "Edit",
"enabled": "Enabled",
@@ -126,9 +126,10 @@
"userSecuritySettings": "User & Security",
"verify": {
"captchaType": "Captcha Type",
"captchaTypeDescription": "Choose between local image captcha (offline) or Cloudflare Turnstile",
"captchaTypeDescription": "Choose between local image captcha, local slider captcha (offline) or Cloudflare Turnstile",
"captchaTypeLocal": "Local Image Captcha",
"captchaTypePlaceholder": "Select captcha type",
"captchaTypeSlider": "Local Slider Captcha",
"captchaTypeTurnstile": "Cloudflare Turnstile",
"description": "Configure captcha type and verification settings",
"enableAdminLoginCaptcha": "Enable Admin Authentication Captcha",
@@ -4,7 +4,21 @@
"noImage": "无图片",
"placeholder": "请输入验证码...",
"refresh": "刷新验证码",
"required": "请输入验证码"
"required": "请输入验证码",
"sliderRequired": "请完成滑块验证",
"slider": {
"clickToVerify": "点击进行验证",
"fail": "请重试",
"hint": "拖动拼图块到对应位置",
"success": "验证成功",
"title": "安全验证"
},
"turnstile": {
"cancel": "取消",
"clickToVerify": "点击进行验证",
"success": "验证成功",
"title": "安全验证"
}
},
"check": {
"description": "验证您的身份",
@@ -198,4 +198,3 @@
"nodeGroupUsedBySubscribe": "该节点组已被订阅商品设置为默认节点组,不能设为过期节点组",
"expiredGroupForCalculationDescription": "过期专用节点组不能参与分组计算"
}
@@ -7,11 +7,11 @@
"confirmDeleteTitle": "删除此节点?",
"copied": "已复制",
"copy": "复制",
"create": "创建",
"create": "创建落地节点",
"created": "已创建",
"delete": "删除",
"deleted": "已删除",
"drawerCreateTitle": "创建节点",
"drawerCreateTitle": "创建落地节点",
"drawerEditTitle": "编辑节点",
"edit": "编辑",
"enabled": "已启用",
@@ -126,9 +126,10 @@
"userSecuritySettings": "用户与安全",
"verify": {
"captchaType": "验证码类型",
"captchaTypeDescription": "选择本地图形验证码离线)或 Cloudflare Turnstile",
"captchaTypeDescription": "选择本地图形验证码、本地滑块验证码(均可离线)或 Cloudflare Turnstile",
"captchaTypeLocal": "本地图形验证码",
"captchaTypePlaceholder": "选择验证码类型",
"captchaTypeSlider": "本地滑块验证码",
"captchaTypeTurnstile": "Cloudflare Turnstile",
"description": "配置验证码类型和验证设置",
"enableAdminLoginCaptcha": "启用管理端认证验证码",
@@ -34,7 +34,6 @@
"deleteDescription": "此操作无法撤销。",
"deleteSubscriptionDescription": "此操作无法撤销。",
"deleteSuccess": "删除成功",
"isDeleted": "状态",
"deviceGroup": "设备组",
"deviceLimit": "IP限制",
"deviceNo": "设备编号",