Merge pull request #660 from dasilvarosa/wording

Wording: send/receive flows and error messages

src/components/Workflow/WorkflowDefault.js

@@ -111,8 +111,7 @@ const WorkflowDefault = ({ device, deviceInfo, errors, isGenuine }: 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 />
-            <strong>PIN code</strong> on your device
           </Trans>
         </Box>
         <StepCheck checked={!!device} />
@@ -128,7 +127,7 @@ const WorkflowDefault = ({ device, deviceInfo, errors, isGenuine }: Props) => (
         </StepIcon>
         <Box grow shrink>
           <Trans i18nKey="deviceConnect:dashboard.open" parent="div">
-            {'Go to the '}
+            {'Navigate to the '}
             <strong>{'dashboard'}</strong>
             {' on your device'}
           </Trans>
@@ -155,8 +154,8 @@ const WorkflowDefault = ({ device, deviceInfo, errors, isGenuine }: 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>

src/components/Workflow/WorkflowWithIcon.js

@@ -129,11 +129,11 @@ const WorkflowWithIcon = ({ device, deviceInfo, errors, isGenuine, t }: Props) =
           </StepIcon>
           <Box grow shrink>
             <Trans i18nKey="deviceConnect:step1.connect" parent="div">
-              {'Connect your '}
+              {'Connect and unlock your '}
               <strong>Ledger device</strong>
-              {' to your computer and enter your '}
+              {''}
-              <strong>PIN code</strong>
+              <strong />
-              {' on your device'}
+              {''}
             </Trans>
           </Box>
           <StepCheck checked={!!device} />
@@ -150,7 +150,7 @@ const WorkflowWithIcon = ({ device, deviceInfo, errors, isGenuine, t }: Props) =
           </StepIcon>
           <Box grow shrink>
             <Trans i18nKey="deviceConnect:dashboard.open" parent="div">
-              {'Go to the '}
+              {'Navigate to the '}
               <strong>{'dashboard'}</strong>
               {' on your device'}
             </Trans>
@@ -179,8 +179,8 @@ const WorkflowWithIcon = ({ device, deviceInfo, errors, isGenuine, t }: 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>

src/components/modals/AddAccounts/steps/02-step-connect-device.js

@@ -24,7 +24,7 @@ function StepConnectDevice({ t, currency, currentDevice, setState }: StepProps)
             <strong style={{ fontWeight: 'bold' }}>{`${currency.name} (${
               currency.ticker
             })`}</strong>
-            {` account(s) from your Ledger device.`}
+            {` accounts from your Ledger device.`}
           </Trans>
         </Box>
       </Box>

static/i18n/en/app.yml

@@ -39,7 +39,7 @@ common:
     lostPassword: I lost my password
   sync:
     syncing: Synchronizing...
-    upToDate: Up to date
+    upToDate: Live
     error: Synchronization error
     refresh: Refresh
     ago: Synced {{time}}
@@ -75,9 +75,9 @@ account:
   lastOperations: Last operations
   emptyState:
     title: No funds yet?
-    desc: Receive funds in this account by using your Ledger device with the [cryptocurrency] app installed. # replace [cryptocurrency] and make it bold
+    desc: Make sure the [cryptocurrency] app is installed to receive funds. # replace [cryptocurrency] and make it bold
     buttons:
-      receiveFunds: Receive Funds
+      receiveFunds: Receive funds
   settings:
     title: Edit account
     advancedLogs: Advanced logs
@@ -111,10 +111,10 @@ dashboard:
 currentAddress:
   title: Current address
   for: Address for <1><0>{{accountName}}</0></1>
-  message: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam blandit velit egestas leo tincidunt
+  message: Your receive address has not been confirmed on your Ledger device. Verify the address for optimal security.
 deviceConnect:
   step1:
-    choose: "We detected {{count}} devices connected, please select one:"
+    choose: "We detected {{count}} connected devices, please select one:"
     connect: Connect and unlock your <1>Ledger device</1> # remove key: <3>PIN code</3>
     dashboard: test
 emptyState:
@@ -149,11 +149,12 @@ addAccounts:
   editName: Edit name
   newAccount: New account
   legacyAccount: '{{accountName}} (legacy)'
-  noAccountToImport: No {{currencyName}} account was found.
+  noAccountToImport: All {{currencyName}} accounts found are already in your portfolio.
-  success: Accounts have been added to your portfolio.
+  success: Account successfully added to your portfolio.
+# success_plural: Accounts successfully added to your portfolio.
   createNewAccount:
     title: Create new account
-    noOperationOnLastAccount: Receive funds on your previous account before creating a new one.
+    noOperationOnLastAccount: 'You have to receive funds on [ACCOUNT  NAME]{{accountName}} before you can create a new account.'
     noAccountToCreate: No {{currencyName}} account was found to create.
   somethingWentWrong: Something went wrong during synchronization, please try again.
   cta:
@@ -185,24 +186,24 @@ manager:
     all: Apps
     installing: 'Installing {{app}}...'
     uninstalling: 'Uninstalling {{app}}...'
-    installSuccess: '{{app}} app successfully installed'
+    installSuccess: '{{app}} app successful0ly installed'
     uninstallSuccess: '{{app}} app successfully uninstalled'
     alreadyInstalled: '{{app}} app is already installed'
-    help: To update an app, you have to uninstall the app and re install it.
+    help: Remove and reinstall to update apps
   firmware:
-    installed: 'Firmware {{version}}'
+    installed: 'Firmware version {{version}}'
     update: Update firmware
     updateTitle: Firmware update
     continue: Continue update
-    latest: 'A new firmware {{version}} is available'
+    latest: 'Firmware version {{version}} is available.'
     disclaimerTitle: 'You are about to install the latest <1><0>firmware {{version}}</0></1>'
     disclaimerAppDelete: Please note that all the apps installed on your device will be deleted.
     disclaimerAppReinstall: You will be able to re-install your apps after the firmware update
   title: Manager
-  subtitle: Get all your apps here
+  subtitle: Install apps or update your device.
   device:
     title: Connect your device
-    desc: Follow the steps below to connect your device
+    desc: Follow the steps below to use the Manager
     cta: Connect my device
   errors:
     noDevice: No device is connected (TEMPLATE NEEDED)
@@ -216,26 +217,26 @@ receive:
       label: Account
     connectDevice:
       title: Connect device
-      withoutDevice: I don't have my device
+      withoutDevice: Proceed without device
     confirmAddress:
       title: Confirm address
       action: Confirm address on device
       text: To receive funds, confirm the address on your device.
-      support: Contact Support
+      support: Ledger Support
       error:
-        title: Houston, we have a problem!
+        title: Receive address rejected
-        text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non nibh diam. In eget ipsum arcu donec finibus
+        text: Please try again or request Ledger Support assistance when in doubt.
     receiveFunds:
-      title: Receive Funds
+      title: Receive funds
-      label: Amount (Optional)
+      label: Amount (optional)
 send:
   title: Send funds
-  totalSpent: Total spent
+  totalSpent: Total
   steps:
     amount:
-      title: Informations
+      title: Create payment
       selectAccountDebit: Select an account to debit
-      recipientAddress: Recipient address
+      recipientAddress: Recipient address # can't control the tooltip!
       amount: Amount
       max: Max
       fees: Fees
@@ -245,25 +246,24 @@ send:
       rippleTag: Tag
       ethereumGasLimit: Gas limit
       unitPerByte: '{{unit}} per byte'
-      feePerByte: Fee per byte
+      feePerByte: Fees per byte
     connectDevice:
       title: Connect device
     verification:
       title: Verification
       warning: |
-        You are about to validate a transaction.
+        Carefully verify the transaction details on your device. Press the left button on your device to cancel.
-        Be careful, we strongly recommend you to verify that the informations on your Ledger device are correct.
+      body: Press the right button to confirm the transaction.
-      body: Once you have checked everything is ok, you can validate securely the transaction on your device.
     confirmation:
       title: Confirmation
       success:
-        title: Transaction successfully broadcasted
+        title: Transaction sent
         text: |
-          with the following transaction id:
+          The transaction has been signed and sent to the network. Your account balance will update once the blockchain has confirmed the transaction. It has the following Transaction ID:
         cta: View operation details
       error:
-        title: Transaction error
+        title: Transaction canceled
-        cta: Retry operation
+        cta: Retry
       pending:
         title: Broadcasting transaction...
 releaseNotes:
@@ -289,13 +289,13 @@ settings:
     stock: Regional market indicator
     stockDesc: Choose Western to display an increase in market value in blue. Choose Eastern to display an increase in market value in red.
   currencies:
-    desc: Select a cryptocurrency to edit its settings
+    desc: Select a cryptocurrency to edit its settings.
     exchange: Rate provider ({{ticker}})
     exchangeDesc: Choose the provider of the base currency exchange rates.
     confirmationsToSpend: Number of confirmations required to spend
-    confirmationsToSpendDesc: Select the number of confirmations required for your funds to be spendable. # A higher number of confirmations decreases the probability that a transaction is rejected.
+    confirmationsToSpendDesc: Set the number of confirmations required for your funds to be spendable. # A higher number of confirmations decreases the probability that a transaction is rejected.
     confirmationsNb: Number of confirmations
-    confirmationsNbDesc: Select the number of blocks a transaction needs to be included in to consider it as confirmed. # A higher number of confirmations increases the certainty that a transaction cannot be reversed.
+    confirmationsNbDesc: Set the number of blocks a transaction needs to be included in to consider it as confirmed. # A higher number of confirmations increases the certainty that a transaction cannot be reversed.
     transactionsFees: Default transaction fees
     transactionsFeesDesc: Select your default transaction fees. The higher the fee, the quicker the transaction will be processed.
     explorer: Blockchain explorer

static/i18n/en/errors.yml

@@ -1,25 +1,25 @@
-generic: An error occurred
+generic: Oops, an unknown error occurred. Please try again or contact Ledger Support.
 RangeError: '{{message}}'
 Error: '{{message}}'
 LedgerAPIErrorWithMessage: '{{message}}'
 TransportStatusError: '{{message}}'
-TimeoutError: 'Timeout reached'
+TimeoutError: 'The request timed out. Please try again or contact Ledger Support.'
-FeeEstimationFailed: 'fee estimation failed (status: {{status}})'
+FeeEstimationFailed: 'The fee could not be estimated. Please try again or set a custom fee (status: {{status}})'
-NotEnoughBalance: 'Not enough balance'
+NotEnoughBalance: 'The account has insufficient funds to proceed.'
-BtcUnmatchedApp: 'You must open application ‘{{currencyName}}’ on the device'
+BtcUnmatchedApp: 'Open the ‘{{currencyName}}’ app on your Ledger device to proceed.'
-WrongAppOpened: 'You must open application ‘{{currencyName}}’ on the device'
+WrongAppOpened: 'Open the ‘{{currencyName}}’ app on your Ledger device to proceed.'
-WrongDeviceForAccount: 'You must use the device associated to the account ‘{{accountName}}’'
+WrongDeviceForAccount: 'Use the device associated with the account ‘{{accountName}}’.'
-LedgerAPINotAvailable: 'Ledger API is not available for currency {{currencyName}}'
+LedgerAPINotAvailable: 'The Ledger API is not available for {{currencyName}}. Please check status.ledger.fr.'
-LedgerAPIError: 'A problem occurred with Ledger API. Please try again later. (HTTP {{status}})'
+LedgerAPIError: 'A problem occurred with the Ledger API. Please try again later. (HTTP {{status}})'
-NetworkDown: 'Your internet connection seems down. Please try again later.'
+NetworkDown: 'Your internet connection seems down. Please try again.'
-NoAddressesFound: 'No accounts found'
+NoAddressesFound: 'No accounts were found.'
-UserRefusedOnDevice: Transaction have been aborted
+UserRefusedOnDevice: Please try again or request Ledger Support assistance when in doubt.
-WebsocketConnectionError: An error occurred with the socket connection
+WebsocketConnectionError: An error occurred with the websocket connection. Please try again or contact Ledger Support.
-WebsocketConnectionFailed: Failed to establish a socket connection
+WebsocketConnectionFailed: Oops, could not establish a websocket connection. Please try again or contact Ledger Support.
-DeviceSocketFail: 'Device socket failure ({{message}})'
+DeviceSocketFail: Oops. a device socket failure occurred. Please try again or contact Ledger Support.
-DeviceSocketNoBulkStatus: Device socket failure (bulk)
+DeviceSocketNoBulkStatus: Oops, the device socket failed (bulk). Please try again or contact Ledger Support.
-DeviceSocketNoHandler: Device socket failure (handler {{query}})
+DeviceSocketNoHandler: Oops, the device socket failed (handler {{query}}). Please try again or contact Ledger Support.
-LatestMCUInstalledError: The latest MCU is already installed on the Device
+LatestMCUInstalledError: The MCU on the device is already up to date.
-HardResetFail: Hard reset failure
+HardResetFail: Could not reset Ledger Live. Please try again or contact Ledger Support.
 CannotUninstall: Cannot uninstall app
 CannotInstall: Cannot install app