imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik

Browse source
This commit is contained in:
Michael Telatynski 2017-05-29 15:23:05 +01:00
commit 42e20c38f9
14 changed files with 66 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/dialogs/ConfirmRedactDialog.js
View file

@ -42,7 +42,7 @@ export default React.createClass({
render: function() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const title = "Confirm Redaction";
const title = "Confirm Removal";
const confirmButtonClass = classnames({
'mx_Dialog_primary': true,
@ -55,12 +55,12 @@ export default React.createClass({
title={title}
>
<div className="mx_Dialog_content">
Are you sure you wish to redact (delete) this event?
Note that if you redact a room name or topic change, it could undo the change.
Are you sure you wish to remove (delete) this event?
Note that if you delete a room name or topic change, it could undo the change.
</div>
<div className="mx_Dialog_buttons">
<button className={confirmButtonClass} onClick={this.onOk}>
Redact
Remove
</button>
<button onClick={this.onCancel}>

2
src/components/views/messages/UnknownBody.js
View file

@ -24,7 +24,7 @@ module.exports = React.createClass({
render: function() {
const text = this.props.mxEvent.getContent().body;
return (
<span className="mx_UnknownBody" title="Redacted or unknown message type">
<span className="mx_UnknownBody" title="Removed or unknown message type">
{text}
</span>
);

3
src/components/views/rooms/ForwardMessage.js
View file

@ -16,6 +16,7 @@
*/
import React from 'react';
import { _t } from '../../../languageHandler';
import MatrixClientPeg from '../../../MatrixClientPeg';
import dis from '../../../dispatcher';
import KeyCode from '../../../KeyCode';
@ -88,7 +89,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_ForwardMessage">
<h1>Please select the destination room for this message</h1>
<h1>{_t('Please select the destination room for this message')}</h1>
</div>
);
},

2
src/components/views/rooms/RoomSettings.js
View file

@ -927,7 +927,7 @@ module.exports = React.createClass({
<PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged}/>
</div>
<div className="mx_RoomSettings_powerLevel">
<span className="mx_RoomSettings_powerLevelKey">{ _t('To redact other users\' messages') }, { _t('you must be a') } </span>
<span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages') }, { _t('you must be a') } </span>
<PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged}/>
</div>