Merge remote-tracking branch 'upstream/main'

apps/admin/public/assets/locales/en-US/user.json

@@ -73,6 +73,14 @@
   "referrerUserId": "Referrer User ID",
   "remove": "Remove",
   "resetLogs": "Reset Logs",
+  "resetTraffic": "Reset Traffic",
+  "toggleStatus": "Toggle Status",
+  "resetSubscriptionToken": "Reset Token",
+  "resetSubscriptionTokenDescription": "This will reset the subscription token. Old links will become invalid.",
+  "resetSubscriptionTraffic": "Reset Traffic",
+  "resetSubscriptionTrafficDescription": "This will reset the subscription traffic counters.",
+  "toggleSubscriptionStatus": "Toggle Status",
+  "toggleSubscriptionStatusDescription": "This will toggle the subscription status.",
   "resetTime": "Reset Time",
   "resetToken": "Reset Subscription Address",
   "resetTokenDescription": "This will reset the subscription address and regenerate a new token.",

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

@@ -73,6 +73,14 @@
   "referrerUserId": "推荐人用户 ID",
   "remove": "移除",
   "resetLogs": "重置日志",
+  "resetTraffic": "重置流量",
+  "toggleStatus": "切换状态",
+  "resetSubscriptionToken": "重置令牌",
+  "resetSubscriptionTokenDescription": "将重置订阅令牌，旧订阅链接会失效。",
+  "resetSubscriptionTraffic": "重置流量",
+  "resetSubscriptionTrafficDescription": "将重置该订阅的流量统计。",
+  "toggleSubscriptionStatus": "切换状态",
+  "toggleSubscriptionStatusDescription": "将切换该订阅的启用/停用状态。",
   "resetTime": "重置时间",
   "resetToken": "重置订阅地址",
   "resetTokenDescription": "这将重置订阅地址并重新生成新的令牌。",