Merge branch 'develop' into travis/granular-settings

src/i18n/strings/en_EN.json

@@ -63,7 +63,7 @@
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
     "Default": "Default",
-    "User": "User",
+    "Restricted": "Restricted",
     "Moderator": "Moderator",
     "Admin": "Admin",
     "Start a chat": "Start a chat",
@@ -150,8 +150,8 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
-    "Communities": "Communities",
     "Message Pinning": "Message Pinning",
+    "Presence Management": "Presence Management",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
@@ -524,6 +524,7 @@
     "Unverify": "Unverify",
     "Verify...": "Verify...",
     "No results": "No results",
+    "Communities": "Communities",
     "Home": "Home",
     "Integrations Error": "Integrations Error",
     "Could not connect to the integration server": "Could not connect to the integration server",
@@ -580,6 +581,7 @@
     "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
     "%(items)s and %(count)s others|one": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
+    "Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
     "Custom level": "Custom level",
     "Room directory": "Room directory",
     "Start chat": "Start chat",