From 6951a2a699b6804d8335da342e0a07bba54950a8 Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Thu, 28 Feb 2019 16:02:33 +0100
Subject: [PATCH] fix msgs

---
 .../UnverifiedAddress/index.messages.js       |  4 +-
 src/components/modals/device/Forget/index.js  |  3 +-
 .../modals/device/Remember/index.js           |  3 +-
 .../modals/device/common.messages.js          |  5 ---
 .../DeviceMenu/components/MenuItems/index.js  |  4 +-
 .../components/MenuItems/index.messages.js    |  4 --
 src/views/common.messages.js                  |  4 ++
 translations/master.json                      | 42 ++++++++-----------
 8 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/components/modals/confirm/UnverifiedAddress/index.messages.js b/src/components/modals/confirm/UnverifiedAddress/index.messages.js
index f7636b38..9791039e 100644
--- a/src/components/modals/confirm/UnverifiedAddress/index.messages.js
+++ b/src/components/modals/confirm/UnverifiedAddress/index.messages.js
@@ -5,11 +5,11 @@ import type { Messages } from 'flowtype/npm/react-intl';
 const definedMessages: Messages = defineMessages({
     TR_DEVICE_LABEL_IS_NOT_CONNECTED: {
         id: 'TR_DEVICE_LABEL_IS_NOT_CONNECTED',
-        defaultMessage: '{deviceLabel} is not connected',
+        defaultMessage: 'Device {deviceLabel} is not connected',
     },
     TR_DEVICE_LABEL_IS_UNAVAILABLE: {
         id: 'TR_DEVICE_LABEL_IS_UNAVAILABLE',
-        defaultMessage: '{deviceLabel} is unavailable',
+        defaultMessage: 'Device {deviceLabel} is unavailable',
     },
     TR_PLEASE_CONNECT_YOUR_DEVICE: {
         id: 'TR_PLEASE_CONNECT_YOUR_DEVICE',
diff --git a/src/components/modals/device/Forget/index.js b/src/components/modals/device/Forget/index.js
index 73dfc543..374b982b 100644
--- a/src/components/modals/device/Forget/index.js
+++ b/src/components/modals/device/Forget/index.js
@@ -10,6 +10,7 @@ import Button from 'components/Button';
 import { FormattedMessage } from 'react-intl';
 
 import type { TrezorDevice } from 'flowtype';
+import l10nCommonMessages from 'views/common.messages';
 import l10nDeviceMessages from '../common.messages';
 import l10nMessages from './index.messages';
 
@@ -77,7 +78,7 @@ class ForgetDevice extends PureComponent<Props> {
                     <FormattedMessage {...l10nMessages.TR_FORGETTING_ONLY_REMOVES_THE_DEVICE_FROM} />
                 </StyledP>
                 <Row>
-                    <Button onClick={() => this.forget()}><FormattedMessage {...l10nDeviceMessages.TR_FORGET_DEVICE} /></Button>
+                    <Button onClick={() => this.forget()}><FormattedMessage {...l10nCommonMessages.TR_FORGET_DEVICE} /></Button>
                     <Button isWhite onClick={this.props.onCancel}><FormattedMessage {...l10nMessages.TR_DONT_FORGET} /></Button>
                 </Row>
             </Wrapper>
diff --git a/src/components/modals/device/Remember/index.js b/src/components/modals/device/Remember/index.js
index 3269dee6..ad6d03d4 100644
--- a/src/components/modals/device/Remember/index.js
+++ b/src/components/modals/device/Remember/index.js
@@ -10,6 +10,7 @@ import Button from 'components/Button';
 import { FormattedMessage } from 'react-intl';
 
 import type { TrezorDevice } from 'flowtype';
+import l10nCommonMessages from 'views/common.messages';
 import l10nDeviceMessages from '../common.messages';
 import l10nMessages from './index.messages';
 
@@ -143,7 +144,7 @@ class RememberDevice extends PureComponent<Props, State> {
                     <Button onClick={() => this.forget()}>
                         <ButtonContent>
                             <Text>
-                                <FormattedMessage {...l10nDeviceMessages.TR_FORGET_DEVICE} />
+                                <FormattedMessage {...l10nCommonMessages.TR_FORGET_DEVICE} />
                             </Text>
                             <StyledLoader
                                 isSmallText
diff --git a/src/components/modals/device/common.messages.js b/src/components/modals/device/common.messages.js
index 5481ed57..8f8c026a 100644
--- a/src/components/modals/device/common.messages.js
+++ b/src/components/modals/device/common.messages.js
@@ -7,11 +7,6 @@ const definedMessages: Messages = defineMessages({
         id: 'TR_FORGET_LABEL',
         defaultMessage: 'Forget {deviceLabel}?',
     },
-    TR_FORGET_DEVICE: {
-        id: 'TR_FORGET_DEVICE',
-        defaultMessage: 'Forget device',
-        description: 'Button in remember/forget dialog',
-    },
 });
 
 export default definedMessages;
\ No newline at end of file
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
index 40ca2989..ae1e2ff6 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
@@ -9,7 +9,7 @@ import icons from 'config/icons';
 import colors from 'config/colors';
 import { FONT_SIZE } from 'config/variables';
 
-// import l10nCommonMessages from 'views/common.messages';
+import l10nCommonMessages from 'views/common.messages';
 import l10nMessages from './index.messages';
 
 const Wrapper = styled.div`
@@ -88,7 +88,7 @@ class MenuItems extends PureComponent {
                         size={25}
                         color={colors.TEXT_SECONDARY}
                     />
-                    <Label><FormattedMessage {...l10nMessages.TR_FORGET_DEVICE} /></Label>
+                    <Label><FormattedMessage {...l10nCommonMessages.TR_FORGET_DEVICE} /></Label>
                 </Item>
             </Wrapper>
         );
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.messages.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.messages.js
index cb2a4df5..f7db0b18 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.messages.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.messages.js
@@ -12,10 +12,6 @@ const definedMessages: Messages = defineMessages({
         defaultMessage: 'Renew session',
         description: 'TODO',
     },
-    TR_FORGET_DEVICE: {
-        id: 'TR_FORGET_DEVICE',
-        defaultMessage: 'Forget device',
-    },
 });
 
 export default definedMessages;
\ No newline at end of file
diff --git a/src/views/common.messages.js b/src/views/common.messages.js
index c0ac1153..a2691089 100644
--- a/src/views/common.messages.js
+++ b/src/views/common.messages.js
@@ -58,6 +58,10 @@ const definedMessages: Messages = defineMessages({
         id: 'TR_GO_TO_HIDDEN_WALLET',
         defaultMessage: 'Go to your hidden wallet',
     },
+    TR_FORGET_DEVICE: {
+        id: 'TR_FORGET_DEVICE',
+        defaultMessage: 'Forget device',
+    },
 });
 
 export default definedMessages;
\ No newline at end of file
diff --git a/translations/master.json b/translations/master.json
index ec473fc6..2abca2ca 100644
--- a/translations/master.json
+++ b/translations/master.json
@@ -155,7 +155,7 @@
     }
   },
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": {
-    "source": "{deviceLabel} is not connected",
+    "source": "Device {deviceLabel} is not connected",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -163,7 +163,7 @@
     }
   },
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": {
-    "source": "{deviceLabel} is unavailable",
+    "source": "Device {deviceLabel} is unavailable",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -171,7 +171,7 @@
     }
   },
   "TR_PLEASE_CONNECT_YOUR_DEVICE": {
-    "source": "Please connect your devicet",
+    "source": "Please connect your device to continue with the verification process",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -179,7 +179,7 @@
     }
   },
   "TR_PLEASE_ENABLE_PASSPHRASE": {
-    "source": "Please enable passphrase settings",
+    "source": "Please enable passphrase settings to continue with the verification process.",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -187,7 +187,7 @@
     }
   },
   "TR_PLEASE_DISABLE_PASSPHRASE": {
-    "source": "Please disable passphrase settings",
+    "source": "Please disable passphrase settings to continue with the verification process.",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -212,7 +212,7 @@
     }
   },
   "TR_TO_PREVENT_PHISHING_ATTACKS_COMMA": {
-    "source": "To prevent phishing attacks, you should verify the address on your Trezor first. {claim} to continue with the verification process.",
+    "source": "To prevent phishing attacks, you should verify the address on your Trezor first. {claim}",
     "meta": {
       "occurrences": [
         "src/components/modals/confirm/UnverifiedAddress/index.messages.js"
@@ -227,15 +227,6 @@
       ]
     }
   },
-  "TR_FORGET": {
-    "source": "Forget",
-    "meta": {
-      "comment": "Button in remember/forget dialog",
-      "occurrences": [
-        "src/components/modals/device/common.messages.js"
-      ]
-    }
-  },
   "TR_DONT_FORGET": {
     "source": "Don't forget",
     "meta": {
@@ -261,8 +252,8 @@
       ]
     }
   },
-  "TR_REMEMBER": {
-    "source": "Remember",
+  "TR_REMEMBER_DEVICE": {
+    "source": "Remember device",
     "meta": {
       "occurrences": [
         "src/components/modals/device/Remember/index.messages.js"
@@ -723,6 +714,14 @@
       ]
     }
   },
+  "TR_FORGET_DEVICE": {
+    "source": "Forget device",
+    "meta": {
+      "occurrences": [
+        "src/views/common.messages.js"
+      ]
+    }
+  },
   "TR_YOU_ARE_OPENING_TREZOR_BETA_WALLET": {
     "source": "You are opening Trezor Beta Wallet",
     "meta": {
@@ -1006,14 +1005,6 @@
       ]
     }
   },
-  "TR_FORGET_DEVICE": {
-    "source": "Forget device",
-    "meta": {
-      "occurrences": [
-        "src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.messages.js"
-      ]
-    }
-  },
   "TR_YOU_ARE_IN_YOUR_STANDARD_WALLET": {
     "source": "You are in your standard wallet.",
     "meta": {
@@ -1557,6 +1548,7 @@
   "TR_ACQUIRE_DEVICE": {
     "source": "Acquire device",
     "meta": {
+      "comment": "call-to-action to use device in current window when it is used in other window",
       "occurrences": [
         "src/views/Wallet/views/Acquire/index.messages.js"
       ]