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
@@ -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",