Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings

# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js

src/languages/zh-CN.js

@@ -519,4 +519,14 @@ export default {
     wayToGetClickSendSMSToken: "您可以从 {0} 获取 API 凭证 Username 和 凭证 Key。",
     signedInDisp: "当前用户： {0}",
     signedInDispDisabled: "已禁用身份验证",
+    dnsPortDescription: "DNS 服务器端口，默认为 53，你可以在任何时候更改此端口.",
+    error: "错误",
+    critical: "关键",
+    wayToGetPagerDutyKey: "你可以在 Service -> Service Directory -> (Select a service) -> Integrations -> Add integration 页面中搜索 \"Events API V2\" 以获取此 Integration Key，更多信息请参见 {0}",
+    "Integration Key": "Integration Key",
+    "Integration URL": "Integration URL",
+    "Auto resolve or acknowledged": "自动标记为已解决或已读",
+    "do nothing": "不做任何操作",
+    "auto acknowledged": "自动标记为已读",
+    "auto resolve": "自动标记为已解决",
 };