Merge remote-tracking branch 'origin/master' into status-page-expiry

# Conflicts:
#	src/lang/en.json

src/lang/ar-SY.json

@@ -455,8 +455,6 @@
     "For safety, must use secret key": "للسلامة يجب استخدام المفتاح السري",
     "Device Token": "رمز الجهاز",
     "Platform": "منصة",
-    "iOS": "iOS",
-    "Android": "ذكري المظهر",
     "Huawei": "هواوي",
     "High": "عالٍ",
     "Retry": "إعادة المحاولة",

src/lang/ar.json

@@ -592,7 +592,6 @@
     "For safety, must use secret key": "للسلامة يجب استخدام المفتاح السري",
     "Device Token": "رمز الجهاز",
     "Platform": "منصة",
-    "Android": "ذكري المظهر",
     "Huawei": "هواوي",
     "High": "عالٍ",
     "Retry": "إعادة المحاولة",

src/lang/bg-BG.json

@@ -396,8 +396,6 @@
     "For safety, must use secret key": "За сигурност, трябва да се използва таен ключ",
     "Device Token": "Токен за устройство",
     "Platform": "Платформа",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Висок",
     "Retry": "Повтори",

src/lang/cs-CZ.json

@@ -454,8 +454,6 @@
     "For safety, must use secret key": "Z důvodu bezpečnosti použijte secret key",
     "Device Token": "Token zařízení",
     "Platform": "Platforma",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Vysoký",
     "Retry": "Opakovat",

src/lang/da-DK.json

@@ -558,7 +558,6 @@
     "high": "høj",
     "Base URL": "Base URL",
     "Platform": "Platform",
-    "Android": "Android",
     "Huawei": "Huawei",
     "Retry": "Forsøg igen",
     "Topic": "Emne",

src/lang/de-CH.json

@@ -403,8 +403,6 @@
     "For safety, must use secret key": "Zur Sicherheit muss ein geheimer Schlüssel verwendet werden",
     "Device Token": "Gerätetoken",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Hoch",
     "Retry": "Wiederholungen",

src/lang/de-DE.json

@@ -403,8 +403,6 @@
     "For safety, must use secret key": "Zur Sicherheit muss ein geheimer Schlüssel verwendet werden",
     "Device Token": "Gerätetoken",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Hoch",
     "Retry": "Wiederholungen",

src/lang/el-GR.json

@@ -420,8 +420,6 @@
     "For safety, must use secret key": "Για ασφάλεια, πρέπει να χρησιμοποιήσετε secret key",
     "Device Token": "Device Token",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "Ξαναδοκιμάσετε",

src/lang/en.json

@@ -269,6 +269,9 @@
     "Services": "Services",
     "Discard": "Discard",
     "Cancel": "Cancel",
+    "Select": "Select",
+    "selectedMonitorCount": "Selected: {0}",
+    "Check/Uncheck": "Check/Uncheck",
     "Powered by": "Powered by",
     "shrinkDatabaseDescription": "Trigger database VACUUM for SQLite. If your database is created after 1.10.0, AUTO_VACUUM is already enabled and this action is not needed.",
     "Customize": "Customize",
@@ -364,6 +367,7 @@
     "deleteDockerHostMsg": "Are you sure want to delete this docker host for all monitors?",
     "socket": "Socket",
     "tcp": "TCP / HTTP",
+    "tailscalePingWarning": "In order to use the Tailscale Ping monitor, you need to install Uptime Kuma without Docker and also install Tailscale client on your server.",
     "Docker Container": "Docker Container",
     "Container Name / ID": "Container Name / ID",
     "Docker Host": "Docker Host",
@@ -619,7 +623,6 @@
     "For safety, must use secret key": "For safety, must use secret key",
     "Device Token": "Device Token",
     "Platform": "Platform",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "Retry",
@@ -690,6 +693,7 @@
     "Octopush API Version": "Octopush API Version",
     "Legacy Octopush-DM": "Legacy Octopush-DM",
     "ntfy Topic": "ntfy Topic",
