Merge branch 'develop' into travis/pinned_messages

src/i18n/strings/en_EN.json

@@ -20,7 +20,6 @@
   "Collapse panel": "Collapse panel",
   "Collecting app version information": "Collecting app version information",
   "Collecting logs": "Collecting logs",
-  "Create new room": "Create new room",
   "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
   "Custom Server Options": "Custom Server Options",
   "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
@@ -32,9 +31,9 @@
   "Directory": "Directory",
   "Dismiss": "Dismiss",
   "Download this file": "Download this file",
-  "Drop here %(toAction)s": "Drop here %(toAction)s",
   "Enable audible notifications in web client": "Enable audible notifications in web client",
   "Enable desktop notifications": "Enable desktop notifications",
+  "Show message in desktop notification": "Show message in desktop notification",
   "Enable email notifications": "Enable email notifications",
   "Enable notifications for this account": "Enable notifications for this account",
   "Enable them now": "Enable them now",
@@ -43,14 +42,12 @@
   "Error saving email notification preferences": "Error saving email notification preferences",
   "#example": "#example",
   "Expand panel": "Expand panel",
-  "Failed to": "Failed to",
   "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
   "Failed to change settings": "Failed to change settings",
   "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
   "Failed to update keywords": "Failed to update keywords",
   "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
   "Failed to get public room list": "Failed to get public room list",
-  "Failed to join the room": "Failed to join the room",
   "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
   "Failed to send custom event.": "Failed to send custom event.",
   "Failed to send report: ": "Failed to send report: ",
@@ -63,9 +60,7 @@
   "Filter room names": "Filter room names",
   "Forget": "Forget",
   "Forward Message": "Forward Message",
-  " from room": " from room",
   "Guests can join": "Guests can join",
-  "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
   "Hide panel": "Hide panel",
   "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
   "I understand the risks and wish to continue": "I understand the risks and wish to continue",
@@ -100,7 +95,6 @@
   "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Please describe the bug. What did you do? What did you expect to happen? What actually happened?",
   "Please describe the bug and/or send logs.": "Please describe the bug and/or send logs.",
   "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.",
-  "Please Register": "Please Register",
   "powered by Matrix": "powered by Matrix",
   "Quote": "Quote",
   "Reject": "Reject",
@@ -114,7 +108,6 @@
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
   "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
-  "Room directory": "Room directory",
   "Room not found": "Room not found",
   "Search": "Search",
   "Search…": "Search…",
@@ -124,16 +117,12 @@
   "Send Custom Event": "Send Custom Event",
   "Send Custom State Event": "Send Custom State Event",
   "Explore Room State": "Explore Room State",
-  "Settings": "Settings",
   "Source URL": "Source URL",
   "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
-  "Start chat": "Start chat",
   "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
   "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
   "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
   "This Room": "This Room",
-  "This room is inaccessible to guests. You may be able to join if you register.": "This room is inaccessible to guests. You may be able to join if you register.",
-  " to room": " to room",
   "Unable to fetch notification target list": "Unable to fetch notification target list",
   "Unable to join network": "Unable to join network",
   "Unable to look up room ID from server": "Unable to look up room ID from server",
@@ -155,7 +144,6 @@
   "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
   "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
   "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-  "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
   "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
   "You must specify an event type!": "You must specify an event type!",
   "Thank you!": "Thank you!",
@@ -179,7 +167,6 @@
   "No update available.": "No update available.",
   "Downloading update...": "Downloading update...",
   "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
-  "Welcome page": "Welcome page",
   "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
   "Welcome to Riot.im": "Welcome to Riot.im",
   "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",