Merge Discord branch

Discord Integration, Accounts UI improvements

lang/admin/en-us.json

@@ -20,6 +20,8 @@
         "create": "Create",
         "apply": "Apply",
         "delete": "Delete",
+        "add": "Add",
+        "select": "Select",
         "name": "Name",
         "date": "Date",
         "enabled": "Enabled",
@@ -94,7 +96,9 @@
         "notifyEvent": "Notify on:",
         "notifyInviteExpiry": "On expiry",
         "notifyUserCreation": "On user creation",
-        "sendPIN": "Ask the user to send the PIN below to the bot."
+        "sendPIN": "Ask the user to send the PIN below to the bot.",
+        "searchDiscordUser": "Start typing the Discord username to find the user.",
+        "findDiscordUser": "Find Discord user"
     },
     "notifications": {
         "changedEmailAddress": "Changed email address of {n}.",
@@ -107,6 +111,7 @@
         "updateApplied": "Update applied, please restart.",
         "updateAppliedRefresh": "Update applied, please refresh.",
         "telegramVerified": "Telegram account verified.",
+        "accountConnected": "Account connected.",
         "errorConnection": "Couldn't connect to jfa-go.",
         "error401Unauthorized": "Unauthorized. Try refreshing the page.",
         "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.",