From 45da7c543193d6a355305830b1c9c8122b030941 Mon Sep 17 00:00:00 2001
From: AnnAngela-work <naganjue@vip.qq.com>
Date: Fri, 29 Apr 2022 20:17:15 +0800
Subject: [PATCH 1/6] Improve translation work

---
 src/components/notifications/ClickSendSMS.vue | 12 ++---
 src/components/notifications/Line.vue         |  2 +-
 src/components/notifications/Octopush.vue     | 10 ++--
 src/components/notifications/PromoSMS.vue     |  4 +-
 src/components/notifications/Pushover.vue     | 45 +++++++++--------
 src/components/notifications/Pushy.vue        |  4 +-
 src/components/notifications/TechulusPush.vue |  2 +-
 src/components/settings/About.vue             |  4 +-
 src/languages/en.js                           | 50 +++++++++++++++++++
 src/languages/zh-CN.js                        | 50 +++++++++++++++++++
 src/layouts/Layout.vue                        |  2 +-
 src/pages/EditMonitor.vue                     |  2 +-
 src/pages/NotFound.vue                        | 12 ++---
 src/pages/StatusPage.vue                      |  2 +-
 14 files changed, 151 insertions(+), 50 deletions(-)

diff --git a/src/components/notifications/ClickSendSMS.vue b/src/components/notifications/ClickSendSMS.vue
index 4fbb2f414..09d3201ca 100644
--- a/src/components/notifications/ClickSendSMS.vue
+++ b/src/components/notifications/ClickSendSMS.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="mb-3">
-        <label for="clicksendsms-login" class="form-label">API Username</label>
+        <label for="clicksendsms-login" class="form-label">{{ $t("API Username") }}</label>
         <div class="form-text">
             {{ $t("apiCredentials") }}
             <a href="http://dashboard.clicksend.com/account/subaccounts" target="_blank">{{ $t("here") }}</a>
         </div>
         <input id="clicksendsms-login" v-model="$parent.notification.clicksendsmsLogin" type="text" class="form-control" required>
-        <label for="clicksendsms-key" class="form-label">API Key</label>
+        <label for="clicksendsms-key" class="form-label">{{ $t("API Key") }}</label>
         <HiddenInput id="clicksendsms-key" v-model="$parent.notification.clicksendsmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
     <div class="mb-3">
@@ -16,15 +16,15 @@
         </div>
     </div>
     <div class="mb-3">
-        <label for="clicksendsms-to-number" class="form-label">Recipient Number</label>
+        <label for="clicksendsms-to-number" class="form-label">{{ $t("Recipient Number") }}</label>
         <input id="clicksendsms-to-number" v-model="$parent.notification.clicksendsmsToNumber" type="text" minlength="8" maxlength="14" class="form-control" required>
     </div>
     <div class="mb-3">
-        <label for="clicksendsms-sender-name" class="form-label">From Name/Number -
-            <a href="https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number" target="_blank">More Info</a>
+        <label for="clicksendsms-sender-name" class="form-label">{{ $t("From Name/Number") }} -
+            <i18n-t tag="span" keypath="Read more:"><a href="https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number" target="_blank">https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number</a></i18n-t>
         </label>
         <input id="clicksendsms-sender-name" v-model="$parent.notification.clicksendsmsSenderName" type="text" minlength="3" maxlength="11" class="form-control">
-        <div class="form-text">Leave blank to use a shared sender number.</div>
+        <div class="form-text">{{ $t("Leave blank to use a shared sender number.") }}</div>
     </div>
 </template>
 <script>
diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index cb52c0c1f..34ceb4ac7 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -7,7 +7,7 @@
         <b>{{ $t("Basic Settings") }}</b>
     </i18n-t>
     <div class="mb-3" style="margin-top: 12px;">
-        <label for="line-user-id" class="form-label">User ID</label>
+        <label for="line-user-id" class="form-label">{{ $t("User ID") }}</label>
         <input id="line-user-id" v-model="$parent.notification.lineUserID" type="text" class="form-control" required>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index 37629d390..7d5fe469d 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -1,18 +1,18 @@
 <template>
     <div class="mb-3">
