Merge Matthew's wording patch

This commit is contained in:
Luke Barnard 2017-02-22 16:59:45 +00:00
parent 436e6b36f1
commit b68b0e25c8

View file

@ -126,14 +126,10 @@ export default React.createClass({
} else { } else {
warning = ( warning = (
<div> <div>
<p>
This means there is no guarantee that the devices
belong to the users they claim to.
</p>
<p> <p>
We recommend you go through the verification process We recommend you go through the verification process
for each device before continuing, but you can send for each device to confirm they belong to their legitimate owner,
without verifying if you prefer. but you can resend the message without verifying if you prefer.
</p> </p>
</div> </div>
); );
@ -152,8 +148,7 @@ export default React.createClass({
> >
<GeminiScrollbar autoshow={false} className="mx_Dialog_content"> <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
<h4> <h4>
This room contains unknown devices which have not been This room contains devices that you haven't seen before.
verified.
</h4> </h4>
{ warning } { warning }
Unknown devices: Unknown devices: