Tweaks from PR

src/Analytics.js

@@ -272,7 +272,7 @@ class Analytics {
                 ),
             },
             { expl: _td('Your User Agent'), value: navigator.userAgent },
-            { expl: _td('Your session resolution'), value: resolution },
+            { expl: _td('Your device resolution'), value: resolution },
         ];
 
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');

src/components/structures/auth/ForgotPassword.js

@@ -360,7 +360,7 @@ export default createReactClass({
             <p>{_t(
                 "You have been logged out of all sessions and will no longer receive " +
                 "push notifications. To re-enable notifications, sign in again on each " +
-                "session.",
+                "device.",
             )}</p>
             <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
                 value={_t('Return to login screen')} />

src/components/structures/auth/SoftLogout.js

@@ -212,8 +212,8 @@ export default class SoftLogout extends React.Component {
         let introText = null; // null is translated to something area specific in this function
         if (this.state.keyBackupNeeded) {
             introText = _t(
-                "Regain access to your account and recover encryption keys stored on this session. " +
+                "Regain access to your account and recover encryption keys stored in this session. " +
-                "Without them, you won’t be able to read all of your secure messages on any session.");
+                "Without them, you won’t be able to read all of your secure messages in any session.");
         }
 
         if (this.state.loginView === LOGIN_VIEW.PASSWORD) {
@@ -306,7 +306,7 @@ export default class SoftLogout extends React.Component {
                     <p>
                         {_t(
                             "Warning: Your personal data (including encryption keys) is still stored " +
-                            "on this session. Clear it if you're finished using this session, or want to sign " +
+                            "in this session. Clear it if you're finished using this session, or want to sign " +
                             "in to another account.",
                         )}
                     </p>

src/components/views/dialogs/ConfirmWipeDeviceDialog.js

@@ -39,7 +39,7 @@ export default class ConfirmWipeDeviceDialog extends React.Component {
         return (
             <BaseDialog className='mx_ConfirmWipeDeviceDialog' hasCancel={true}
                         onFinished={this.props.onFinished}
-                        title={_t("Clear all data on this session?")}>
+                        title={_t("Clear all data in this session?")}>
                 <div className='mx_ConfirmWipeDeviceDialog_content'>
                     <p>
                         {_t(

src/components/views/dialogs/SetPasswordDialog.js

@@ -29,7 +29,7 @@ const WarmFuzzy = function(props) {
     if (props.didSetEmail) {
         title = _t('You have successfully set a password and an email address!');
     }
-    const advice = _t('You can now return to your account after signing out, and sign in on other sessions.');
+    const advice = _t('You can now return to your account after signing out, and sign in on other devices.');
     let extraAdvice = null;
     if (!props.didSetEmail) {
         extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.');

src/components/views/right_panel/EncryptionInfo.js

@@ -55,7 +55,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
         <div className="mx_UserInfo_container">
             <h3>{_t("Verify User")}</h3>
             <div>
-                <p>{_t("For extra security, verify this user by checking a one-time code on both of your sessions.")}</p>
+                <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
                 <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
                 { content }
             </div>

src/i18n/strings/en_EN.json

@@ -17,7 +17,7 @@
     "Every page you use in the app": "Every page you use in the app",
     "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
     "Your User Agent": "Your User Agent",
-    "Your session resolution": "Your session resolution",
+    "Your device resolution": "Your device resolution",
     "Analytics": "Analytics",
     "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
@@ -1147,7 +1147,7 @@
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Verify User": "Verify User",
-    "For extra security, verify this user by checking a one-time code on both of your sessions.": "For extra security, verify this user by checking a one-time code on both of your sessions.",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
     "Your messages are not secure": "Your messages are not secure",
     "One of the following may be compromised:": "One of the following may be compromised:",
     "Your homeserver": "Your homeserver",
@@ -1421,7 +1421,7 @@
     "Removing…": "Removing…",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
-    "Clear all data on this session?": "Clear all data on this session?",
+    "Clear all data in this session?": "Clear all data in this session?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
     "Clear all data": "Clear all data",
     "Community IDs cannot be empty.": "Community IDs cannot be empty.",
@@ -1578,7 +1578,7 @@
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
     "You have successfully set a password!": "You have successfully set a password!",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
-    "You can now return to your account after signing out, and sign in on other sessions.": "You can now return to your account after signing out, and sign in on other sessions.",
+    "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Please set a password!": "Please set a password!",
@@ -1927,7 +1927,7 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
     "I have verified my email address": "I have verified my email address",
     "Your password has been reset.": "Your password has been reset.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
     "Return to login screen": "Return to login screen",
     "Set a new password": "Set a new password",
     "Invalid homeserver discovery response": "Invalid homeserver discovery response",
@@ -1965,14 +1965,14 @@
     "Create your account": "Create your account",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Failed to re-authenticate": "Failed to re-authenticate",
-    "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.": "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.",
     "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
     "Forgotten your password?": "Forgotten your password?",
     "Sign in and regain access to your account.": "Sign in and regain access to your account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
     "You're signed out": "You're signed out",
     "Clear personal data": "Clear personal data",
-    "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
     "Commands": "Commands",
     "Command Autocomplete": "Command Autocomplete",
     "Community Autocomplete": "Community Autocomplete",