Merge branch 'master' into amp.chat

Change-Id: Iac4e56401aab3f7f39b623b617990ec1952f8cd0

src/i18n/de.js

@@ -19,7 +19,10 @@ export default {
   },
   resources: {
     users: {
+      backtolist: "Zurück zur Liste",
       name: "Benutzer",
+      email: "E-Mail",
+      msisdn: "Telefon",
       fields: {
         avatar: "Avatar",
         id: "Benutzer-ID",
@@ -32,6 +35,17 @@ export default {
         user_id: "Suche Benutzer",
         displayname: "Anzeigename",
         password: "Passwort",
+        avatar_url: "Avatar URL",
+        medium: "Medium",
+        threepids: "3PIDs",
+        address: "Adresse",
+      },
+      helper: {
+        deactivate: "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
+        erase: "DSGVO konformes Löschen der Benutzerdaten",
+      },
+      action: {
+        erase: "Lösche Benutzerdaten",
       },
     },
     rooms: {
@@ -43,6 +57,14 @@ export default {
         joined_members: "Mitglieder",
       },
     },
+    connections: {
+      name: "Verbindungen",
+      fields: {
+        last_seen: "Datum",
+        ip: "IP-Adresse",
+        user_agent: "User Agent",
+      },
+    },
   },
   ra: {
     ...germanMessages.ra,
@@ -52,7 +74,7 @@ export default {
         ...germanMessages.ra.input.password,
         toggle_hidden: "Anzeigen",
         toggle_visible: "Verstecken",
-      }
-    }
-  }
+      },
+    },
+  },
 };

src/i18n/en.js

@@ -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",
+      },
+    },
   },
 };