-        <label for="octopush-version" class="form-label">Octopush API Version</label>
+        <label for="octopush-version" class="form-label">{{ $t("Octopush API Version") }}</label>
         <select id="octopush-version" v-model="$parent.notification.octopushVersion" class="form-select">
-            <option value="2">Octopush (endpoint: api.octopush.com)</option>
-            <option value="1">Legacy Octopush-DM (endpoint: www.octopush-dm.com)</option>
+            <option value="2">{{ $t("octopush") }} ({{ $t("endpoint") }}: api.octopush.com)</option>
+            <option value="1">{{ $t("Legacy Octopush-DM") }} ({{ $t("endpoint") }}: www.octopush-dm.com)</option>
         </select>
         <div class="form-text">
             {{ $t("octopushLegacyHint") }}
         </div>
     </div>
     <div class="mb-3">
-        <label for="octopush-key" class="form-label">API KEY</label>
+        <label for="octopush-key" class="form-label">{{ $t("octopushAPIKey") }}</label>
         <HiddenInput id="octopush-key" v-model="$parent.notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>
-        <label for="octopush-login" class="form-label">API LOGIN</label>
+        <label for="octopush-login" class="form-label">{{ $t("octopushLogin") }}</label>
         <input id="octopush-login" v-model="$parent.notification.octopushLogin" type="text" class="form-control" required>
     </div>
     <div class="mb-3">
diff --git a/src/components/notifications/PromoSMS.vue b/src/components/notifications/PromoSMS.vue
index 61e61a93c..c11ed559e 100644
--- a/src/components/notifications/PromoSMS.vue
+++ b/src/components/notifications/PromoSMS.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="mb-3">
-        <label for="promosms-login" class="form-label">API LOGIN</label>
+        <label for="promosms-login" class="form-label">{{$("promosmsLogin")}}</label>
         <input id="promosms-login" v-model="$parent.notification.promosmsLogin" type="text" class="form-control" required>
-        <label for="promosms-key" class="form-label">API PASSWORD</label>
+        <label for="promosms-key" class="form-label">{{$("promosmsPassword")}}</label>
         <HiddenInput id="promosms-key" v-model="$parent.notification.promosmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
     <div class="mb-3">
diff --git a/src/components/notifications/Pushover.vue b/src/components/notifications/Pushover.vue
index ee6276dd3..83261deb7 100644
--- a/src/components/notifications/Pushover.vue
+++ b/src/components/notifications/Pushover.vue
@@ -18,28 +18,29 @@
         </select>
         <label for="pushover-sound" class="form-label">{{ $t("Notification Sound") }}</label>
         <select id="pushover-sound" v-model="$parent.notification.pushoversounds" class="form-select">
