From c4a2ce4e78cf90fc371a62c394f9523b5d62c102 Mon Sep 17 00:00:00 2001
From: Rolf Bachmann <1196109+rolfbachmann@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:57:52 +0200
Subject: [PATCH 01/11] Add authentication support for ntfy

---
 server/notification-providers/ntfy.js | 11 +++++++++--
 src/components/notifications/Ntfy.vue | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 21f358f64..17d6d812a 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -8,12 +8,19 @@ class Ntfy extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         try {
-            await axios.post(`${notification.ntfyserverurl}`, {
+            let headers = {};
+            if (notification.ntfyusername.length > 0) {
+                headers = {
+                    "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
+                };
+            }
+            let data = {
                 "topic": notification.ntfytopic,
                 "message": msg,
                 "priority": notification.ntfyPriority || 4,
                 "title": "Uptime-Kuma",
-            });
+            };
+            await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
 
             return okMsg;
 
diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index d9a83b499..a42dca302 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -11,7 +11,18 @@
             <input id="ntfy-server-url" v-model="$parent.notification.ntfyserverurl" type="text" class="form-control" required>
         </div>
     </div>
-
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <div class="input-group mb-3">
+            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
+        </div>
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <div class="input-group mb-3">
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+        </div>
+    </div>
     <div class="mb-3">
         <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
@@ -19,7 +30,12 @@
 </template>
 
 <script>
+import HiddenInput from "../HiddenInput.vue";
+
 export default {
+    components: {
+        HiddenInput,
+    },
     mounted() {
         if (typeof this.$parent.notification.ntfyPriority === "undefined") {
             this.$parent.notification.ntfyserverurl = "https://ntfy.sh";

From 929d23810616520a20e5ad875a3e2e9a511af8bf Mon Sep 17 00:00:00 2001
From: FarisDaffa <65797160+Faris0520@users.noreply.github.com>
Date: Sat, 1 Oct 2022 12:17:17 +0700
Subject: [PATCH 02/11] Update id-ID.js

---
 src/languages/id-ID.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/languages/id-ID.js b/src/languages/id-ID.js
index 36ee0341c..3d3c3389b 100644
--- a/src/languages/id-ID.js
+++ b/src/languages/id-ID.js
@@ -130,7 +130,7 @@ export default {
     "Repeat Password": "Ulangi Sandi",
     "Import Backup": "Impor Cadangan",
     "Export Backup": "Expor Cadangan",
-    Export: "Expor",
+    Export: "Ekspor",
     Import: "Impor",
     respTime: "Tanggapan. Waktu (milidetik)",
     notAvailableShort: "N/A",
@@ -192,7 +192,7 @@ export default {
     "Status Pages": "Halaman Status",
     defaultNotificationName: "{notification} saya Peringatan ({number})",
     here: "di sini",
-    Required: "Dibutuhkan",
+    Required: "Wajib",
     telegram: "Telegram",
     "Bot Token": "Bot Token",
     wayToGetTelegramToken: "Anda dapat mendapatkan token dari {0}.",
@@ -210,9 +210,9 @@ export default {
     secureOptionNone: "None / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "Abaikan Kesalahan TLS",
-    "From Email": "Dari Surel",
+    "From Email": "Dari Email",
     emailCustomSubject: "Subjek",
-    "To Email": "Ke Surel",
+    "To Email": "Ke Email",
     smtpCC: "CC",
     smtpBCC: "BCC",
     discord: "Discord",
@@ -232,7 +232,7 @@ export default {
     signalImportant: "PENTING: Anda tidak dapat mencampur grup dan nomor di penerima!",
     gotify: "Gotify",
     "Application Token": "Token Aplikasi",
-    "Server URL": "URL Peladen",
+    "Server URL": "URL Server",
     Priority: "Prioritas",
     slack: "Slack",
     "Icon Emoji": "Ikon Emoji",
@@ -274,9 +274,9 @@ export default {
     "LunaSea Device ID": "LunaSea Device ID",
     "Apprise URL": "Apprise URL",
     "Example:": "Contoh: {0}",
-    "Read more:": "Baca lebih lajut: {0}",
+    "Read more:": "Baca lebih lanjut: {0}",
     "Status:": "Status: {0}",
-    "Read more": "Baca lebih lajut",
+    "Read more": "Baca lebih lanjut",
     appriseInstalled: "Apprise diinstall.",
     appriseNotInstalled: "Apprise tidak diinstall. {0}",
     "Access Token": "Token Akses",
@@ -310,7 +310,7 @@ export default {
     BodyInvalidFormat: "Request Body memiliki format JSON yang tidak sesuai: ",
     "Monitor History": "Riyawat Monitor",
     clearDataOlderThan: "Simpan data riwayat monitoring selama {0} hari.",
-    PasswordsDoNotMatch: "Passwords tidak sama.",
+    PasswordsDoNotMatch: "Password tidak sama.",
     records: "catatan",
     "One record": "Satu catatan",
     steamApiKeyDescription: "Untuk monitoring Steam Game Server Anda membutuhkan kunci Steam Web-API. Anda dapat mendaftarkan Kunci API Anda melalui: ",
@@ -322,7 +322,7 @@ export default {
     recent: "Baru saja",
     Done: "Selesai",
     Info: "Info",
-    Security: "Keamaan",
+    Security: "Keamanan",
     "Steam API Key": "Steam API Key",
     "Shrink Database": "Shrink Database",
     "Pick a RR-Type...": "Pilih RR-Type...",
@@ -393,7 +393,7 @@ export default {
     alertaAlertState: "Status Siaga",
     alertaRecoverState: "Status Pemulihan",
     deleteStatusPageMsg: "Apakah Anda yakin untuk menghapus halaman status berikut?",
-    Proxies: "Proxies",
+    Proxies: "Proxy",
     default: "Bawaan",
     enabled: "Diaktifkan",
     setAsDefault: "Tetapkan sebagai bawaan",
@@ -403,7 +403,7 @@ export default {
     setAsDefaultProxyDescription: "Proxy berikut akan diaktifkan sebagai bawaan untuk monitor baru. Anda masih dapat menonaktifkan proxy secara terpisah untuk setiap monitor.",
     "Certificate Chain": "Certificate Chain",
     Valid: "Sahih",
-    Invalid: "Tidak Sahih",
+    Invalid: "Tidak Valid",
     AccessKeyId: "AccessKey ID",
     SecretAccessKey: "AccessKey Secret",
     PhoneNumbers: "Nomor Telepon",
@@ -433,7 +433,7 @@ export default {
     Installed: "Terpasang",
     "Not installed": "Tidak terpasang",
     Running: "Berlari",
-    "Not running": "Tidak berlari",
+    "Not running": "Tidak berjalan",
     "Remove Token": "Hapus Token",
     Start: "Mulai",
     Stop: "Berhenti",
@@ -444,7 +444,7 @@ export default {
     startOrEndWithOnly: "Mulai atau akhiri hanya dengan {0}",
     "No consecutive dashes": "Tanda hubung tidak berurutan",
     Next: "Selanjutnya",
-    "The slug is already taken. Please choose another slug.": "Slug is telah digunakan. Silakan pilih slug lain.",
+    "The slug is already taken. Please choose another slug.": "Slug telah digunakan. Silakan pilih slug lain.",
     "No Proxy": "TIdak ada Proxy",
     Authentication: "Autentikasi",
     "HTTP Basic Auth": "HTTP Basic Auth",

From 2e54dee817f02953393be0167ce71128dbfe8fac Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:03:28 +0100
Subject: [PATCH 03/11] Fixed Octopush Notifier not working #2144

The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 0eda940ba..524a4a880 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -10,7 +10,7 @@ class Octopush extends NotificationProvider {
 
         try {
         // Default - V2
-            if (notification.octopushVersion === 2 || !notification.octopushVersion) {
+            if (notification.octopushVersion === "2" || !notification.octopushVersion) {
                 let config = {
                     headers: {
                         "api-key": notification.octopushAPIKey,
@@ -31,7 +31,7 @@ class Octopush extends NotificationProvider {
                     "sender": notification.octopushSenderName
                 };
                 await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
-            } else if (notification.octopushVersion === 1) {
+            } else if (notification.octopushVersion === "1") {
                 let data = {
                     "user_login": notification.octopushDMLogin,
                     "api_key": notification.octopushDMAPIKey,

From 63e408f4f2c3886874fb8a6cbd9e10a5ee6bd33a Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 15:42:34 +0100
Subject: [PATCH 04/11] Fixed octopush legacy doesn't return error code

The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 524a4a880..35d88f5f3 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -49,7 +49,13 @@ class Octopush extends NotificationProvider {
                     },
                     params: data
                 };
-                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+
+                // V1 API returns 200 even on error so we must check
+                // response data
+                let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+                if ("error_code" in response.data) {
+                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                }
             } else {
                 throw new Error("Unknown Octopush version!");
             }

From 97de3959cd3c71d17bcfa32a2a3ec131c3255e9b Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sat, 1 Oct 2022 19:48:00 +0100
Subject: [PATCH 05/11] Updated octopush error handling to accept 000

The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/octopush.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 35d88f5f3..d5c475d3d 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -54,7 +54,9 @@ class Octopush extends NotificationProvider {
                 // response data
                 let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
                 if ("error_code" in response.data) {
-                    this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    if (response.data.error_code !== "000") {
+                        this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
+                    }
                 }
             } else {
                 throw new Error("Unknown Octopush version!");

From 6a3eccf6a6631e249658c749f6a1bd3466347f92 Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sun, 2 Oct 2022 02:26:38 +0100
Subject: [PATCH 06/11] Fixed alert features unnecessary URL field #2009

The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/notification-providers/teams.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index c398e03c2..bcfc82c24 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -63,7 +63,7 @@ class Teams extends NotificationProvider {
             });
         }
 
-        if (monitorUrl) {
+        if (monitorUrl && monitorUrl !== "https://") {
             facts.push({
                 name: "URL",
                 value: monitorUrl,
@@ -127,13 +127,17 @@ class Teams extends NotificationProvider {
 
             let url;
 
-            if (monitorJSON["type"] === "port") {
-                url = monitorJSON["hostname"];
-                if (monitorJSON["port"]) {
-                    url += ":" + monitorJSON["port"];
-                }
-            } else {
-                url = monitorJSON["url"];
+            switch (monitorJSON["type"]) {
+                case "http":
+                case "keywork":
+                    url = monitorJSON["url"];
+                    break;
+                case "docker":
+                    url = monitorJSON["docker_host"];
+                    break;
+                default:
+                    url = monitorJSON["hostname"];
+                    break;
             }
 
             const payload = this._notificationPayloadFactory({

From ed7bc0e6d194f603eb6ca658b47560c10eeb1c2a Mon Sep 17 00:00:00 2001
From: MrEddX <66828538+MrEddX@users.noreply.github.com>
Date: Sun, 2 Oct 2022 09:55:58 +0300
Subject: [PATCH 07/11] Update bg-BG.js

Added New Fields
---
 src/languages/bg-BG.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index a234e56f6..2002bc46a 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -562,4 +562,24 @@ export default {
     "Docker Host": "Docker хост",
     "Docker Hosts": "Docker хостове",
     trustProxyDescription: "Trust 'X-Forwarded-*' headers.  Ако искате да получавате правилния IP адрес на клиента, а Uptime Kuma е зад системи като Nginx или Apache, трябва да разрешите тази опция.",
+    Examples: "Примери",
+    "Home Assistant URL": "Home Assistant URL адрес",
+    "Long-Lived Access Token": "Long-Lived Access Token",
+    "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token можете да създадете, като кликнете върху името на профила си (долу ляво) и превъртите до най-долу, след това кликнете върху Създаване на токен. ",
+    "Notification Service": "Услуга за известяване",
+    "default: notify all devices": "по подразбиране: извести всички устройства",
+    "A list of Notification Services can be found in Home Assistant under \"Developer Tools > Services\" search for \"notification\" to find your device/phone name.": "Списък с услугите за известяване може да бъде намерен в Home Assistant под \"Developer Tools > Services\", там потърсете \"notification\", за да намерите името на вашето устройство/телефон.",
+    "Automations can optionally be triggered in Home Assistant:": "Автоматизациите могат да се задействат при нужда в Home Assistant:",
+    "Trigger type:": "Задействане тип:",
+    "Event type:": "Събитие тип:",
+    "Event data:": "Събитие данни:",
+    "Then choose an action, for example switch the scene to where an RGB light is red.": "След което изберете действие, например да превключите сцената, където RGB светлината е червена.",
+    "Frontend Version": "Фронтенд версия",
+    "Frontend Version do not match backend version!": "Фронтенд версията не съвпада с Бекенд версията!",
+    "Base URL": "Базов  URL адрес",
+    goAlertInfo: "GoAlert е приложение с отворен код за планиране на повиквания, автоматизирани ескалации и известия (като SMS или гласови повиквания). Автоматично ангажирайте точния човек, по точния начин и в точното време! {0}",
+    goAlertIntegrationKeyInfo: "Вземете общ API интеграционен ключ за услугата във формат \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" обикновено стойността на параметъра token на копирания URL адрес.",
+    goAlert: "GoAlert",
+    backupOutdatedWarning: "Отпаднало: Тъй като са добавени много функции, тази опция за архивиране не е достатъчно поддържана и не може да генерира или възстанови пълен архив.",
+    backupRecommend: "Моля, архивирайте дяла или папката (./data/) директно вместо това.",
 };

From da34685019b6902b3464423a72f3b867a614a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:38:33 +0200
Subject: [PATCH 08/11] fix typos

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9829c96f..12fd6ed41 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 
 ## Can I create a pull request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
+Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can discuss first**. Especially for a large pull request or you don't know it will be merged or not.
 
 Here are some references:
 
@@ -48,7 +48,7 @@ Here are some references:
 - UI/UX is not close to Uptime Kuma 
 - Existing logic is completely modified or deleted for no reason
 - A function that is completely out of scope
-- Unnesscary large code changes (Hard to review, casuse code conflicts to other pull requests)
+- Unnecessary large code changes (Hard to review, causes code conflicts to other pull requests)
 
 I will mark your pull request in the [milestones](https://github.com/louislam/uptime-kuma/milestones), if I am plan to review and merge it.
 
@@ -183,7 +183,7 @@ By default, the Chromium window will be shown up during the test. Specifying `HE
 
 ## Dependencies
 
-Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not be used in production environment, because it is usually also baked into dist files. So:
+Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into dist files. So:
 
 - Frontend dependencies = "devDependencies"
   - Examples: vue, chart.js

From 8595824b5dd7ce4eb94d9e554be77e5f9fc982ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=20=7C=20Anton=20R=C3=B6hm?=
 <18481195+AnTheMaker@users.noreply.github.com>
Date: Sun, 2 Oct 2022 13:49:40 +0200
Subject: [PATCH 09/11] Improve German translation

---
 src/languages/de-DE.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index bd5bf87d9..a6ae40771 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -68,7 +68,7 @@ export default {
     Timezone: "Zeitzone",
     "Search Engine Visibility": "Sichtbarkeit für Suchmaschinen",
     "Allow indexing": "Indizierung zulassen",
-    "Discourage search engines from indexing site": "Halte Suchmaschinen von der Indexierung der Seite ab",
+    "Discourage search engines from indexing site": "Suchmaschinen darum bitten, die Seite nicht zu indizieren",
     "Change Password": "Passwort ändern",
     "Current Password": "Aktuelles Passwort",
     "New Password": "Neues Passwort",
@@ -78,7 +78,7 @@ export default {
     "Disable Auth": "Authentifizierung deaktivieren",
     "Enable Auth": "Authentifizierung aktivieren",
     "disableauth.message1": "Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
-    "disableauth.message2": "Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.",
+    "disableauth.message2": "Dies ist für Szenarien gedacht, <strong>in denen man eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
     "Please use this option carefully!": "Bitte mit Vorsicht nutzen.",
     Logout: "Ausloggen",
     notificationDescription: "Benachrichtigungen müssen einem Monitor zugewiesen werden, damit diese funktionieren.",
@@ -559,7 +559,7 @@ export default {
     "ntfy Topic": "ntfy Thema",
     Domain: "Domain",
     Workstation: "Workstation",
-    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren modus, ein Passwort wird nicht benötigt.",
+    disableCloudflaredNoAuthMsg: "Du bist im nicht-authentifizieren Modus, ein Passwort wird nicht benötigt.",
     trustProxyDescription: "Vertraue 'X-Forwarded-*' headern. Wenn man die richtige client IP haben möchte und Uptime Kuma hinter einem Proxy wie Nginx or Apache läuft, wollte dies aktiviert werden.",
     wayToGetLineNotifyToken: "Du kannst hier ein Token erhalten: {0}",
     Examples: "Beispiele",

From f6ac09b7513afccfed2c1e8a01921e3562351869 Mon Sep 17 00:00:00 2001
From: SametKUM <kumsamet@gmail.com>
Date: Sun, 2 Oct 2022 21:14:00 +0300
Subject: [PATCH 10/11] fix some translations

---
 src/languages/tr-TR.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/tr-TR.js b/src/languages/tr-TR.js
index 75bc103c4..1bf949932 100644
--- a/src/languages/tr-TR.js
+++ b/src/languages/tr-TR.js
@@ -224,7 +224,7 @@ export default {
     teams: "Microsoft Teams",
     "Webhook URL": "Webhook URL",
     wayToGetTeamsURL: "Bir webhook URL'sinin nasıl oluşturulacağını öğrenebilirsiniz {0}.",
-    signal: "Signal",
+    signal: "Sinyal",
     Number: "Numara",
     Recipients: "Alıcılar",
     needSignalAPI: "REST API ile bir signal istemciniz olması gerekiyor.",
@@ -552,14 +552,14 @@ export default {
     deleteDockerHostMsg: "Bu docker ana bilgisayarını tüm monitörler için silmek istediğinizden emin misiniz?",
     socket: "Soket",
     tcp: "TCP / HTTP",
-    "Docker Container": "Docker Konteyneri",
+    "Docker Container": "Docker Konteyner",
     "Container Name / ID": "Konteyner Adı / Kimliği",
     "Docker Host": "Docker Ana Bilgisayarı",
     "Docker Hosts": "Docker Ana Bilgisayarları",
     "ntfy Topic": "ntfy Konu",
     Domain: "Domain",
     Workstation: "İş İstasyonu",
-    disableCloudflaredNoAuthMsg: "Yetki Yok modundasınız, şifre gerekli değil.",
+    disableCloudflaredNoAuthMsg: "Yetki yok modundasınız, şifre gerekli değil.",
     trustProxyDescription: "'X-Forwarded-*' başlıklarına güvenin. Doğru istemci IP'sini almak istiyorsanız ve Uptime Kuma'nız Nginx veya Apache'nin arkasındaysa, bunu etkinleştirmelisiniz.",
     wayToGetLineNotifyToken: "{0} adresinden bir erişim jetonu alabilirsiniz.",
     Examples: "Örnekler",

From 7672057319c28ec2957622abbcb2559e3cf5abc6 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:51:29 +0800
Subject: [PATCH 11/11] [ntfy] Do not autofill

---
 src/components/notifications/Ntfy.vue | 14 +++++++-------
 src/languages/en.js                   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index a42dca302..ddcc39174 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -12,21 +12,21 @@
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
+        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
             <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
-            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
         </div>
     </div>
-    <div class="mb-3">
-        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
-        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
-    </div>
 </template>
 
 <script>
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f631..00e9551f1 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    "Optional": "Optional",
 };