Merge branch 'louislam:master' into add-xml-support-to-http-monitors

SECURITY.md

@@ -2,9 +2,9 @@
 
 ## Reporting a Vulnerability
 
-Please report security issues to uptime@kuma.pet.
+Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
 
-Do not use the issue tracker or discuss it in the public as it will cause more damage.
+Do not use the public issue tracker or discuss it in the public as it will cause more damage.
 
 ## Supported Versions
 

src/components/Uptime.vue

@@ -1,5 +1,5 @@
 <template>
-    <span :class="className" :title="24 + $t('-hour')">{{ uptime }}</span>
+    <span :class="className" :title="title">{{ uptime }}</span>
 </template>
 
 <script>
@@ -75,6 +75,14 @@ export default {
 
             return "";
         },
+
+        title() {
+            if (this.type === "720") {
+                return `30${this.$t("-day")}`;
+            }
+
+            return `24${this.$t("-hour")}`;
+        }
     },
 };
 </script>

src/languages/zh-TW.js

@@ -8,6 +8,8 @@ export default {
     ignoreTLSError: "忽略 HTTPS 網站的 TLS/SSL 錯誤",
     upsideDownModeDescription: "反轉顯示狀態。若服務可以連線，將顯示離線。",
     maxRedirectDescription: "最大重新導向跟隨次數。設為 0 將停用重新導向。",
+    enableGRPCTls: "允許以 TLS 連線傳送 gRPC 要求",
+    grpcMethodDescription: "方法名稱將轉換至駝峰式命名，如 sayHello、check 等。",
     acceptedStatusCodesDescription: "選擇視為成功回應的狀態碼。",
     Maintenance: "維護",
     statusMaintenance: "維護",
@@ -219,13 +221,15 @@ export default {
     "Content Type": "內容類型",
     webhookJsonDesc: "{0} 適合任何現代的 HTTP 伺服器，如 Express.js",
     webhookFormDataDesc: "{multipart} 適合 PHP。 JSON 必須先經由 {decodeFunction} 剖析。",
+    webhookAdditionalHeadersTitle: "額外標頭",
+    webhookAdditionalHeadersDesc: "設定與 webhook 一同傳送的額外標頭。",
     smtp: "Email (SMTP)",
     secureOptionNone: "無 / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "忽略 TLS 錯誤",
     "From Email": "寄件人",
     emailCustomSubject: "自訂主旨",
-    "To Email": "收件人",
+    "To Email": "收件者",
     smtpCC: "CC",
     smtpBCC: "BCC",
     discord: "Discord",
@@ -239,10 +243,10 @@ export default {
     wayToGetTeamsURL: "您可以前往此頁面以了解如何建立 Webhook 網址 {0}。",
     signal: "Signal",
     Number: "號碼",
-    Recipients: "收件人",
+    Recipients: "收件者",
     needSignalAPI: "您需要有 REST API 的 Signal 客戶端。",
     wayToCheckSignalURL: "您可以前往下列網址以了解如何設定：",
-    signalImportant: "注意: 不得混合收件人的群組和號碼！",
+    signalImportant: "注意: 不得混合收件者的群組和號碼！",
     gotify: "Gotify",
     "Application Token": "應用程式權杖",
     "Server URL": "伺服器網址",
@@ -304,11 +308,11 @@ export default {
     aboutIconURL: "您可以在 \"圖示網址\" 中提供圖片網址以覆蓋預設個人檔案圖片。若已設定 Emoji 圖示，將忽略此設定。",
     aboutMattermostChannelName: "您可以在 \"頻道名稱\" 欄位中填寫頻道名稱以覆蓋 Webhook 的預設頻道。必須在 Mattermost 的 Webhook 設定中啟用。例如：#其他頻道",
     matrix: "Matrix",
-    promosmsTypeEco: "SMS ECO - 便宜，但是很慢且經常過載。僅限位於波蘭的收件人。",
-    promosmsTypeFlash: "SMS FLASH - 訊息會自動在收件人的裝置上顯示。僅限位於波蘭的收件人。",
+    promosmsTypeEco: "SMS ECO - 便宜，但是很慢且經常過載。僅限位於波蘭的收件者。",
+    promosmsTypeFlash: "SMS FLASH - 訊息會自動在收件者的裝置上顯示。僅限位於波蘭的收件者。",
     promosmsTypeFull: "SMS FULL - 高級版，您可以使用您的寄件人名稱 (必須先註冊名稱。對於警報來說十分可靠。",
     promosmsTypeSpeed: "SMS SPEED - 系統中的最高優先度。快速、可靠，但昂貴 (約 SMS FULL 的兩倍價格)。",
-    promosmsPhoneNumber: "電話號碼 (若收件人位於波蘭則無需輸入區域代碼)",
+    promosmsPhoneNumber: "電話號碼 (若收件者位於波蘭則無需輸入區域代碼)",
     promosmsSMSSender: "簡訊寄件人名稱：預先註冊的名稱或以下的預設名稱：InfoSMS、SMS Info、MaxSMS、INFO、SMS",
     "Feishu WebHookUrl": "飛書 WebHook 網址",
     matrixHomeserverURL: "Homeserver 網址 (開頭為 http(s)://，結尾可能帶連接埠)",
@@ -320,7 +324,7 @@ export default {
     Headers: "標頭",
     PushUrl: "Push 網址",
     HeadersInvalidFormat: "要求標頭不是有效的 JSON：",
-    BodyInvalidFormat: "請求主體不是有效的 JSON：",
+    BodyInvalidFormat: "要求主體不是有效的 JSON：",
     "Monitor History": "監測器歷史紀錄",
     clearDataOlderThan: "保留 {0} 天內的監測器歷史紀錄。",
     PasswordsDoNotMatch: "密碼不相符。",
@@ -378,6 +382,16 @@ export default {
     serwersmsAPIPassword: "API 密碼",
     serwersmsPhoneNumber: "電話號碼",
     serwersmsSenderName: "SMS 寄件人名稱 (由客戶入口網站註冊)",
+    smseagle: "SMSEagle",
+    smseagleTo: "電話號碼",
+    smseagleGroup: "電話簿群組名稱",
+    smseagleContact: "電話簿聯絡人名稱",
+    smseagleRecipientType: "收件者類型",
+    smseagleRecipient: "收件者 (用逗號分隔)",
+    smseagleToken: "API 存取權杖",
+    smseagleUrl: "您的 SMSEagle 裝置網址",
+    smseagleEncoding: "以 Unicode 傳送",
+    smseaglePriority: "訊息優先度 (0-9，預設 = 0)",
     stackfield: "Stackfield",
     Customize: "自訂",
     "Custom Footer": "自訂頁尾",
@@ -631,4 +645,28 @@ export default {
     "Display Timezone": "顯示時區",
     "Server Timezone": "伺服器時區",
     statusPageMaintenanceEndDate: "結束",
+    IconUrl: "圖示網址",
+    "Enable DNS Cache": "啟用 DNS 快取",
+    Enable: "啟用",
+    Disable: "停用",
+    dnsCacheDescription: "在某些 IPv6 環境可能會無法運作，如果您遇到任何問題，請停用。",
+    "Single Maintenance Window": "單一維護時段",
+    "Maintenance Time Window of a Day": "每日的維護時段",
+    "Effective Date Range": "有效的日期範圍",
+    "Schedule Maintenance": "排程維護",
+    "Date and Time": "時間和日期",
+    "DateTime Range": "DateTime 範圍",
+    Strategy: "策略",
+    "Free Mobile User Identifier": "Free Mobile User Identifier",
+    "Free Mobile API Key": "Free Mobile API 金鑰",
+    "Enable TLS": "啟用 TLS",
+    "Proto Service Name": "Proto 服務名稱",
+    "Proto Method": "Proto 方式",
+    "Proto Content": "Proto 內容",
+    Economy: "節約",
+    Lowcost: "低費率",
+    high: "高",
+    "General Monitor Type": "一般監測器類型",
+    "Passive Monitor Type": "被動監測器類型",
+    "Specific Monitor Type": "指定監測器類型",
 };