-            <option>pushover</option>
-            <option>bike</option>
-            <option>bugle</option>
-            <option>cashregister</option>
-            <option>classical</option>
-            <option>cosmic</option>
-            <option>falling</option>
-            <option>gamelan</option>
-            <option>incoming</option>
-            <option>intermission</option>
-            <option>mechanical</option>
-            <option>pianobar</option>
-            <option>siren</option>
-            <option>spacealarm</option>
-            <option>tugboat</option>
-            <option>alien</option>
-            <option>climb</option>
-            <option>persistent</option>
-            <option>echo</option>
-            <option>updown</option>
-            <option>vibrate</option>
-            <option>none</option>
+            <option>{{ $t("pushoversounds pushover") }}</option>
+            <option>{{ $t("pushoversounds bike") }}</option>
+            <option>{{ $t("pushoversounds bugle") }}</option>
+            <option>{{ $t("pushoversounds cashregister") }}</option>
+            <option>{{ $t("pushoversounds classical") }}</option>
+            <option>{{ $t("pushoversounds cosmic") }}</option>
+            <option>{{ $t("pushoversounds falling") }}</option>
+            <option>{{ $t("pushoversounds gamelan") }}</option>
+            <option>{{ $t("pushoversounds incoming") }}</option>
+            <option>{{ $t("pushoversounds intermission") }}</option>
+            <option>{{ $t("pushoversounds magic") }}</option>
+            <option>{{ $t("pushoversounds mechanical") }}</option>
+            <option>{{ $t("pushoversounds pianobar") }}</option>
+            <option>{{ $t("pushoversounds siren") }}</option>
+            <option>{{ $t("pushoversounds spacealarm") }}</option>
+            <option>{{ $t("pushoversounds tugboat") }}</option>
+            <option>{{ $t("pushoversounds alien") }}</option>
+            <option>{{ $t("pushoversounds climb") }}</option>
+            <option>{{ $t("pushoversounds persistent") }}</option>
+            <option>{{ $t("pushoversounds echo") }}</option>
+            <option>{{ $t("pushoversounds updown") }}</option>
+            <option>{{ $t("pushoversounds vibrate") }}</option>
+            <option>{{ $t("pushoversounds none") }}</option>
         </select>
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
diff --git a/src/components/notifications/Pushy.vue b/src/components/notifications/Pushy.vue
index 26f404d29..3537eb4f4 100644
--- a/src/components/notifications/Pushy.vue
+++ b/src/components/notifications/Pushy.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="mb-3">
-        <label for="pushy-app-token" class="form-label">API_KEY</label>
+        <label for="pushy-app-token" class="form-label">{{ $t("pushyAPIKey") }}</label>
         <HiddenInput id="pushy-app-token" v-model="$parent.notification.pushyAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
 
     <div class="mb-3">
-        <label for="pushy-user-key" class="form-label">USER_TOKEN</label>
+        <label for="pushy-user-key" class="form-label">{{ $t("pushyToken") }}</label>
         <div class="input-group mb-3">
             <HiddenInput id="pushy-user-key" v-model="$parent.notification.pushyToken" :required="true" autocomplete="one-time-code"></HiddenInput>
         </div>
diff --git a/src/components/notifications/TechulusPush.vue b/src/components/notifications/TechulusPush.vue
index 918f8be63..86d4e5fee 100644
--- a/src/components/notifications/TechulusPush.vue
+++ b/src/components/notifications/TechulusPush.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="push-api-key" class="form-label">API_KEY</label>
+        <label for="push-api-key" class="form-label">{{ $t("API Key") }}</label>
         <HiddenInput id="push-api-key" v-model="$parent.notification.pushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
 
diff --git a/src/components/settings/About.vue b/src/components/settings/About.vue
index b4d7b6593..a71e38af2 100644
--- a/src/components/settings/About.vue
+++ b/src/components/settings/About.vue
@@ -9,11 +9,11 @@
 
             <div class="mt-1">
                 <div class="form-check">
-                    <label><input v-model="settings.checkUpdate" type="checkbox" @change="saveSettings()" /> Show update if available</label>
+                    <label><input v-model="settings.checkUpdate" type="checkbox" @change="saveSettings()" /> {{ $t("Show update if available") }}</label>
                 </div>
 
                 <div class="form-check">
-                    <label><input v-model="settings.checkBeta" type="checkbox" :disabled="!settings.checkUpdate" @change="saveSettings()" /> Also check beta release</label>
+                    <label><input v-model="settings.checkBeta" type="checkbox" :disabled="!settings.checkUpdate" @change="saveSettings()" /> {{ $t("Also check beta release") }}</label>
                 </div>
             </div>
         </div>
