Merge remote-tracking branch 'origin/master' into rename-consequently-to-consecutively

# Conflicts:
#	src/lang/cs-CZ.json
#	src/lang/de-DE.json
#	src/lang/en.json
#	src/lang/es-ES.json
#	src/lang/fr-FR.json
#	src/lang/id-ID.json
#	src/lang/pl.json
#	src/lang/pt-BR.json
#	src/lang/tr-TR.json
#	src/lang/zh-HK.json

src/lang/zh-CN.json

@@ -3,7 +3,7 @@
     "checkEverySecond": "检测频率 {0} 秒",
     "retryCheckEverySecond": "重试间隔 {0} 秒",
     "resendEveryXTimes": "每 {0} 次失败则重复发送一次",
-    "resendDisabled": "为 0 时禁用重复发送",
+    "resendDisabled": "禁用重复发送",
     "retriesDescription": "服务被标记为故障并发送通知之前的最大重试次数",
     "ignoreTLSError": "忽略 HTTPS 站点的 TLS/SSL 错误",
     "upsideDownModeDescription": "反转状态监控，如果服务可访问，则认为是故障。",
@@ -60,7 +60,7 @@
     "Quick Stats": "状态速览",
     "Up": "正常",
     "Down": "故障",
-    "Pending": "正在检测",
+    "Pending": "检测中",
     "Unknown": "未知",
     "Pause": "暂停",
     "Name": "名称",
@@ -85,13 +85,13 @@
     "Friendly Name": "显示名称",
     "URL": "URL",
     "Hostname": "主机名",
-    "Port": "端口号",
+    "Port": "端口",
     "Heartbeat Interval": "心跳间隔",
     "Retries": "重试次数",
     "Heartbeat Retry Interval": "心跳重试间隔",
     "Resend Notification if Down X times consecutively": "连续失败时重复发送通知的间隔次数",
     "Advanced": "高级",
-    "Upside Down Mode": "反转监控",
+    "Upside Down Mode": "反转模式",
     "Max. Redirects": "最大重定向次数",
     "Accepted Status Codes": "有效状态码",
     "Push URL": "推送 URL",
@@ -679,9 +679,9 @@
     "high": "高价",
     "General Monitor Type": "常规监控类型",
     "Passive Monitor Type": "被动监控类型",
-    "Specific Monitor Type": "针对监控类型",
+    "Specific Monitor Type": "特殊监控类型",
     "dataRetentionTimeError": "保留期必须为0或更大",
-    "Monitor": "监控项 | 监控项",
+    "Monitor": "监控项",
     "Custom": "自定义",
     "promosmsAllowLongSMS": "允许长的短信",
     "confirmDeleteTagMsg": "你确定你要删除这个标签？与此标签关联的监视器不会被删除。",
@@ -696,5 +696,9 @@
     "uninstall": "卸载",
     "uninstalling": "正在卸载",
     "confirmUninstallPlugin": "您确定要卸载此插件吗？",
-    "Custom Monitor Type": "自定义监控类型"
+    "Custom Monitor Type": "自定义监控类型",
+    "markdownSupported": "支持 Markdown 语法",
+    "Google Analytics ID": "Google Analytics（分析）ID",
+    "Learn More": "了解更多",
+    "Edit Tag": "编辑标签"
 }