gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2017-06-22 13:37:35 +00:00
parent e4c3a63375 a9c8429d2e
commit c79c0bd333
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/elements/ImageView.js
View File

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

1
src/i18n/strings/en_EN.json
View File

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

1
src/i18n/strings/en_US.json
View File

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