diff --git a/src/languages/en.js b/src/languages/en.js
index ab73ce354..ad97cbefc 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -464,4 +464,54 @@ export default {
     "Domain Names": "Domain Names",
     signedInDisp: "Signed in as {0}",
     signedInDispDisabled: "Auth Disabled.",
+    "Certificate Expiry Notification": "Certificate Expiry Notification",
+    "API Username": "API Username",
+    "API Key": "API Key",
+    "Recipient Number": "Recipient Number",
+    "From Name/Number": "From Name/Number",
+    "Leave blank to use a shared sender number.": "Leave blank to use a shared sender number.",
+    "Octopush API Version": "Octopush API Version",
+    "Legacy Octopush-DM": "Legacy Octopush-DM",
+    "endpoint": "endpoint",
+    octopushAPIKey: "\"API key\" from HTTP API credentials in control panel",
+    octopushLogin: "\"Login\" from HTTP API credentials in control panel",
+    promosmsLogin: "API Login Name",
+    promosmsPassword: "API Password",
+    "pushoversounds pushover": "Pushover (default)",
+    "pushoversounds bike": "Bike",
+    "pushoversounds bugle": "Bugle",
+    "pushoversounds cashregister": "Cash Register",
+    "pushoversounds classical": "Classical",
+    "pushoversounds cosmic": "Cosmic",
+    "pushoversounds falling": "Falling",
+    "pushoversounds gamelan": "Gamelan",
+    "pushoversounds incoming": "Incoming",
+    "pushoversounds intermission": "Intermission",
+    "pushoversounds magic": "Magic",
+    "pushoversounds mechanical": "Mechanical",
+    "pushoversounds pianobar": "Piano Bar",
+    "pushoversounds siren": "Siren",
+    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds tugboat": "Tug Boat",
+    "pushoversounds alien": "Alien Alarm (long)",
+    "pushoversounds climb": "Climb (long)",
+    "pushoversounds persistent": "Persistent (long)",
+    "pushoversounds echo": "Pushover Echo (long)",
+    "pushoversounds updown": "Up Down (long)",
+    "pushoversounds vibrate": "Vibrate Only",
+    "pushoversounds none": "None (silent)",
+    pushyAPIKey: "Secret API Key",
+    pushyToken: "Device token",
+    "Show update if available": "Show update if available",
+    "Also check beta release": "Also check beta release",
+    "Using a Reverse Proxy?": "Using a Reverse Proxy?",
+    "Check how to config it for WebSocket": "Check how to config it for WebSocket",
+    "Steam Game Server": "Steam Game Server",
+    "Most likely causes:": "Most likely causes:",
+    "The resource is no longer available.": "The resource is no longer available.",
+    "There might be a typing error in the address.": "There might be a typing error in the address.",
+    "What you can try:": "What you can try:",
+    "Retype the address.": "Retype the address.",
+    "Go back to the previous page.": "Go back to the previous page.",
+    "Coming Soon": "Coming Soon",
 };
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index f50f50f13..9e5fcba13 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -469,4 +469,54 @@ export default {
     "Footer Text": "底部自定义文本",
     "Show Powered By": "显示 Powered By",
     "Domain Names": "域名",
+    "Certificate Expiry Notification": "证书到期时通知",
+    "API Username": "API 凭证 Username",
+    "API Key": "API 凭证 Key",
+    "Recipient Number": "收件人手机号码",
+    "From Name/Number": "发件人名称/手机号码",
+    "Leave blank to use a shared sender number.": "留空以使用平台共享的发件人手机号码",
+    "Octopush API Version": "Octopush API 版本",
+    "Legacy Octopush-DM": "旧版本 Octopush-DM",
+    "endpoint": "接入点",
+    octopushAPIKey: "控制台 HTTP API credentials 里的 \"API key\"",
+    octopushLogin: "控制台 HTTP API credentials 里的 \"Login\"",
+    promosmsLogin: "API 登录名",
+    promosmsPassword: "API 密码",
+    "pushoversounds pushover": "Pushover（默认）",
+    "pushoversounds bike": "Bike",
+    "pushoversounds bugle": "Bugle",
+    "pushoversounds cashregister": "Cash Register",
+    "pushoversounds classical": "Classical",
+    "pushoversounds cosmic": "Cosmic",
+    "pushoversounds falling": "Falling",
+    "pushoversounds gamelan": "Gamelan",
+    "pushoversounds incoming": "Incoming",
+    "pushoversounds intermission": "Intermission",
+    "pushoversounds magic": "Magic",
+    "pushoversounds mechanical": "Mechanical",
+    "pushoversounds pianobar": "Piano Bar",
+    "pushoversounds siren": "Siren",
+    "pushoversounds spacealarm": "Space Alarm",
+    "pushoversounds tugboat": "Tug Boat",
+    "pushoversounds alien": "Alien Alarm（长铃声）",
+    "pushoversounds climb": "Climb（长铃声）",
+    "pushoversounds persistent": "Persistent（长铃声）",
+    "pushoversounds echo": "Pushover Echo（长铃声）",
+    "pushoversounds updown": "Up Down（长铃声）",
+    "pushoversounds vibrate": "仅震动",
+    "pushoversounds none": "无（禁音）",
+    pushyAPIKey: "API 密钥",
+    pushyToken: "设备 Token",
+    "Show update if available": "有更新时通知",
+    "Also check beta release": "一并检查 Beta 版更新",
+    "Using a Reverse Proxy?": "正在使用反向代理？",
+    "Check how to config it for WebSocket": "查看如何将反向代理与 WebSocket 一起使用",
+    "Steam Game Server": "Steam 游戏服务器",
+    "Most likely causes:": "最可能的原因：",
+    "The resource is no longer available.": "您所请求的资源已不再可用；",
+    "There might be a typing error in the address.": "您输入的地址可能有误。",
+    "What you can try:": "您可以尝试以下操作：",
+    "Retype the address.": "重新输入地址；",
+    "Go back to the previous page.": "返回到上一页面。",
+    "Coming Soon": "即将推出",
 };
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 7f9598bfb..38addb376 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -4,7 +4,7 @@
             <div class="container-fluid">
                 {{ $root.connectionErrorMsg }}
                 <div v-if="$root.showReverseProxyGuide">
