Merge branch 'master' into amp.chat

Change-Id: Iac4e56401aab3f7f39b623b617990ec1952f8cd0
2020-04-20 16:57:23 +02:00
parent 7aec6f9369 b7f009e559
commit e9c3901b68
12 changed files with 1541 additions and 1131 deletions
@@ -19,7 +19,10 @@ export default {
  },
  resources: {
    users: {
+      backtolist: "Back to list",
      name: "User |||| Users",
+      email: "Email",
+      msisdn: "Phone",
      fields: {
        avatar: "Avatar",
        id: "User-ID",
@@ -32,6 +35,17 @@ export default {
        user_id: "Search user",
        displayname: "Displayname",
        password: "Password",
+        avatar_url: "Avatar URL",
+        medium: "Medium",
+        threepids: "3PIDs",
+        address: "Address",
+      },
+      helper: {
+        deactivate: "Deactivated users cannot be reactivated",
+        erase: "Mark the user as GDPR-erased",
+      },
+      action: {
+        erase: "Erase user data",
      },
    },
    rooms: {
@@ -43,5 +57,13 @@ export default {
        joined_members: "Members",
      },
    },
+    connections: {
+      name: "Connections",
+      fields: {
+        last_seen: "Date",
+        ip: "IP address",
+        user_agent: "User agent",
+      },
+    },
  },
 };