Consistently use the word "device", rather than "session" or "login",…

… in verification dialog (#7474)

src/components/structures/auth/CompleteSecurity.tsx

@@ -69,20 +69,20 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         } else if (phase === Phase.Intro) {
             if (lostKeys) {
                 icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-                title = _t("Unable to verify this login");
+                title = _t("Unable to verify this device");
             } else {
                 icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-                title = _t("Verify this login");
+                title = _t("Verify this device");
             }
         } else if (phase === Phase.Done) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
-            title = _t("Session verified");
+            title = _t("Device verified");
         } else if (phase === Phase.ConfirmSkip) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Are you sure?");
         } else if (phase === Phase.Busy) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify this login");
+            title = _t("Verify this device");
         } else if (phase === Phase.ConfirmReset) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Really reset verification keys?");

src/components/structures/auth/SetupEncryptionBody.tsx

@@ -198,7 +198,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                 let verifyButton;
                 if (store.hasDevicesToVerifyAgainst) {
                     verifyButton = <AccessibleButton kind="primary" onClick={this.onVerifyClick}>
-                        { _t("Verify with another login") }
+                        { _t("Verify with another device") }
                     </AccessibleButton>;
                 }
 
@@ -227,12 +227,12 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
             let message;
             if (this.state.backupInfo) {
                 message = <p>{ _t(
-                    "Your new session is now verified. It has access to your " +
+                    "Your new device is now verified. It has access to your " +
                     "encrypted messages, and other users will see it as trusted.",
                 ) }</p>;
             } else {
                 message = <p>{ _t(
-                    "Your new session is now verified. Other users will see it as trusted.",
+                    "Your new device is now verified. Other users will see it as trusted.",
                 ) }</p>;
             }
             return (

src/components/views/dialogs/VerificationRequestDialog.tsx

@@ -55,7 +55,7 @@ export default class VerificationRequestDialog extends React.Component<IProps, I
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify other login") : _t("Verification Request");
+            _t("Verify other device") : _t("Verification Request");
 
         return <BaseDialog
             className="mx_InfoDialog"

src/components/views/right_panel/EncryptionInfo.tsx

@@ -52,7 +52,7 @@ const EncryptionInfo: React.FC<IProps> = ({
     if (waitingForOtherParty && isSelfVerification) {
         content = (
             <div>
-                { _t("To proceed, please accept the verification request on your other login.") }
+                { _t("To proceed, please accept the verification request on your other device.") }
             </div>
         );
     } else if (waitingForOtherParty || waitingForNetwork) {

src/components/views/right_panel/VerificationPanel.tsx

@@ -68,7 +68,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
 
         const noCommonMethodError: JSX.Element = !showSAS && !showQR ?
             <p>{ _t(
-                "The session you are trying to verify doesn't support scanning a " +
+                "The device you are trying to verify doesn't support scanning a " +
                 "QR code or emoji verification, which is what %(brand)s supports. Try " +
                 "with a different client.",
                 { brand },
@@ -101,7 +101,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                 <div className='mx_VerificationPanel_QRPhase_betweenText'>{ _t("or") }</div> : null;
             return (
                 <div>
-                    { _t("Verify this session by completing one of the following:") }
+                    { _t("Verify this device by completing one of the following:") }
                     <div className='mx_VerificationPanel_QRPhase_startOptions'>
                         { qrBlockDialog }
                         { or }
@@ -178,7 +178,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     private renderQRReciprocatePhase() {
         const { member, request } = this.props;
         const description = request.isSelfVerification ?
-            _t("Almost there! Is your other session showing the same shield?") :
+            _t("Almost there! Is your other device showing the same shield?") :
             _t("Almost there! Is %(displayName)s showing the same shield?", {
                 displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
             });
@@ -273,7 +273,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
             text = _t("Verification timed out.") + ` ${startAgainInstruction}`;
         } else if (request.cancellingUserId === request.otherUserId) {
             if (request.isSelfVerification) {
-                text = _t("You cancelled verification on your other session.");
+                text = _t("You cancelled verification on your other device.");
             } else {
                 text = _t("%(displayName)s cancelled verification.", {
                     displayName: (member as User).displayName || (member as RoomMember).name || member.userId,

src/components/views/verification/VerificationShowSas.tsx

@@ -92,7 +92,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
-                    "Confirm the emoji below are displayed on both sessions, in the same order:",
+                    "Confirm the emoji below are displayed on both devices, in the same order:",
                 ):
                 _t(
                     "Verify this user by confirming the following emoji appear on their screen.",
@@ -106,7 +106,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
-                    "Verify this session by confirming the following number appears on its screen.",
+                    "Verify this device by confirming the following number appears on its screen.",
                 ):
                 _t(
                     "Verify this user by confirming the following number appears on their screen.",
@@ -126,12 +126,12 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
             // device shouldn't be null in this situation but it can be, eg. if the device is
             // logged out during verification
             if (this.props.device) {
-                text = _t("Waiting for you to verify on your other session, %(deviceName)s (%(deviceId)s)…", {
+                text = _t("Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…", {
                     deviceName: this.props.device ? this.props.device.getDisplayName() : '',
                     deviceId: this.props.device ? this.props.device.deviceId : '',
                 });
             } else {
-                text = _t("Waiting for you to verify on your other session…");
+                text = _t("Waiting for you to verify on your other device…");
             }
             confirm = <p>{ text }</p>;
         } else if (this.state.pending || this.state.cancelling) {

src/i18n/strings/en_EN.json

@@ -1006,13 +1006,13 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
-    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirm the emoji below are displayed on both sessions, in the same order:",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirm the emoji below are displayed on both devices, in the same order:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
-    "Verify this session by confirming the following number appears on its screen.": "Verify this session by confirming the following number appears on its screen.",
+    "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
-    "Waiting for you to verify on your other session, %(deviceName)s (%(deviceId)s)…": "Waiting for you to verify on your other session, %(deviceName)s (%(deviceId)s)…",
-    "Waiting for you to verify on your other session…": "Waiting for you to verify on your other session…",
+    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…",
+    "Waiting for you to verify on your other device…": "Waiting for you to verify on your other device…",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "Cancelling…": "Cancelling…",
     "They don't match": "They don't match",
@@ -1904,7 +1904,7 @@
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "URL Previews": "URL Previews",
     "Back": "Back",
-    "To proceed, please accept the verification request on your other login.": "To proceed, please accept the verification request on your other login.",
+    "To proceed, please accept the verification request on your other device.": "To proceed, please accept the verification request on your other device.",
     "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
     "Accepting…": "Accepting…",
     "Start Verification": "Start Verification",
@@ -2000,19 +2000,19 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Edit devices": "Edit devices",
     "Security": "Security",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.",
+    "The device you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "The device you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.",
     "Scan this unique code": "Scan this unique code",
     "Compare unique emoji": "Compare unique emoji",
     "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device",
     "Start": "Start",
     "or": "or",
-    "Verify this session by completing one of the following:": "Verify this session by completing one of the following:",
+    "Verify this device by completing one of the following:": "Verify this device by completing one of the following:",
     "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "Verify by emoji": "Verify by emoji",
-    "Almost there! Is your other session showing the same shield?": "Almost there! Is your other session showing the same shield?",
+    "Almost there! Is your other device showing the same shield?": "Almost there! Is your other device showing the same shield?",
     "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it's secure.": "In encrypted rooms, verify all users to ensure it's secure.",
@@ -2023,7 +2023,7 @@
     "Start verification again from the notification.": "Start verification again from the notification.",
     "Start verification again from their profile.": "Start verification again from their profile.",
     "Verification timed out.": "Verification timed out.",
-    "You cancelled verification on your other session.": "You cancelled verification on your other session.",
+    "You cancelled verification on your other device.": "You cancelled verification on your other device.",
     "%(displayName)s cancelled verification.": "%(displayName)s cancelled verification.",
     "You cancelled verification.": "You cancelled verification.",
     "Verification cancelled": "Verification cancelled",
@@ -2783,7 +2783,7 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
-    "Verify other login": "Verify other login",
+    "Verify other device": "Verify other device",
     "Verification Request": "Verification Request",
     "Approve widget permissions": "Approve widget permissions",
     "This widget would like to:": "This widget would like to:",
@@ -3153,9 +3153,9 @@
     "Could not load user profile": "Could not load user profile",
     "Decrypted event source": "Decrypted event source",
     "Original event source": "Original event source",
-    "Unable to verify this login": "Unable to verify this login",
-    "Verify this login": "Verify this login",
-    "Session verified": "Session verified",
+    "Unable to verify this device": "Unable to verify this device",
+    "Verify this device": "Verify this device",
+    "Device verified": "Device verified",
     "Really reset verification keys?": "Really reset verification keys?",
     "Skip verification for now": "Skip verification for now",
     "Failed to send email": "Failed to send email",
@@ -3215,10 +3215,10 @@
     "Proceed with reset": "Proceed with reset",
     "Verify with Security Key or Phrase": "Verify with Security Key or Phrase",
     "Verify with Security Key": "Verify with Security Key",
-    "Verify with another login": "Verify with another login",
+    "Verify with another device": "Verify with another device",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Verify your identity to access encrypted messages and prove your identity to others.",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
-    "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
+    "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
+    "Your new device is now verified. Other users will see it as trusted.": "Your new device is now verified. Other users will see it as trusted.",
     "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "Without verifying, you won't have access to all your messages and may appear as untrusted to others.",
     "I'll verify later": "I'll verify later",
     "Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.": "Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.",