-                    Using a Reverse Proxy? <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy" target="_blank">Check how to config it for WebSocket</a>
+                    {{ $t("Using a Reverse Proxy?") }} <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy" target="_blank">{{ $t("Check how to config it for WebSocket") }}</a>
                 </div>
             </div>
         </div>
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 39c114ad6..0a7534105 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -30,7 +30,7 @@
                                         Push
                                     </option>
                                     <option value="steam">
-                                        Steam Game Server
+                                        {{ $t("Steam Game Server") }}
                                     </option>
                                     <option value="mqtt">
                                         MQTT
diff --git a/src/pages/NotFound.vue b/src/pages/NotFound.vue
index 16ba8a558..410c16a81 100644
--- a/src/pages/NotFound.vue
+++ b/src/pages/NotFound.vue
@@ -22,16 +22,16 @@
             </div>
 
             <div class="guide">
-                Most likely causes:
+                {{ $t("Most likely causes:") }}
                 <ul>
-                    <li>The resource is no longer available.</li>
-                    <li>There might be a typing error in the address.</li>
+                    <li>{{ $t("The resource is no longer available.") }}</li>
+                    <li>{{ $t("There might be a typing error in the address.") }}</li>
                 </ul>
 
-                What you can try:<br />
+                {{ $t("What you can try:") }}<br />
                 <ul>
-                    <li>Retype the address.</li>
-                    <li><a href="#" class="go-back" @click="goBack()">Go back to the previous page.</a></li>
+                    <li>{{ $t("Retype the address.") }}</li>
+                    <li><a href="#" class="go-back" @click="goBack()">{{ $t("Go back to the previous page.") }}</a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 8cda7ebba..546aa942d 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -45,7 +45,7 @@
                 </div>
 
                 <div v-if="false" class="my-3">
-                    <label for="password" class="form-label">{{ $t("Password") }} <sup>Coming Soon</sup></label>
+                    <label for="password" class="form-label">{{ $t("Password") }} <sup>{{ $t("Coming Soon") }}</sup></label>
                     <input id="password" v-model="config.password" disabled type="password" autocomplete="new-password" class="form-control">
                 </div>
 

