Merge remote-tracking branch 'origin/develop' into develop

src/components/views/elements/ImageView.js

@@ -158,7 +158,7 @@ module.exports = React.createClass({
         var eventRedact;
         if(showEventMeta) {
             eventRedact = (<div className="mx_ImageView_button" onClick={this.onRedactClick}>
-                { _t('Redact') }
+                { _t('Remove') }
             </div>);
         }
 

src/i18n/strings/en_EN.json

@@ -98,7 +98,6 @@
   "Please Register": "Please Register",
   "powered by Matrix": "powered by Matrix",
   "Quote": "Quote",
-  "Redact": "Redact",
   "Reject": "Reject",
   "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
   "Remove": "Remove",

src/i18n/strings/en_US.json

@@ -96,7 +96,6 @@
     "Please Register": "Please Register",
     "powered by Matrix": "powered by Matrix",
     "Quote": "Quote",
-    "Redact": "Redact",
     "Reject": "Reject",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
     "Remove": "Remove",