Merge remote-tracking branch 'origin/master' into radius-check

# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
#	src/pages/EditMonitor.vue

src/languages/en.js

@@ -13,6 +13,7 @@ export default {
     pauseDashboardHome: "Pause",
     deleteMonitorMsg: "Are you sure want to delete this monitor?",
     deleteNotificationMsg: "Are you sure want to delete this notification for all monitors?",
+    dnsPortDescription: "DNS server port. Defaults to 53. You can change the port at any time.",
     resolverserverDescription: "Cloudflare is the default server. You can change the resolver server anytime.",
     rrtypeDescription: "Select the RR type you want to monitor",
     pauseMonitorMsg: "Are you sure want to pause?",
@@ -56,8 +57,7 @@ export default {
     Current: "Current",
     Uptime: "Uptime",
     "Cert Exp.": "Cert Exp.",
-    days: "days",
-    day: "day",
+    day: "day | days",
     "-day": "-day",
     hour: "hour",
     "-hour": "-hour",
@@ -101,6 +101,9 @@ export default {
     "Update Password": "Update Password",
     "Disable Auth": "Disable Auth",
     "Enable Auth": "Enable Auth",
+    "disableauth.message1": "Are you sure want to <strong>disable authentication</strong>?",
+    "disableauth.message2": "It is designed for scenarios <strong>where you intend to implement third-party authentication</strong> in front of Uptime Kuma such as Cloudflare Access, Authelia or other authentication mechanisms.",
+    "Please use this option carefully!": "Please use this option carefully!",
     Logout: "Logout",
     Leave: "Leave",
     "I understand, please disable": "I understand, please disable",
@@ -330,6 +333,8 @@ export default {
     info: "info",
     warning: "warning",
     danger: "danger",
+    error: "error",
+    critical: "critical",
     primary: "primary",
     light: "light",
     dark: "dark",
@@ -370,6 +375,13 @@ export default {
     smtpDkimHashAlgo: "Hash Algorithm (Optional)",
     smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
     smtpDkimskipFields: "Header Keys not to sign (Optional)",
+    wayToGetPagerDutyKey: "You can get this by going to Service -> Service Directory -> (Select a service) -> Integrations -> Add integration. Here you can search for \"Events API V2\". More info {0}",
+    "Integration Key": "Integration Key",
+    "Integration URL": "Integration URL",
+    "Auto resolve or acknowledged": "Auto resolve or acknowledged",
+    "do nothing": "do nothing",
+    "auto acknowledged": "auto acknowledged",
+    "auto resolve": "auto resolve",
     gorush: "Gorush",
     alerta: "Alerta",
     alertaApiEndpoint: "API Endpoint",
@@ -396,6 +408,8 @@ export default {
     SignName: "SignName",
     "Sms template must contain parameters: ": "Sms template must contain parameters: ",
     "Bark Endpoint": "Bark Endpoint",
+    "Bark Group": "Bark Group",
+    "Bark Sound": "Bark Sound",
     WebHookUrl: "WebHookUrl",
     SecretKey: "SecretKey",
     "For safety, must use secret key": "For safety, must use secret key",
@@ -429,6 +443,7 @@ export default {
     Next: "Next",
     "The slug is already taken. Please choose another slug.": "The slug is already taken. Please choose another slug.",
     "No Proxy": "No Proxy",
+    Authentication: "Authentication",
     "HTTP Basic Auth": "HTTP Basic Auth",
     "New Status Page": "New Status Page",
     "Page Not Found": "Page Not Found",
@@ -440,6 +455,8 @@ export default {
     "Message:": "Message:",
     "Don't know how to get the token? Please read the guide:": "Don't know how to get the token? Please read the guide:",
     "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.",
+    "HTTP Headers": "HTTP Headers",
+    "Trust Proxy": "Trust Proxy",
     "Other Software": "Other Software",
     "For example: nginx, Apache and Traefik.": "For example: nginx, Apache and Traefik.",
     "Please read": "Please read",
@@ -452,6 +469,7 @@ export default {
     "Domain Name Expiry Notification": "Domain Name Expiry Notification",
     Proxy: "Proxy",
     "Date Created": "Date Created",
+    HomeAssistant: "Home Assistant",
     onebotHttpAddress: "OneBot HTTP Address",
     onebotMessageType: "OneBot Message Type",
     onebotGroupMessage: "Group",
@@ -478,7 +496,7 @@ export default {
     "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",
+    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",
@@ -521,4 +539,24 @@ export default {
     "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} .",
+    "Connection String": "Connection String",
+    Query: "Query",
+    settingsCertificateExpiry: "TLS Certificate Expiry",
+    certificationExpiryDescription: "HTTPS Monitors trigger notification when TLS certificate expires in:",
+    "Setup Docker Host": "Setup Docker Host",
+    "Connection Type": "Connection Type",
+    "Docker Daemon": "Docker Daemon",
+    deleteDockerHostMsg: "Are you sure want to delete this docker host for all monitors?",
+    socket: "Socket",
+    tcp: "TCP / HTTP",
+    "Docker Container": "Docker Container",
+    "Container Name / ID": "Container Name / ID",
+    "Docker Host": "Docker Host",
+    "Docker Hosts": "Docker Hosts",
+    "ntfy Topic": "ntfy Topic",
+    "Domain": "Domain",
+    "Workstation": "Workstation",
+    disableCloudflaredNoAuthMsg: "You are in No Auth mode, password is not require.",
+    trustProxyDescription: "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind such as Nginx or Apache, you should enable this.",
+    wayToGetLineNotifyToken: "You can get an access token from {0}",
 };