From 7dd5f5ea0dad64b7b65628a8f44b4fe2bbad9845 Mon Sep 17 00:00:00 2001
From: AnnAngela-work <naganjue@vip.qq.com>
Date: Fri, 29 Apr 2022 20:26:56 +0800
Subject: [PATCH 2/6] Improve translation

---
 src/components/notifications/ClickSendSMS.vue | 7 +++----
 src/languages/en.js                           | 1 +
 src/languages/zh-CN.js                        | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/notifications/ClickSendSMS.vue b/src/components/notifications/ClickSendSMS.vue
index 09d3201ca..dbd4d0aa5 100644
--- a/src/components/notifications/ClickSendSMS.vue
+++ b/src/components/notifications/ClickSendSMS.vue
@@ -1,10 +1,9 @@
 <template>
     <div class="mb-3">
         <label for="clicksendsms-login" class="form-label">{{ $t("API Username") }}</label>
-        <div class="form-text">
-            {{ $t("apiCredentials") }}
+        <i18n-t tag="div" class="form-text" keypath="wayToGetClickSendSMSToken">
             <a href="http://dashboard.clicksend.com/account/subaccounts" target="_blank">{{ $t("here") }}</a>
-        </div>
+        </i18n-t>
         <input id="clicksendsms-login" v-model="$parent.notification.clicksendsmsLogin" type="text" class="form-control" required>
         <label for="clicksendsms-key" class="form-label">{{ $t("API Key") }}</label>
         <HiddenInput id="clicksendsms-key" v-model="$parent.notification.clicksendsmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
@@ -21,7 +20,7 @@
     </div>
     <div class="mb-3">
         <label for="clicksendsms-sender-name" class="form-label">{{ $t("From Name/Number") }} -
-            <i18n-t tag="span" keypath="Read more:"><a href="https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number" target="_blank">https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number</a></i18n-t>
+            <a href="https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number" target="_blank">{{ $t("Read more") }}</a>
         </label>
         <input id="clicksendsms-sender-name" v-model="$parent.notification.clicksendsmsSenderName" type="text" minlength="3" maxlength="11" class="form-control">
         <div class="form-text">{{ $t("Leave blank to use a shared sender number.") }}</div>
