🔀 merge: main into develop

apps/admin/public/assets/locales/zh-CN/components.json

@@ -44,6 +44,8 @@
     "60003": "检测到现有订阅，请先取消后再继续。",
     "60004": "由于订阅有活跃用户，暂时无法删除。",
     "60005": "单一订阅模式已超过用户限制",
+    "60006": "用户配额已达到限制，无法继续操作。",
+    "60007": "库存不足，请稍后再试或联系管理员。",
     "70001": "验证码不正确，请重新输入。",
     "80001": "任务未成功加入队列，请稍后再试。",
     "90001": "请禁用 DEBUG 模式后再试。",

apps/admin/public/assets/locales/zh-CN/product.json

@@ -30,6 +30,7 @@
     "discountPercent": "折扣百分比",
     "Hour": "小时",
     "inventory": "订阅库存",
+    "unlimitedInventory": "无限制（输入 -1）",
     "language": "语言",
     "languageDescription": "留空为默认无语言限制",
     "languagePlaceholder": "订阅的语言标识符，例如 en-US、zh-CN",
@@ -56,6 +57,8 @@
     "resetOn1st": "每月1日重置",
     "selectResetCycle": "请选择重置周期",
     "selectUnitTime": "请选择时间单位",
+    "showOriginalPrice": "显示原价",
+    "showOriginalPriceDescription": "开启后，在订阅卡片上将会显示原价和折后价，帮助用户了解优惠幅度",
     "speedLimit": "速度限制",
     "traffic": "流量",
     "unitPrice": "单价",

apps/admin/public/assets/locales/zh-CN/tool.json

@@ -13,9 +13,9 @@
   "systemServices": "系统服务",
   "update": "更新",
   "updateFailed": "更新失败",
-  "updateServerDescription": "确定要将服务器版本从 V{{current}} 更新到 V{{latest}} 吗？",
+  "updateServerDescription": "确定要将服务器版本从 {{current}} 更新到 {{latest}} 吗？",
   "updateSuccess": "更新成功",
-  "updateWebDescription": "确定要将前端版本从 V{{current}} 更新到 V{{latest}} 吗？",
+  "updateWebDescription": "确定要将前端版本从 {{current}} 更新到 {{latest}} 吗？",
   "userUpdateSuccess": "用户端更新成功",
   "webVersion": "前端版本"
 }

apps/admin/public/assets/locales/zh-CN/user.json

@@ -25,9 +25,11 @@
   "createSuccess": "创建成功",
   "createUser": "创建用户",
   "delete": "删除",
+  "deleted": "已删除",
   "deleteDescription": "此操作无法撤销。",
   "deleteSubscriptionDescription": "此操作无法撤销。",
   "deleteSuccess": "删除成功",
+  "isDeleted": "状态",
   "deviceLimit": "IP限制",
   "download": "下载",
   "downloadTraffic": "下载流量",
@@ -51,6 +53,7 @@
   "loginStatus": "登录状态",
   "manager": "管理员",
   "more": "更多",
+  "normal": "正常",
   "notifySettingsTitle": "通知设置",
   "offline": "离线",
   "online": "在线",
@@ -80,6 +83,25 @@
   "toggleSubscriptionStatus": "切换状态",
   "toggleSubscriptionStatusDescription": "将切换该订阅的启用/停用状态。",
   "resetTime": "重置时间",
+  "resetToken": "重置订阅地址",
+  "resetTokenDescription": "这将重置订阅地址并重新生成新的令牌。",
+  "resetTokenSuccess": "订阅地址重置成功",
+  "confirmResetToken": "确认重置订阅地址",
+  "stopSubscribe": "暂停订阅",
+  "stopSubscribeDescription": "这将暂时停止订阅。用户将无法使用。",
+  "stopSubscribeSuccess": "订阅已暂停",
+  "confirmStopSubscribe": "确认暂停订阅",
+  "resumeSubscribe": "恢复订阅",
+  "resumeSubscribeDescription": "这将恢复订阅，允许用户继续使用。",
+  "resumeSubscribeSuccess": "订阅已恢复",
+  "confirmResumeSubscribe": "确认恢复订阅",
+  "status": "状态",
+  "statusPending": "待处理",
+  "statusActive": "活跃",
+  "statusFinished": "已完成",
+  "statusExpired": "已过期",
+  "statusDeducted": "已扣除",
+  "statusStopped": "已停止",
   "save": "保存",
   "speedLimit": "速度限制",
   "startTime": "开始时间",