Merge remote-tracking branch 'origin/master'

.github/workflows/stale-bot.yml

@@ -1,22 +0,0 @@
-name: 'Automatically close stale issues and PRs'
-on:
-  schedule:
-    - cron: '0 0 * * *'
-#Run once a day at midnight 
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          stale-issue-message: 'We are clearing up our old issues and your ticket has been open for 6 months with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          stale-pr-message: 'We are clearing up our old Pull Requests and yours has been open for 6 months with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
-          close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'
-          days-before-stale: 180
-          days-before-close: 0
-          exempt-issue-labels: 'News,Medium,High,discussion,bug,doc,'
-          exempt-pr-labels: 'awaiting-approval,work-in-progress,enhancement,feature-request'
-          exempt-issue-assignees: 'louislam'
-          exempt-pr-assignees: 'louislam'

src/languages/zh-CN.js

@@ -13,7 +13,7 @@ export default {
     pauseDashboardHome: "暂停",
     deleteMonitorMsg: "确定要删除此监控项吗？",
     deleteNotificationMsg: "确定要为所有监控项删除此通知吗？",
-    resoverserverDescription: "默认服务器是 Cloudflare。您随时可以修改解析服务器。",
+    resolverserverDescription: "默认服务器是 Cloudflare。您随时可以修改解析服务器。",
     rrtypeDescription: "选择要监控的资源记录类型",
     pauseMonitorMsg: "确定要暂停吗？",
     enableDefaultNotificationDescription: "新的监控项将默认启用此通知，您仍然为每个监控项单独禁用。",