diff --git a/src/languages/en.js b/src/languages/en.js
index ad97cbefc..af6ec32b3 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -514,4 +514,5 @@ export default {
     "Retype the address.": "Retype the address.",
     "Go back to the previous page.": "Go back to the previous page.",
     "Coming Soon": "Coming Soon",
+    wayToGetClickSendSMSToken: "You can get API Username and API Key from {0} .",
 };
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index 9e5fcba13..691ec1205 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -441,7 +441,7 @@ export default {
     "No Proxy": "无代理",
     "HTTP Basic Auth": "HTTP 基础身份验证",
     "New Status Page": "新的状态页",
-    "Page Not Found": "状态页未找到",
+    "Page Not Found": "未找到该页面",
     "Reverse Proxy": "反向代理",
     "Subject:": "颁发给：",
     "Valid To:": "有效期至：",
@@ -519,4 +519,5 @@ export default {
     "Retype the address.": "重新输入地址；",
     "Go back to the previous page.": "返回到上一页面。",
     "Coming Soon": "即将推出",
+    wayToGetClickSendSMSToken: "您可以从 {0} 获取 API 凭证 Username 和 凭证 Key。",
 };

From e82fc1df61f800098315f5937e667ae810e523b9 Mon Sep 17 00:00:00 2001
From: AnnAngela-work <naganjue@vip.qq.com>
Date: Fri, 29 Apr 2022 20:31:36 +0800
Subject: [PATCH 3/6] Match up en lang file

---
 src/languages/zh-CN.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index 691ec1205..52050a46f 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -88,7 +88,7 @@ export default {
     Dark: "黑暗",
     Auto: "自动",
     "Theme - Heartbeat Bar": "主题 - 心跳栏",
-    Normal: "正常", // 此处还供 Gorush 的通知优先级功能使用，不应翻译为“正常显示”
+    Normal: "正常",
     Bottom: "靠下",
     None: "不显示",
     Timezone: "时区",
@@ -398,11 +398,9 @@ export default {
     Invalid: "无效",
     AccessKeyId: "AccessKey ID",
     SecretAccessKey: "AccessKey Secret",
-    /* 以下为阿里云短信服务 API Dysms#SendSms 的参数 */
     PhoneNumbers: "PhoneNumbers",
     TemplateCode: "TemplateCode",
     SignName: "SignName",
-    /* 以上为阿里云短信服务 API Dysms#SendSms 的参数 */
     "Bark Endpoint": "Bark 接入点",
     "Device Token": "Apple Device Token",
     Platform: "平台",
@@ -477,7 +475,7 @@ export default {
     "Leave blank to use a shared sender number.": "留空以使用平台共享的发件人手机号码",
     "Octopush API Version": "Octopush API 版本",
     "Legacy Octopush-DM": "旧版本 Octopush-DM",
-    "endpoint": "接入点",
+    endpoint: "接入点",
     octopushAPIKey: "控制台 HTTP API credentials 里的 \"API key\"",
     octopushLogin: "控制台 HTTP API credentials 里的 \"Login\"",
     promosmsLogin: "API 登录名",
@@ -520,4 +518,6 @@ export default {
     "Go back to the previous page.": "返回到上一页面。",
     "Coming Soon": "即将推出",
     wayToGetClickSendSMSToken: "您可以从 {0} 获取 API 凭证 Username 和 凭证 Key。",
+    signedInDisp: "当前用户： {0}",
+    signedInDispDisabled: "已禁用身份验证",
 };

From 65ea2e6aeb1ecb1bb626be36f176e48a78e9408d Mon Sep 17 00:00:00 2001
From: AnnAngela <naganjue@vip.qq.com>
Date: Fri, 29 Apr 2022 21:42:48 +0800
Subject: [PATCH 4/6] Update src/components/notifications/PromoSMS.vue

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/components/notifications/PromoSMS.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/PromoSMS.vue b/src/components/notifications/PromoSMS.vue
index c11ed559e..29192aabe 100644
--- a/src/components/notifications/PromoSMS.vue
+++ b/src/components/notifications/PromoSMS.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="promosms-login" class="form-label">{{$("promosmsLogin")}}</label>
+        <label for="promosms-login" class="form-label">{{ $("promosmsLogin") }}</label>
         <input id="promosms-login" v-model="$parent.notification.promosmsLogin" type="text" class="form-control" required>
         <label for="promosms-key" class="form-label">{{$("promosmsPassword")}}</label>
         <HiddenInput id="promosms-key" v-model="$parent.notification.promosmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>

From 5a069b278deafc766e37b1ef989920e993bf1c58 Mon Sep 17 00:00:00 2001
From: AnnAngela <naganjue@vip.qq.com>
Date: Fri, 29 Apr 2022 21:42:54 +0800
Subject: [PATCH 5/6] Update src/components/notifications/PromoSMS.vue

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/components/notifications/PromoSMS.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/PromoSMS.vue b/src/components/notifications/PromoSMS.vue
index 29192aabe..91b4d96df 100644
--- a/src/components/notifications/PromoSMS.vue
+++ b/src/components/notifications/PromoSMS.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <label for="promosms-login" class="form-label">{{ $("promosmsLogin") }}</label>
         <input id="promosms-login" v-model="$parent.notification.promosmsLogin" type="text" class="form-control" required>
-        <label for="promosms-key" class="form-label">{{$("promosmsPassword")}}</label>
+        <label for="promosms-key" class="form-label">{{ $("promosmsPassword") }}</label>
         <HiddenInput id="promosms-key" v-model="$parent.notification.promosmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
     <div class="mb-3">

From 4178b003a2fbd2cfea07cc990e610ba006c747ca Mon Sep 17 00:00:00 2001
From: AnnAngela <naganjue@vip.qq.com>
Date: Sat, 14 May 2022 15:27:55 +0800
Subject: [PATCH 6/6] fix `value`

---
 src/components/notifications/Pushover.vue | 46 +++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/components/notifications/Pushover.vue b/src/components/notifications/Pushover.vue
index 83261deb7..4bf6edb3b 100644
--- a/src/components/notifications/Pushover.vue
+++ b/src/components/notifications/Pushover.vue
@@ -18,29 +18,29 @@
         </select>
         <label for="pushover-sound" class="form-label">{{ $t("Notification Sound") }}</label>
         <select id="pushover-sound" v-model="$parent.notification.pushoversounds" class="form-select">
-            <option>{{ $t("pushoversounds pushover") }}</option>
-            <option>{{ $t("pushoversounds bike") }}</option>
-            <option>{{ $t("pushoversounds bugle") }}</option>
-            <option>{{ $t("pushoversounds cashregister") }}</option>
-            <option>{{ $t("pushoversounds classical") }}</option>
-            <option>{{ $t("pushoversounds cosmic") }}</option>
-            <option>{{ $t("pushoversounds falling") }}</option>
-            <option>{{ $t("pushoversounds gamelan") }}</option>
-            <option>{{ $t("pushoversounds incoming") }}</option>
-            <option>{{ $t("pushoversounds intermission") }}</option>
-            <option>{{ $t("pushoversounds magic") }}</option>
-            <option>{{ $t("pushoversounds mechanical") }}</option>
-            <option>{{ $t("pushoversounds pianobar") }}</option>
-            <option>{{ $t("pushoversounds siren") }}</option>
-            <option>{{ $t("pushoversounds spacealarm") }}</option>
-            <option>{{ $t("pushoversounds tugboat") }}</option>
-            <option>{{ $t("pushoversounds alien") }}</option>
-            <option>{{ $t("pushoversounds climb") }}</option>
-            <option>{{ $t("pushoversounds persistent") }}</option>
-            <option>{{ $t("pushoversounds echo") }}</option>
-            <option>{{ $t("pushoversounds updown") }}</option>
-            <option>{{ $t("pushoversounds vibrate") }}</option>
-            <option>{{ $t("pushoversounds none") }}</option>
+            <option value="pushover">{{ $t("pushoversounds pushover") }}</option>
+            <option value="bike">{{ $t("pushoversounds bike") }}</option>
+            <option value="bugle">{{ $t("pushoversounds bugle") }}</option>
+            <option value="cashregister">{{ $t("pushoversounds cashregister") }}</option>
+            <option value="classical">{{ $t("pushoversounds classical") }}</option>
+            <option value="cosmic">{{ $t("pushoversounds cosmic") }}</option>
+            <option value="falling">{{ $t("pushoversounds falling") }}</option>
+            <option value="gamelan">{{ $t("pushoversounds gamelan") }}</option>
+            <option value="incoming">{{ $t("pushoversounds incoming") }}</option>
+            <option value="intermission">{{ $t("pushoversounds intermission") }}</option>
+            <option value="magic">{{ $t("pushoversounds magic") }}</option>
+            <option value="mechanical">{{ $t("pushoversounds mechanical") }}</option>
+            <option value="pianobar">{{ $t("pushoversounds pianobar") }}</option>
+            <option value="siren">{{ $t("pushoversounds siren") }}</option>
+            <option value="spacealarm">{{ $t("pushoversounds spacealarm") }}</option>
+            <option value="tugboat">{{ $t("pushoversounds tugboat") }}</option>
+            <option value="alien">{{ $t("pushoversounds alien") }}</option>
+            <option value="climb">{{ $t("pushoversounds climb") }}</option>
+            <option value="persistent">{{ $t("pushoversounds persistent") }}</option>
+            <option value="echo">{{ $t("pushoversounds echo") }}</option>
+            <option value="updown">{{ $t("pushoversounds updown") }}</option>
+            <option value="vibrate">{{ $t("pushoversounds vibrate") }}</option>
+            <option value="none">{{ $t("pushoversounds none") }}</option>
         </select>
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}