matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge branch 'develop' into new-guest-access

Browse Source
This commit is contained in:
Luke Barnard
2017-06-07 12:08:37 +01:00
committed by GitHub
parent ccaa55d2c8 d59b0e1595
commit 53ea41e8a5
42 changed files with 561 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/UserSettings.js
View File

@@ -754,7 +754,7 @@ module.exports = React.createClass({
const DevicesPanel = sdk.getComponent('settings.DevicesPanel');
return (
<div>
<h3>Devices</h3>
<h3>{_t("Devices")}</h3>
<DevicesPanel className="mx_UserSettings_section"/>
</div>
);
@@ -1095,7 +1095,7 @@ module.exports = React.createClass({
onValueChanged={ this._onAddEmailEditFinished } />
</div>
<div className="mx_UserSettings_threepidButton mx_filterFlipColor">
<img src="img/plus.svg" width="14" height="14" alt="Add" onClick={this._addEmail} />
<img src="img/plus.svg" width="14" height="14" alt={_t("Add")} onClick={this._addEmail} />
</div>
</div>
);