OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up Custom Server Help dialog

pull/21833/head
J. Ryan Stinnett 2019-01-26 00:25:00 -06:00
parent b1f698586e
commit 3a698ef4fa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/auth/CustomServerDialog.js
View File

@ -27,17 +27,17 @@ module.exports = React.createClass({
{ _t("Custom Server Options") } { _t("Custom Server Options") }
</div> </div>
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<span> <p>
{ _t("You can use the custom server options to sign into other Matrix " + { _t("You can use the custom server options to sign into other Matrix " +
"servers by specifying a different Home server URL.") } "servers by specifying a different homeserver URL.") }
<br />
{ _t("This allows you to use this app with an existing Matrix account on " + { _t("This allows you to use this app with an existing Matrix account on " +
"a different home server.") } "a different homeserver.") }
<br /> </p>
<br /> <p>
{ _t("You can also set a custom identity server but this will typically prevent " + {_t("You can also set a custom identity server, but you won't be " +
"interaction with users based on email address.") } "able to invite users by email address, or be invited by " +
</span> "email address yourself.")}
</p>
</div> </div>
<div className="mx_Dialog_buttons"> <div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished} autoFocus={true}> <button onClick={this.props.onFinished} autoFocus={true}>

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

@ -1165,9 +1165,9 @@
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>", "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
"This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot", "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
"Custom Server Options": "Custom Server Options", "Custom Server Options": "Custom Server Options",
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL.",
"This allows you to use this app with an existing Matrix account on a different home server.": "This allows you to use this app with an existing Matrix account on a different home server.", "This allows you to use this app with an existing Matrix account on a different homeserver.": "This allows you to use this app with an existing Matrix account on a different homeserver.",
"You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "You can also set a custom identity server but this will typically prevent interaction with users based on email address.", "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
"To continue, please enter your password.": "To continue, please enter your password.", "To continue, please enter your password.": "To continue, please enter your password.",
"Password:": "Password:", "Password:": "Password:",
"Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies", "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",