Merge pull request #652 from dasilvarosa/wording

wip app yml wording

src/components/DeviceConnect/index.js

@@ -204,7 +204,7 @@ class DeviceConnect extends PureComponent<Props> {
 
     const hasDevice = devices.length > 0
     const hasMultipleDevices = devices.length > 1
-
+    // TODO: place custom wording in trans tags into yml file
     /* eslint-disable react/jsx-no-literals */
     return (
       <Box flow={4} ff="Open Sans">
@@ -215,8 +215,7 @@ class DeviceConnect extends PureComponent<Props> {
             </StepIcon>
             <Box grow shrink>
               <Trans i18nKey="app:deviceConnect.step1.connect" parent="div">
-                Connect your <strong>Ledger device</strong> to your computer and enter your{' '}
+                Connect and unlock your <strong>Ledger device</strong>
-                <strong>PIN code</strong> on your device
               </Trans>
             </Box>
             <StepCheck checked={hasDevice} />
@@ -260,9 +259,9 @@ class DeviceConnect extends PureComponent<Props> {
               </StepIcon>
               <Box grow shrink>
                 <Trans i18nKey="deviceConnect:step2.open" parent="div">
-                  {'Open '}
+                  {'Open the '}
                   <strong>{currency.name}</strong>
-                  {' App on your device'}
+                  {' app on your device'}
                 </Trans>
               </Box>
               <StepCheck checked={appState.success} hasErrors={appState.fail} />
@@ -275,8 +274,8 @@ class DeviceConnect extends PureComponent<Props> {
                 </WrapperIconCurrency>
               </StepIcon>
               <Box grow shrink>
-                <Trans i18nKey="deviceConnect:dashboard.open" parent="div">
+                <Trans i18nKey="app:dashboard.open" parent="div">
-                  {'Go to the '}
+                  {'Navigate to the '}
                   <strong>{'dashboard'}</strong>
                   {' on your device'}
                 </Trans>
@@ -299,8 +298,8 @@ class DeviceConnect extends PureComponent<Props> {
               </StepIcon>
               <Box grow shrink>
                 <Trans i18nKey="deviceConnect:stepGenuine.open" parent="div">
-                  {'Confirm '}
+                  {'Allow the '}
-                  <strong>{'authentication'}</strong>
+                  <strong>{'Ledger Manager'}</strong>
                   {' on your device'}
                 </Trans>
               </Box>

static/i18n/en/app.yml

@@ -1,5 +1,5 @@
 common:
-  ok: Okay
+  ok: OK
   yes: Yes
   no: No
   apply: Apply
@@ -7,7 +7,7 @@ common:
   cancel: Cancel
   delete: Delete
   continue: Continue
-  skipThisStep: Skip This Step
+  skipThisStep: Skip this step
   chooseWalletPlaceholder: Choose a wallet...
   currency: Currency
   selectAccount: Select an account
@@ -21,7 +21,7 @@ common:
   save: Save
   password: Password
   editProfile: Edit profile
-  lockApplication: Lock application
+  lockApplication: Lock Ledger Live
   showMore: Show more
   max: Max
   next: Next
@@ -89,7 +89,7 @@ account:
       desc: The API node to use
       error: Invalid endpoint
 dashboard:
-  title: Dashboard
+  title: Portfolio
   accounts:
     title: Accounts ({{count}})
   greeting:
@@ -111,7 +111,8 @@ currentAddress:
 deviceConnect:
   step1:
     choose: "We detected {{count}} devices connected, please select one:"
-    connect: Connect your <1>Ledger device</1> to your computer and enter your <3>PIN code</3> on your device
+    connect: Connect and unlock your <1>Ledger device</1> # remove key: <3>PIN code</3>
+    dashboard: 
 emptyState:
   sidebar:
     text: You don’t have any accounts at the moment. Press the + button to create an account