PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Weblate 2017-10-19 17:06:42 +00:00
commit 81bb81b61b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/GroupView.js
View file

@ -992,7 +992,7 @@ export default React.createClass({
} }
return ( return (
<div className="mx_GroupView_error"> <div className="mx_GroupView_error">
{ _t('Failed to load %(groupId)', {groupId: this.props.groupId }) } { _t('Failed to load %(groupId)s', {groupId: this.props.groupId }) }
{ extraText } { extraText }
</div> </div>
); );

2
src/i18n/strings/en_EN.json
View file

@ -691,7 +691,7 @@
"Community Settings": "Community Settings", "Community Settings": "Community Settings",
"Community %(groupId)s not found": "Community %(groupId)s not found", "Community %(groupId)s not found": "Community %(groupId)s not found",
"This Home server does not support communities": "This Home server does not support communities", "This Home server does not support communities": "This Home server does not support communities",
"Failed to load %(groupId)": "Failed to load %(groupId)", "Failed to load %(groupId)s": "Failed to load %(groupId)s",
"Reject invitation": "Reject invitation", "Reject invitation": "Reject invitation",
"Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?", "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
"Failed to reject invitation": "Failed to reject invitation", "Failed to reject invitation": "Failed to reject invitation",