Merge remote-tracking branch 'AnnAngela/master'

# Conflicts:
#	src/languages/zh-CN.js

src/components/notifications/AliyunSms.vue

@@ -6,7 +6,7 @@
         <label for="secretAccessKey" class="form-label">{{ $t("SecretAccessKey") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="secretAccessKey" v-model="$parent.notification.secretAccessKey" type="text" class="form-control" required>
 
-        <label for="phonenumber" class="form-label">{{ $t("Phonenumber") }}<span style="color: red;"><sup>*</sup></span></label>
+        <label for="phonenumber" class="form-label">{{ $t("PhoneNumbers") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="phonenumber" v-model="$parent.notification.phonenumber" type="text" class="form-control" required>
 
         <label for="templateCode" class="form-label">{{ $t("TemplateCode") }}<span style="color: red;"><sup>*</sup></span></label>
@@ -16,7 +16,7 @@
         <input id="signName" v-model="$parent.notification.signName" type="text" class="form-control" required>
 
         <div class="form-text">
-            <p>Sms template must contain parameters: <br> <code>${name} ${time} ${status} ${msg}</code></p>
+            <p>{{ $t("Sms template must contain parameters: ") }}<br> <code>${name} ${time} ${status} ${msg}</code></p>
             <i18n-t tag="p" keypath="Read more:">
                 <a href="https://help.aliyun.com/document_detail/101414.html" target="_blank">https://help.aliyun.com/document_detail/101414.html</a>
             </i18n-t>

src/components/notifications/DingDing.vue

@@ -7,9 +7,9 @@
         <input id="secretKey" v-model="$parent.notification.secretKey" type="text" class="form-control" required>
 
         <div class="form-text">
-            <p>For safety, must use secret key</p>
+            <p>{{ $t("For safety, must use secret key") }}</p>
             <i18n-t tag="p" keypath="Read more:">
-                <a href="https://developers.dingtalk.com/document/robots/custom-robot-access" target="_blank">https://developers.dingtalk.com/document/robots/custom-robot-access</a>
+                <a href="https://developers.dingtalk.com/document/robots/custom-robot-access" target="_blank">https://developers.dingtalk.com/document/robots/custom-robot-access</a> <a href="https://open.dingtalk.com/document/robots/customize-robot-security-settings#title-7fs-kgs-36x" target="_blank">https://open.dingtalk.com/document/robots/customize-robot-security-settings#title-7fs-kgs-36x</a>
             </i18n-t>
         </div>
     </div>

src/languages/zh-CN.js

@@ -151,7 +151,7 @@ export default {
     importHandleDescription: "如果想跳过同名的监控项或通知，请选择“跳过”；“覆盖”将删除所有现有的监控项和通知。",
     confirmImportMsg: "确定要导入备份吗？请确保已经选择了正确的导入选项。",
     "Heartbeat Retry Interval": "心跳重试间隔",
-    "Backup": "备份",
+    Backup: "备份",
     "Import Backup": "导入备份",
     "Export Backup": "导出备份",
     "Skip existing": "跳过",
@@ -219,8 +219,8 @@ export default {
     "Content Type": "Content Type",
     webhookJsonDesc: "{0} 适合现代的服务，比如 express.js",
     webhookFormDataDesc: "{multipart} 适合 PHP，解码使用 {decodeFunction}",
-    secureOptionNone: "无 / STARTTLS（25，587）",
+    secureOptionNone: "无 / STARTTLS（常见端口号为 25、587）",
-    secureOptionTLS: "TLS（465）",
+    secureOptionTLS: "TLS（常见端口号为 465）",
     "Ignore TLS Error": "忽略 TLS 错误",
     "From Email": "发信人",
     "To Email": "收信人",
@@ -341,7 +341,7 @@ export default {
     "Hide Tags": "隐藏标签",
     Description: "描述",
     "No monitors available.": "没有可用的监控项",
-    "Add one": "Add one",
+    "Add one": "创建新的监控项",
     "No Monitors": "没有监控项",
     "Untitled Group": "无标题的分组",
     Services: "服务",
@@ -350,18 +350,27 @@ export default {
     "Powered by": "Powered by",
     shrinkDatabaseDescription: "这将触发 SQLite 数据库的 VACUUM 命令，如果您的数据库是在1.10.0版本之后创建的，AUTO_VACUUM 已经启用了，则不需要再使用此功能",
     serwersms: "SerwerSMS.pl",
-    serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
+    serwersmsAPIUser: "API Username（请保留 webapi_ 前缀）",
     serwersmsAPIPassword: "API Password",
     serwersmsPhoneNumber: "Phone number",
     serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
     stackfield: "Stackfield",
-    smtpDkimSettings: "DKIM Settings",
+    smtpDkimSettings: "DKIM 设置",
-    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
+    smtpDkimDesc: "请参考 Nodemailer 的 DKIM {0} 进行配置。",
-    documentation: "documentation",
+    documentation: "文档",
     smtpDkimDomain: "域名",
-    smtpDkimKeySelector: "Key Selector",
+    smtpDkimKeySelector: "前缀选择器",
-    smtpDkimPrivateKey: "Private Key",
+    smtpDkimPrivateKey: "密钥",
-    smtpDkimHashAlgo: "Hash Algorithm (可选)",
+    smtpDkimHashAlgo: "哈希算法（可选）",
-    smtpDkimheaderFieldNames: "Header Keys to sign (可选)",
+    smtpDkimheaderFieldNames: "明确包含在哈希计算对象内的 Header 列表（可选）",
-    smtpDkimskipFields: "Header Keys not to sign (可选)",
+    smtpDkimskipFields: "不包含在哈希计算对象内的 Header 列表（可选）",
+    Feishu: "飞书",
+    AliyunSMS: "阿里云短信服务",
+    "Sms template must contain parameters: ": "短信模板必须包含以下变量：",
+    DingDing: "钉钉自定义机器人",
+    WebHookUrl: "钉钉自定义机器人 Webhook 地址",
+    SecretKey: "钉钉自定义机器人加签密钥",
+    "For safety, must use secret key": "出于安全考虑，必须使用加签密钥",
+    WeCom: "企业微信群机器人",
+    "WeCom Bot Key": "企业微信群机器人 key",
 };