Merge branch 'master' into customstatuspage

# Conflicts:
#	src/languages/de-DE.js

src/languages/en.js

@@ -445,4 +445,14 @@ export default {
     "Issuer:": "Issuer:",
     "Fingerprint:": "Fingerprint:",
     "No status pages": "No status pages",
+    "Domain Name Expiry Notification": "Domain Name Expiry Notification",
+    "Proxy": "Proxy",
+    "Date Created": "Date Created",
+    onebotHttpAddress: "OneBot HTTP Address",
+    onebotMessageType: "OneBot Message Type",
+    onebotGroupMessage: "Group",
+    onebotPrivateMessage: "Private",
+    onebotUserOrGroupId: "Group/User ID",
+    onebotSafetyTips: "For safety, must set access token",
+    "PushDeer Key": "PushDeer Key",
 };