Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs

src/i18n/strings/en_EN.json

@@ -448,6 +448,8 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
+    "Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
+    "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
     "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Font size": "Font size",
@@ -1112,11 +1114,16 @@
     "People": "People",
     "Start chat": "Start chat",
     "Rooms": "Rooms",
-    "Create room": "Create room",
+    "Add room": "Add room",
+    "Create new room": "Create new room",
+    "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",
     "System Alerts": "System Alerts",
     "Historical": "Historical",
     "Custom Tag": "Custom Tag",
+    "Can't see what you’re looking for?": "Can't see what you’re looking for?",
+    "Explore all public rooms": "Explore all public rooms",
+    "%(count)s results|other": "%(count)s results",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
@@ -1169,7 +1176,6 @@
     "List options": "List options",
     "Jump to first unread room.": "Jump to first unread room.",
     "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
     "Show %(count)s more|other": "Show %(count)s more",
     "Show %(count)s more|one": "Show %(count)s more",
     "Use default": "Use default",
@@ -1187,8 +1193,6 @@
     "%(count)s unread messages.|other": "%(count)s unread messages.",
     "%(count)s unread messages.|one": "1 unread message.",
     "Unread messages.": "Unread messages.",
-    "This room is public": "This room is public",
-    "Away": "Away",
     "Add a topic": "Add a topic",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
     "This room has already been upgraded.": "This room has already been upgraded.",
@@ -1896,6 +1900,8 @@
     "Take picture": "Take picture",
     "Remove for everyone": "Remove for everyone",
     "Remove for me": "Remove for me",
+    "This room is public": "This room is public",
+    "Away": "Away",
     "User Status": "User Status",
     "powered by Matrix": "powered by Matrix",
     "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",