+    "Server URL should not contain the nfty topic": "Server URL should not contain the nfty topic",
     "onebotHttpAddress": "OneBot HTTP Address",
     "onebotMessageType": "OneBot Message Type",
     "onebotGroupMessage": "Group",
@@ -785,6 +789,11 @@
     "noGroupMonitorMsg": "Not Available. Create a Group Monitor First.",
     "Close": "Close",
     "Request Body": "Request Body",
+    "nostrRelays": "Nostr relays",
+    "nostrRelaysHelp": "One relay URL per line",
+    "nostrSender": "Sender Private Key (nsec)",
+    "nostrRecipients": "Recipients Public Keys (npub)",
+    "nostrRecipientsHelp": "npub format, one per line",
     "showCertificateExpiry": "Show Certificate Expiry",
     "noOrBadCertificate": "No/Bad Certificate"
 }

src/lang/es-ES.json

@@ -497,8 +497,6 @@
     "Proto Method": "Método Proto",
     "Proto Content": "Contenido Proto",
     "Economy": "Económico",
-    "iOS": "iOS",
-    "Android": "Android",
     "Platform": "Plataforma",
     "onebotPrivateMessage": "Privado",
     "onebotMessageType": "Tipo de Mensaje OneBot",

src/lang/eu.json

@@ -415,8 +415,6 @@
     "For safety, must use secret key": "For safety, must use secret key",
     "Device Token": "Gailu tokena",
     "Platform": "Plataforma",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Altua",
     "Retry": "Errepikatu",

src/lang/fa.json

@@ -568,7 +568,6 @@
     "SendKey": "کلید ارسال (SendKey)",
     "SecretAccessKey": "کلید دسترسی مخفی (AccessKey Secret)",
     "SignName": "نام امضا (SignName)",
-    "Android": "اندروید",
     "Huawei": "هواوی",
     "WeCom Bot Key": "کلید ربات WeCom",
     "Setup Proxy": "تنظیم پروکسی",

src/lang/fi.json

@@ -547,7 +547,6 @@
     "For safety, must use secret key": "Turvallisuuden vuoksi on käytettävä salaista avainta",
     "Device Token": "Laitteen tunnus",
     "Platform": "Alusta",
-    "iOS": "iOS",
     "Bark Endpoint": "Bark päätepiste",
     "Huawei": "Huawei",
     "High": "Korkea",
@@ -564,7 +563,6 @@
     "promosmsAllowLongSMS": "Salli pitkät tekstiviestit",
     "Feishu WebHookUrl": "Feishu WebHookURL-osoite",
     "Internal Room Id": "Huoneen sisäinen tunnus",
-    "Android": "Android",
     "Channel Name": "Kanavan nimi",
     "Uptime Kuma URL": "Uptime Kuma URL-osoite",
     "Icon Emoji": "Ikoni Emoji",

src/lang/fr-FR.json

@@ -451,8 +451,6 @@
     "For safety, must use secret key": "Par sécurité, utilisation obligatoire de la clé secrète",
     "Device Token": "Jeton d'appareil",
     "Platform": "Plateforme",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Haute",
     "Retry": "Recommencez",

src/lang/he-IL.json

@@ -445,8 +445,6 @@
     "For safety, must use secret key": "לבטיחות, חייב להשתמש במפתח סודיy",
     "Device Token": "אסימון מכשיר",
     "Platform": "פּלַטפוֹרמָה",
-    "iOS": "iOS",
-    "Android": "דְמוּי אָדָם",
     "Huawei": "huawei",
     "High": "High",
     "Retry": "נסה שוב",

src/lang/hr-HR.json

@@ -420,8 +420,6 @@
     "For safety, must use secret key": "Korištenje tajnog ključa je obavezno",
     "Device Token": "Token uređaja",
     "Platform": "Platforma",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Visoko",
     "Retry": "Ponovnih pokušaja",

src/lang/id-ID.json

@@ -418,8 +418,6 @@
     "For safety, must use secret key": "Untuk keamaan Anda harus menggunakan kunci rahasia",
     "Device Token": "Token Perangkat",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Tinggi",
     "Retry": "Ulang",

