Merge branch 'master' into mqtt

# Conflicts:
#	package-lock.json
#	server/database.js

src/languages/en.js

@@ -243,6 +243,7 @@ export default {
     clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
     apprise: "Apprise (Support 50+ Notification services)",
+    GoogleChat: "Google Chat (Google Workspace only)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
@@ -311,4 +312,57 @@ export default {
     successMessage: "Success Message",
     successMessageExplanation: "MQTT message that will be considered as success",
     recent: "Recent",
+    Done: "Done",
+    Info: "Info",
+    Security: "Security",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "Shrink Database",
+    "Pick a RR-Type...": "Pick a RR-Type...",
+    "Pick Accepted Status Codes...": "Pick Accepted Status Codes...",
+    Default: "Default",
+    "HTTP Options": "HTTP Options",
+    "Create Incident": "Create Incident",
+    Title: "Title",
+    Content: "Content",
+    Style: "Style",
+    info: "info",
+    warning: "warning",
+    danger: "danger",
+    primary: "primary",
+    light: "light",
+    dark: "dark",
+    Post: "Post",
+    "Please input title and content": "Please input title and content",
+    Created: "Created",
+    "Last Updated": "Last Updated",
+    Unpin: "Unpin",
+    "Switch to Light Theme": "Switch to Light Theme",
+    "Switch to Dark Theme": "Switch to Dark Theme",
+    "Show Tags": "Show Tags",
+    "Hide Tags": "Hide Tags",
+    Description: "Description",
+    "No monitors available.": "No monitors available.",
+    "Add one": "Add one",
+    "No Monitors": "No Monitors",
+    "Untitled Group": "Untitled Group",
+    Services: "Services",
+    Discard: "Discard",
+    Cancel: "Cancel",
+    "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.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
+    serwersmsAPIPassword: "API Password",
+    serwersmsPhoneNumber: "Phone number",
+    serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
+    "stackfield": "Stackfield",
+    smtpDkimSettings: "DKIM Settings",
+    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
+    documentation: "documentation",
+    smtpDkimDomain: "Domain Name",
+    smtpDkimKeySelector: "Key Selector",
+    smtpDkimPrivateKey: "Private Key",
+    smtpDkimHashAlgo: "Hash Algorithm (Optional)",
+    smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
+    smtpDkimskipFields: "Header Keys not to sign (Optional)",
 };