Merge branch 'refs/heads/v2-dev' into v2-dev-buy

# Conflicts:
#	docs/.vitepress/config.ts
#	packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -21,6 +21,7 @@ export default {
     pipeline: "Pipeline",
     domain: "Domain",
     deployTimes: "Deployments",
+    monitorCount: "DomainMonitors",
     duration: "Duration",
     price: "Price",
     paymentMethod: "Payment Method",
@@ -118,6 +119,7 @@ export default {
     scheduledTaskCount: "Scheduled Task Count",
     deployTaskCount: "Deployment Task Count",
     remainingValidity: "Remaining Validity",
+    effectiveTime: "Effective time",
     expiryTime: "Expiry Time",
     status: "Status",
     lastRun: "Last Run",
@@ -218,6 +220,7 @@ export default {
     triggerCronHelper:
       "Click the button above to choose a daily execution time.\nIt is recommended to trigger once per day. The task will be skipped if the certificate has not expired and will not be executed repeatedly.",
     notificationTitle: "Failure Notification",
+    notificationWhen: "Notification Timing",
     notificationHelper: "Get real-time alerts when the task fails",
     groupIdTitle: "Pipeline Group",
   },
@@ -248,7 +251,9 @@ export default {
       ok: "Valid",
       expired: "Expired",
     },
+    certEffectiveTime: "Certificate Effective",
     certExpiresTime: "Certificate Expiration",
+    remainingValidity: "Remaining Validity",
     expired: "expired",
     days: "days",
     lastCheckTime: "Last Check Time",
@@ -463,6 +468,7 @@ export default {
   validDays: "Valid Days",
   expires: " expires",
   days: " days",
+  effectiveTime: "Effective Time",
   expireTime: "Expiration Time",
   certIssuer: "Certificate Issuer",
   applyTime: "Application Time",
@@ -705,10 +711,23 @@ export default {
     pipeline: "Pipeline",
   },
 
+  addonType: "Type",
+  addonName: "Name",
+  addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
+  addonTypeSelect: "Select type",
   sys: {
     setting: {
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
+
+      captchaEnabled: "Enable Login Captcha",
+      captchaHelper: "Whether to enable captcha verification for login",
+      captchaType: "Captcha Setting",
+
+      baseSetting: "Base Settings",
+      registerSetting: "Register Settings",
+      safeSetting: "Safe Settings",
+      paymentSetting: "Payment Settings",
     },
   },
   modal: {
@@ -729,4 +748,8 @@ export default {
     challengeSetting: "Challenge Setting",
     gotoCnameTip: "Please go to CNAME Record Page",
   },
+  addonSelector: {
+    select: "Select",
+    placeholder: "select please",
+  },
 };

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -25,6 +25,7 @@ export default {
     pipeline: "流水线",
     domain: "域名",
     deployTimes: "部署次数",
+    monitorCount: "域名监控数",
     duration: "时长",
     price: "价格",
     paymentMethod: "支付方式",
@@ -124,6 +125,7 @@ export default {
     scheduledTaskCount: "定时任务数",
     deployTaskCount: "部署任务数",
     remainingValidity: "到期剩余",
+    effectiveTime: "生效时间",
     expiryTime: "过期时间",
     status: "状态",
     lastRun: "最后运行",
@@ -223,6 +225,7 @@ export default {
     triggerCronTitle: "定时触发",
     triggerCronHelper: "点击上面的按钮，选择每天几点定时执行。\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行",
     notificationTitle: "失败通知",
+    notificationWhen: "通知时机",
     notificationHelper: "任务执行失败实时提醒",
     groupIdTitle: "流水线分组",
   },
@@ -253,7 +256,9 @@ export default {
       ok: "正常",
       expired: "过期",
     },
+    certEffectiveTime: "证书生效时间",
     certExpiresTime: "证书到期时间",
+    remainingValidity: "到期剩余",
     expired: "过期",
     days: "天",
     lastCheckTime: "上次检查时间",
@@ -469,6 +474,7 @@ export default {
   validDays: "有效天数",
   expires: "过期",
   days: "天",
+  effectiveTime: "生效时间",
   expireTime: "过期时间",
   certIssuer: "证书颁发机构",
   applyTime: "申请时间",
@@ -693,7 +699,10 @@ export default {
   setAsDefault: "设为默认",
   disabledLabel: "禁用",
   confirmToggleStatus: "确定要{action}吗？",
-
+  addonType: "类型",
+  addonName: "名称",
+  addonNameHelper: "随意填写，相同类型助于区分即可",
+  addonTypeSelect: "请选择",
   template: {
     title: "流水线模版",
     edit: "流水线模版编辑",
@@ -712,6 +721,15 @@ export default {
     setting: {
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
+
+      captchaEnabled: "启用登录验证码",
+      captchaHelper: "登录时是否启用验证码",
+      captchaType: "验证码配置",
+
+      baseSetting: "基本设置",
+      registerSetting: "注册设置",
+      safeSetting: "安全设置",
+      paymentSetting: "支付设置",
     },
   },
   modal: {
@@ -732,4 +750,8 @@ export default {
     challengeSetting: "校验配置",
     gotoCnameTip: "CNAME域名配置请前往CNAME记录页面添加",
   },
+  addonSelector: {
+    select: "选择",
+    placeholder: "请选择",
+  },
 };