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

- feat: Add slider verification code (bd67997) - fix bug: Inventory cannot be zero (1f7a6ee) - fix: resolve merge conflicts and lint errors
2026-03-23 21:50:10 -07:00
parent 3806264343
commit d6616c5859
63 changed files with 3111 additions and 1130 deletions
@@ -126,9 +126,10 @@
  "userSecuritySettings": "用户与安全",
  "verify": {
    "captchaType": "验证码类型",
-    "captchaTypeDescription": "选择本地图形验证码（离线）或 Cloudflare Turnstile",
+    "captchaTypeDescription": "选择本地图形验证码、本地滑块验证码（均可离线）或 Cloudflare Turnstile",
    "captchaTypeLocal": "本地图形验证码",
    "captchaTypePlaceholder": "选择验证码类型",
+    "captchaTypeSlider": "本地滑块验证码",
    "captchaTypeTurnstile": "Cloudflare Turnstile",
    "description": "配置验证码类型和验证设置",
    "enableAdminLoginCaptcha": "启用管理端认证验证码",