Merge branch 'master' into onboarding

alix.js

@@ -13,7 +13,7 @@ const {
   getWallet,
   syncAccount,
   signTransaction,
-} = require('ledger-core')
+} = require('@ledgerhq/ledger-core')
 
 async function getOrCreateWallet(currencyId) {
   try {

package.json

@@ -39,6 +39,7 @@
     "@ledgerhq/hw-app-eth": "^4.12.0",
     "@ledgerhq/hw-transport": "^4.12.0",
     "@ledgerhq/hw-transport-node-hid": "^4.12.0",
+    "@ledgerhq/ledger-core": "^1.0.1",
     "@ledgerhq/live-common": "^2.5.0",
     "axios": "^0.18.0",
     "babel-runtime": "^6.26.0",
@@ -57,7 +58,6 @@
     "i18next": "^11.2.2",
     "i18next-node-fs-backend": "^1.0.0",
     "invariant": "^2.2.4",
-    "ledger-core": "meriadec/lib-ledger-core-node-bindings#883d7fd",
     "lodash": "^4.17.5",
     "moment": "^2.22.1",
     "object-path": "^0.11.4",

src/init-ledger-core.js

@@ -4,7 +4,7 @@
 // instanciating wallet pool, but we don't need to do each everytime we
 // require ledger-core, only the first time, so, eh.
 
-const core = require('ledger-core')
+const core = require('@ledgerhq/ledger-core')
 
 let instanciated = false
 

src/internals/accounts/scanAccountsOnDevice.js

@@ -15,7 +15,7 @@ import { getCryptoCurrencyById } from '@ledgerhq/live-common/lib/helpers/currenc
 import type Transport from '@ledgerhq/hw-transport'
 
 import type { AccountRaw } from '@ledgerhq/live-common/lib/types'
-import type { NJSAccount, NJSOperation } from 'ledger-core/src/ledgercore_doc'
+import type { NJSAccount, NJSOperation } from '@ledgerhq/ledger-core/src/ledgercore_doc'
 
 type Props = {
   devicePath: string,

static/i18n/fr/common.yml

@@ -21,7 +21,7 @@ close: Fermer
 eastern: Orientale
 western: Occidentale
 lockScreen:
-  title: Content de vous revoir
+  title: Welcome Back
-  subTitle: L'application est verrouillée
+  subTitle: Your application is locked
-  description: Veuillez entrer votre mot de passe pour continuer
+  description: Please enter your password to continue
-  inputPlaceholder: Saisissez votre mot de passe
+  inputPlaceholder: Type your password

static/i18n/fr/dashboard.yml

@@ -1,9 +1,9 @@
 ---
 title: Tableau de bord
 greeting:
-  morning: "Bonjour!"
+  morning: "Good Morning!"
-  evening: "Bonsoir!"
+  evening: "Good Evening!"
-  afternoon: "Bonjour!"
+  afternoon: "Good Afternoon!"
 summary: voici le résumé de votre compte
 summary_plural: 'voici le résumé de vos {{count}} comptes'
 noAccounts: aucun compte

static/i18n/fr/exchange.yml

@@ -1,3 +1,3 @@
 ---
 title: Exchange
-visitWebsite: Visiter le site web
+visitWebsite: Visit website

static/i18n/fr/manager.yml

@@ -5,6 +5,6 @@ tabs:
 install: Installer
 allApps: Toutes les applications
 plugYourDevice:
-  title: Branchez votre appareil
+  title: Plug your device
-  desc: Lorem Ipsum est un texte factice utilisé dans le monde de l'impression et de la typographie
+  desc: Lorem Ipsum is simply dummy text of the printing and typesetting industry’s standard dummy text
-  cta: Brancher mon appareil
+  cta: Plug my device

static/i18n/fr/password.yml

@@ -1,7 +1,7 @@
 ---
-warning_0: Avertissement 0
+warning_0: Warning 0
-warning_1: Avertissement 1
+warning_1: Warning 1
-warning_2: Avertissement 2
+warning_2: Warning 2
-warning_3: Avertissement 3
+warning_3: Warning 3
-warning_4: Avertissement 4
+warning_4: Warning 4
-errorMessageIncorrectPassword: Le mot de passe saisi est erroné.
+errorMessageIncorrectPassword: The password you entered is incorrect.

static/i18n/fr/send.yml

@@ -17,18 +17,18 @@ steps:
   verification:
     title: Vérification
     warning: |
-      Vous êtes sur le point de valider une transaction. 
+      You are about to validate a transaction.
-      Soyez prudent, nous vous recommandons vivement de vérifier que les informations sur votre appareil Ledger sont correctes.
+      Be careful, we strongly recommand you to verify that the informations on your Ledger device are correct.
-    body: Après avoir vérifié que tout est correct, vous pouvez valider la transaction de manière sécurisée sur votre appareil.
+    body: Once you have checked everything is ok, you can validate securely the transaction on your device.
   confirmation:
     title: Confirmation
     success:
-      title: Transaction effectuée avec succès
+      title: Transaction successfully completed
-      text: Vous devrez peut-être attendre plusieurs confirmations avant que la transaction n'apparaisse
+      text: You may have to wait few confirmations unitl the transaction appear
-      cta: Voir les détails de l'opération
+      cta: View operation details
     error:
-      title: Transaction interrompue
+      title: Transaction aborted
       text: |
-        La transaction a été interrompue sur votre appareil.
+        The transaction have been aborted on your device.
-        Vous pouvez réessayer l’opération.
+        You can try again the operation.
-      cta: Réessayer l'opération
+      cta: Retry operation

static/i18n/fr/settings.yml

@@ -36,10 +36,10 @@ profile:
   passwordModalNewPasswordInput: Nouveau mot de passe
   passwordModalRepeatPasswordInput: Répéter mot de passe
   passwordModalSave: Sauvegarder
-  disablePasswordModalTitle: Désactiver le mot de passe
+  disablePasswordModalTitle: Disable Password
-  disablePasswordModalDesc: Lorem ipsum dolor sit amet, consectetur adipiscing elit. integer non nibh diam.
+  disablePasswordModalDesc: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non nibh diam.
-  disablePasswordModalInput: Mot de passe actuel
+  disablePasswordModalInput: Current password
-  disablePasswordModalSave: Sauvegarder
+  disablePasswordModalSave: Save
   sync: Synchroniser les comptes
   syncDesc: Lorem ipsum dolor sit amet
   export: Exporter le journal
@@ -47,8 +47,8 @@ profile:
   reset: Réinitialiser l'application
   resetDesc: Lorem ipsum dolor sit amet
   resetButton: Réinitialisation
-  developerMode: Mode développeur
+  developerMode: Developer Mode
-  developerModeDesc: Rendre visible les applications en développement et les monnaies comme le Bitcoin Testnet
+  developerModeDesc: Enable visibility of developer apps & currencies like Bitcoin Testnet
 about:
   faq: FAQ
   faqDesc: Lorem ipsum dolor sit amet

static/i18n/fr/sidebar.yml

@@ -1,5 +1,5 @@
 ---
 menu: Menu
 accounts: Comptes
-manager: Gestionnaire
+manager: Manager
 exchange: Exchange

yarn.lock

@@ -1456,6 +1456,19 @@
   dependencies:
     events "^2.0.0"
 
+"@ledgerhq/ledger-core@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-1.0.1.tgz#5563e76718f73f270a4d2059cdf616cec3506975"
+  dependencies:
+    "@ledgerhq/hw-app-btc" "^4.7.3"
+    "@ledgerhq/hw-transport-node-hid" "^4.7.6"
+    axios "^0.18.0"
+    babel-runtime "^6.26.0"
+    bindings "^1.3.0"
+    nan "^2.6.2"
+    npm "^5.7.1"
+    prebuild-install "^2.2.2"
+
 "@ledgerhq/live-common@^2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.5.0.tgz#ec9d1d6aac301ab9da7463e601e96a1181290ed5"
@@ -8615,19 +8628,6 @@ leb@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
 
-ledger-core@meriadec/lib-ledger-core-node-bindings#883d7fd:
-  version "1.0.0"
-  resolved "https://codeload.github.com/meriadec/lib-ledger-core-node-bindings/tar.gz/883d7fd7b141acd03d2f69ee2b735cd7e973f2c7"
-  dependencies:
-    "@ledgerhq/hw-app-btc" "^4.7.3"
-    "@ledgerhq/hw-transport-node-hid" "^4.7.6"
-    axios "^0.18.0"
-    babel-runtime "^6.26.0"
-    bindings "^1.3.0"
-    nan "^2.6.2"
-    npm "^5.7.1"
-    prebuild-install "^2.2.2"
-
 left-pad@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"