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

Fix merge conflict

Browse source 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
This commit is contained in:
Stefan Parviainen 2017-10-23 19:57:52 +02:00
commit 115772d526
61 changed files with 8970 additions and 2714 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/groups/GroupMemberInfo.js
View file

@ -68,8 +68,8 @@ module.exports = withMatrixClient(React.createClass({
const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
Modal.createDialog(ConfirmUserActionDialog, {
groupMember: this.props.groupMember,
action: _t('Remove from group'),
title: _t('Remove this user from group?'),
action: _t('Remove from community'),
title: _t('Remove this user from community?'),
danger: true,
onFinished: (proceed) => {
if (!proceed) return;
@ -87,7 +87,7 @@ module.exports = withMatrixClient(React.createClass({
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
title: _t('Error'),
description: _t('Failed to remove user from group'),
description: _t('Failed to remove user from community'),
});
}).finally(() => {
this.setState({removingUser: false});
@ -129,7 +129,7 @@ module.exports = withMatrixClient(React.createClass({
kickButton = (
<AccessibleButton className="mx_MemberInfo_field"
onClick={this._onKick}>
{ _t('Remove from group') }
{ _t('Remove from community') }
</AccessibleButton>
);