🔀 merge: main into develop

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

@@ -44,6 +44,8 @@
     "60003": "An existing subscription is detected. Please cancel it before proceeding.",
     "60004": "Unable to delete at the moment as the subscription has active users.",
     "60005": "Single subscription mode has exceeded user limit",
+    "60006": "User quota limit has been reached, unable to continue.",
+    "60007": "Insufficient inventory, please try again later or contact the administrator.",
     "70001": "Incorrect verification code, please re-enter.",
     "80001": "Task was not successfully queued, please try again later.",
     "90001": "Please disable DEBUG mode and try again.",
@@ -61,5 +63,5 @@
     "system": "System",
     "toggle": "Toggle theme"
   },
-  "unlimited": "unlimited"
+  "unlimited": "Unlimited"
 }

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

@@ -30,6 +30,7 @@
     "discountPercent": "Discount Percentage",
     "Hour": "Hour",
     "inventory": "Subscription Limit",
+    "unlimitedInventory": "Unlimited (enter -1)",
     "language": "Language",
     "languageDescription": "Leave empty for default without language restriction",
     "languagePlaceholder": "Language identifier for the subscription, e.g., en-US, zh-CN",
@@ -56,6 +57,8 @@
     "resetOn1st": "Reset on the 1st",
     "selectResetCycle": "Please select a reset cycle",
     "selectUnitTime": "Please select a unit of time",
+    "showOriginalPrice": "Show Original Price",
+    "showOriginalPriceDescription": "When enabled, the subscription card will display both the original price and the discounted price to help users understand the discount amount",
     "speedLimit": "Speed Limit ",
     "traffic": "Traffic",
     "unitPrice": "Unit Price",

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

@@ -13,9 +13,9 @@
   "systemServices": "System Services",
   "update": "Update",
   "updateFailed": "Update failed",
-  "updateServerDescription": "Are you sure you want to update the server version from V{{current}} to V{{latest}}?",
+  "updateServerDescription": "Are you sure you want to update the server version from {{current}} to {{latest}}?",
   "updateSuccess": "Update completed successfully",
-  "updateWebDescription": "Are you sure you want to update the web version from V{{current}} to V{{latest}}?",
+  "updateWebDescription": "Are you sure you want to update the web version from {{current}} to {{latest}}?",
   "userUpdateSuccess": "User updated successfully",
   "webVersion": "Web Version"
 }

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

@@ -25,9 +25,11 @@
   "createSuccess": "Created successfully",
   "createUser": "Create User",
   "delete": "Delete",
+  "deleted": "Deleted",
   "deleteDescription": "This action cannot be undone.",
   "deleteSubscriptionDescription": "This action cannot be undone.",
   "deleteSuccess": "Deleted successfully",
+  "isDeleted": "Status",
   "deviceLimit": "Device Limit",
   "download": "Download",
   "downloadTraffic": "Download Traffic",
@@ -51,6 +53,7 @@
   "loginStatus": "Login Status",
   "manager": "Administrator",
   "more": "More",
+  "normal": "Normal",
   "notifySettingsTitle": "Notify Settings",
   "offline": "Offline",
   "online": "Online",
@@ -80,6 +83,25 @@
   "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.",
+  "resetTokenSuccess": "Subscription address reset successfully",
+  "confirmResetToken": "Confirm Reset Subscription Address",
+  "stopSubscribe": "Stop Subscription",
+  "stopSubscribeDescription": "This will stop the subscription temporarily. User will not be able to use it.",
+  "stopSubscribeSuccess": "Subscription stopped successfully",
+  "confirmStopSubscribe": "Confirm Stop Subscription",
+  "resumeSubscribe": "Resume Subscription",
+  "resumeSubscribeDescription": "This will resume the subscription and allow the user to use it.",
+  "resumeSubscribeSuccess": "Subscription resumed successfully",
+  "confirmResumeSubscribe": "Confirm Resume Subscription",
+  "status": "Status",
+  "statusPending": "Pending",
+  "statusActive": "Active",
+  "statusFinished": "Finished",
+  "statusExpired": "Expired",
+  "statusDeducted": "Deducted",
+  "statusStopped": "Stopped",
   "save": "Save",
   "speedLimit": "Speed Limit",
   "startTime": "startTime",