Merge remote-tracking branch 'origin/master' into miles/invert-keyword

# Conflicts:
#	server/database.js

src/lang/en.json

@@ -13,6 +13,7 @@
     "Version": "Version",
     "Check Update On GitHub": "Check Update On GitHub",
     "List": "List",
+    "Home": "Home",
     "Add": "Add",
     "Add New Monitor": "Add New Monitor",
     "Quick Stats": "Quick Stats",
@@ -22,6 +23,8 @@
     "statusMaintenance": "Maintenance",
     "Maintenance": "Maintenance",
     "Unknown": "Unknown",
+    "Cannot connect to the socket server": "Cannot connect to the socket server",
+    "Reconnecting...": "Reconnecting...",
     "General Monitor Type": "General Monitor Type",
     "Passive Monitor Type": "Passive Monitor Type",
     "Specific Monitor Type": "Specific Monitor Type",
@@ -433,11 +436,15 @@
     "Enable DNS Cache": "Enable DNS Cache",
     "Enable": "Enable",
     "Disable": "Disable",
+    "chromeExecutable": "Chrome/Chromium Executable",
+    "chromeExecutableAutoDetect": "Auto Detect",
+    "chromeExecutableDescription": "For Docker users, if Chromium is not yet installed, it may take a few minutes to install and display the test result. It takes 1GB of disk space.",
     "dnsCacheDescription": "It may be not working in some IPv6 environments, disable it if you encounter any issues.",
     "Single Maintenance Window": "Single Maintenance Window",
     "Maintenance Time Window of a Day": "Maintenance Time Window of a Day",
     "Effective Date Range": "Effective Date Range (Optional)",
     "Schedule Maintenance": "Schedule Maintenance",
+    "Edit Maintenance": "Edit Maintenance",
     "Date and Time": "Date and Time",
     "DateTime Range": "DateTime Range",
     "loadingError": "Cannot fetch the data, please try again later.",
@@ -558,6 +565,7 @@
     "More info on:": "More info on: {0}",
     "pushoverDesc1": "Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.",
     "pushoverDesc2": "If you want to send notifications to different devices, fill out Device field.",
+    "pushoverMessageTtl": "Message TTL (Seconds)",
     "SMS Type": "SMS Type",
     "octopushTypePremium": "Premium (Fast - recommended for alerting)",
     "octopushTypeLowCost": "Low Cost (Slow - sometimes blocked by operator)",
@@ -716,8 +724,38 @@
     "lunaseaTarget": "Target",
     "lunaseaDeviceID": "Device ID",
     "lunaseaUserID": "User ID",
+    "ntfyAuthenticationMethod": "Authentication Method",
+    "ntfyUsernameAndPassword": "Username and Password",
     "twilioAccountSID": "Account SID",
     "twilioAuthToken": "Auth Token",
     "twilioFromNumber": "From Number",
-    "twilioToNumber": "To Number"
+    "twilioToNumber": "To Number",
+    "Monitor Setting": "{0}'s Monitor Setting",
+    "Show Clickable Link": "Show Clickable Link",
+    "Show Clickable Link Description": "If checked everyone who have access to this status page can have access to monitor URL.",
+    "Open Badge Generator": "Open Badge Generator",
+    "Badge Generator": "{0}'s Badge Generator",
+    "Badge Type": "Badge Type",
+    "Badge Duration": "Badge Duration",
+    "Badge Label": "Badge Label",
+    "Badge Prefix": "Badge Prefix",
+    "Badge Suffix": "Badge Suffix",
+    "Badge Label Color": "Badge Label Color",
+    "Badge Color": "Badge Color",
+    "Badge Label Prefix": "Badge Label Prefix",
+    "Badge Label Suffix": "Badge Label Suffix",
+    "Badge Up Color": "Badge Up Color",
+    "Badge Down Color": "Badge Down Color",
+    "Badge Pending Color": "Badge Pending Color",
+    "Badge Maintenance Color": "Badge Maintenance Color",
+    "Badge Warn Color": "Badge Warn Color",
+    "Badge Warn Days": "Badge Warn Days",
+    "Badge Down Days": "Badge Down Days",
+    "Badge Style": "Badge Style",
+    "Badge value (For Testing only.)": "Badge value (For Testing only.)",
+    "Badge URL": "Badge URL",
+    "Group": "Group",
+    "Monitor Group": "Monitor Group",
+    "noGroupMonitorMsg": "Not Available. Create a Group Monitor First.",
+    "Close": "Close"
 }