src/lang/ja.json

@@ -507,7 +507,6 @@
     "lineDevConsoleTo": "Line Developers Console - {0}",
     "Basic Settings": "基本設定",
     "User ID": "User ID",
-    "Android": "Android",
     "Huawei": "Huawei",
     "Device Token": "デバイストークン",
     "recurringIntervalMessage": "毎日1回実行する｜{0} 日に1回実行する",

src/lang/ko-KR.json

@@ -413,8 +413,6 @@
     "For safety, must use secret key": "안전을 위해 꼭 Secret Key를 사용하세요.",
     "Device Token": "기기 Token",
     "Platform": "플랫폼",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "재시도",

src/lang/nl-NL.json

@@ -404,8 +404,6 @@
     "For safety, must use secret key": "Voor de veiligheid moet je de secret key gebruiken",
     "Device Token": "Apparaat Token",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Hoog",
     "Retry": "Opnieuw",

src/lang/pl.json

@@ -414,8 +414,6 @@
     "For safety, must use secret key": "Ze względów bezpieczeństwa musisz użyć tajnego klucza",
     "Device Token": "Token urządzenia",
     "Platform": "Platforma",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Wysoki",
     "Retry": "Ponów",

src/lang/pt-BR.json

@@ -523,7 +523,6 @@
     "Example:": "Exemplo: {0}",
     "Read more:": "Leia mais em: {0}",
     "promosmsAllowLongSMS": "Permitir SMS grandes",
-    "Android": "Android",
     "Huawei": "Huawei",
     "smseagleTo": "Números Dos Telefones",
     "smseaglePriority": "Prioridade da mensagem (0-9, padrão=0)",

src/lang/ru-RU.json

@@ -421,8 +421,6 @@
     "For safety, must use secret key": "В целях безопасности необходимо использовать секретный ключ",
     "Device Token": "Токен устройства",
     "Platform": "Платформа",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "Повторить",

src/lang/th-TH.json

@@ -404,8 +404,6 @@
     "For safety, must use secret key": "เพื่อความปลอดภัย จำเป็นต้องตั้งค่ากุญแจการเข้าถึง",
     "Device Token": "Device Token",
     "Platform": "แพลตฟอร์ม",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "สูง",
     "Retry": "ลองใหม่",

src/lang/tr-TR.json

@@ -408,8 +408,6 @@
     "For safety, must use secret key": "Güvenlik için gizli anahtar kullanılmalıdır",
     "Device Token": "Cihaz Tokeni",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "Tekrar",

src/lang/uk-UA.json

@@ -413,8 +413,6 @@
     "For safety, must use secret key": "Для безпеки необхідно використовувати секретний ключ",
     "Device Token": "Токен пристрою",
     "Platform": "Платформа",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "Високий",
     "Retry": "Повтор",

src/lang/vi-VN.json

@@ -403,8 +403,6 @@
     "For safety, must use secret key": "Để an toàn, hãy dùng secret key",
     "Device Token": "Device Token",
     "Platform": "Platform",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
     "Retry": "Retry",

src/lang/zh-CN.json

@@ -452,8 +452,6 @@
     "For safety, must use secret key": "出于安全考虑，必须使用加签密钥",
     "Device Token": "Apple Device Token",
     "Platform": "平台",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "华为",
     "High": "高",
     "Retry": "重试次数",

src/lang/zh-HK.json

@@ -694,7 +694,6 @@
     "Retry": "重試",
     "High": "高",
     "Huawei": "華為",
-    "Android": "Android",
     "For safety, must use secret key": "為安全起見，必須使用 Secret Key",
     "SecretKey": "SecretKey",
     "WebHookUrl": "WebHookUrl",

src/lang/zh-TW.json

@@ -445,8 +445,6 @@
     "For safety, must use secret key": "為了安全起見，必須使用秘密金鑰",
     "Device Token": "裝置權杖",
     "Platform": "平台",
-    "iOS": "iOS",
-    "Android": "Android",
     "Huawei": "華為",
     "High": "高",
     "Retry": "重試",