diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ef83dc7..e590dbc9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,8 @@ jobs:
   build:
     <<: *defaults
     steps:
-      - run: sudo apt-get install -y libudev-dev libfuse-dev
+      - run: sudo apt-get update
+      - run: sudo apt-get install -y libudev-dev
       - run:
           name: Install latest yarn
           command: |
@@ -20,14 +21,13 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v11-yarn-packages-{{ checksum "yarn.lock" }}
+            - v12-yarn-packages-{{ checksum "yarn.lock" }}
       - run: yarn install
       - save_cache:
-          key: v11-yarn-packages-{{ checksum "yarn.lock" }}
+          key: v12-yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
       - run: yarn lint
       - run: ./node_modules/.bin/prettier -l "{src,webpack,.storybook,static/i18n}/**/*.js"
       - run: yarn flow --quiet
       - run: yarn test
-      - run: yarn release
diff --git a/package.json b/package.json
index c3c03da9..82192516 100644
--- a/package.json
+++ b/package.json
@@ -35,13 +35,13 @@
     }
   },
   "dependencies": {
-    "@ledgerhq/hw-app-btc": "^4.27.0",
+    "@ledgerhq/hw-app-btc": "^v4.30.0",
     "@ledgerhq/hw-app-eth": "^4.24.0",
     "@ledgerhq/hw-app-xrp": "^4.25.0",
     "@ledgerhq/hw-transport": "^4.24.0",
     "@ledgerhq/hw-transport-node-hid": "4.24.0",
-    "@ledgerhq/ledger-core": "2.0.0-rc.11",
-    "@ledgerhq/live-common": "4.4.2",
+    "@ledgerhq/ledger-core": "2.0.0-rc.12",
+    "@ledgerhq/live-common": "4.6.0",
     "animated": "^0.2.2",
     "async": "^2.6.1",
     "axios": "^0.18.0",
diff --git a/scripts/cli/cli.sh b/scripts/cli/cli.sh
index 3484d589..93a96030 100644
--- a/scripts/cli/cli.sh
+++ b/scripts/cli/cli.sh
@@ -6,4 +6,4 @@ export LEDGER_LOGS_DIRECTORY="$LEDGER_DATA_DIR/logs"
 export LEDGER_LIVE_SQLITE_PATH="$LEDGER_DATA_DIR/sqlite"
 export CLI=1
 
-node -r @babel/register scripts/cli/txBetweenAccounts.js
+node -r @babel/register -r @babel/polyfill scripts/cli/txBetweenAccounts.js
diff --git a/scripts/cli/txBetweenAccounts.js b/scripts/cli/txBetweenAccounts.js
index bc7522ff..e6838653 100644
--- a/scripts/cli/txBetweenAccounts.js
+++ b/scripts/cli/txBetweenAccounts.js
@@ -4,17 +4,15 @@ import chalk from 'chalk'
 import path from 'path'
 import fs from 'fs'
 import inquirer from 'inquirer'
-import { createAccountModel } from '@ledgerhq/live-common/lib/models/account'
-import { formatCurrencyUnit } from '@ledgerhq/live-common/lib/helpers/currencies'
+import { formatCurrencyUnit } from '@ledgerhq/live-common/lib/currencies'
 
 import 'globals'
 import withLibcore from 'helpers/withLibcore'
+import accountModel from 'helpers/accountModel'
 import { doSignAndBroadcast } from 'commands/libcoreSignAndBroadcast'
 
 import getDevice from './getDevice'
 
-const accountModel = createAccountModel()
-
 async function main() {
   try {
     // GET ACCOUNTS
diff --git a/src/actions/settings.js b/src/actions/settings.js
index afd189d4..dae9f335 100644
--- a/src/actions/settings.js
+++ b/src/actions/settings.js
@@ -15,6 +15,7 @@ export const setDeveloperMode = (developerMode: boolean) => saveSettings({ devel
 export const setSentryLogs = (sentryLogs: boolean) => saveSettings({ sentryLogs })
 export const setShareAnalytics = (shareAnalytics: boolean) => saveSettings({ shareAnalytics })
 export const setMarketIndicator = (marketIndicator: *) => saveSettings({ marketIndicator })
+export const setAutoLockTimeout = (autoLockTimeout: *) => saveSettings({ autoLockTimeout })
 export const setCounterValue = (counterValue: string) =>
   saveSettings({
     counterValue,
diff --git a/src/commands/libcoreSignAndBroadcast.js b/src/commands/libcoreSignAndBroadcast.js
index e91d35a9..c9413694 100644
--- a/src/commands/libcoreSignAndBroadcast.js
+++ b/src/commands/libcoreSignAndBroadcast.js
@@ -115,6 +115,9 @@ async function signTransaction({
     if (blockHeight >= 419200) {
       additionals.push('sapling')
     }
+  } else if (currency.id === 'decred') {
+    expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00])
+    additionals.push('decred')
   }
   const rawInputs = transaction.getInputs()
 
@@ -129,6 +132,7 @@ async function signTransaction({
         true, // set to true allow both segwit AND non-segwit
         hasTimestamp,
         hasExtraData,
+        additionals,
       )
       const outputIndex = input.getPreviousOutputIndex()
       const sequence = input.getSequence()
diff --git a/src/components/CurrencyDownStatusAlert.js b/src/components/CurrencyDownStatusAlert.js
index e39a5ff7..8271e96c 100644
--- a/src/components/CurrencyDownStatusAlert.js
+++ b/src/components/CurrencyDownStatusAlert.js
@@ -5,7 +5,6 @@ import { translate } from 'react-i18next'
 import styled from 'styled-components'
 import { connect } from 'react-redux'
 import { createStructuredSelector } from 'reselect'
-import type { CryptoCurrency } from '@ledgerhq/live-common/lib/types'
 
 import type { CurrencyStatus } from 'reducers/currenciesStatus'
 import { currencyDownStatus } from 'reducers/currenciesStatus'
diff --git a/src/components/EnsureDeviceApp.js b/src/components/EnsureDeviceApp.js
index 1d300a98..e742a663 100644
--- a/src/components/EnsureDeviceApp.js
+++ b/src/components/EnsureDeviceApp.js
@@ -77,7 +77,7 @@ class EnsureDeviceApp extends Component<{
     const cur = account ? account.currency : currency
     invariant(cur, 'No currency given')
     return (
-      <Trans i18nKey="deviceConnect.step2.open" parent="div">
+      <Trans i18nKey="deviceConnect.step2" parent="div">
         {'Open the '}
         <Bold>{cur.managerAppName}</Bold>
         {' app on your device'}
@@ -97,7 +97,7 @@ class EnsureDeviceApp extends Component<{
           {
             id: 'device',
             title: (
-              <Trans i18nKey="deviceConnect.step1.connect" parent="div">
+              <Trans i18nKey="deviceConnect.step1" parent="div">
                 {'Connect and unlock your '}
                 <Bold>{'Ledger device'}</Bold>
               </Trans>
diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js
index 325f9dfa..aef771e9 100644
--- a/src/components/GenuineCheck.js
+++ b/src/components/GenuineCheck.js
@@ -124,7 +124,7 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'device',
         title: (
-          <Trans i18nKey="deviceConnect.step1.connect" parent="div">
+          <Trans i18nKey="deviceConnect.step1" parent="div">
             {'Connect and unlock your '}
             <Bold>{'Ledger device'}</Bold>
           </Trans>
@@ -135,10 +135,10 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'deviceInfo',
         title: (
-          <Trans i18nKey="deviceConnect:dashboard.open" parent="div">
+          <Trans i18nKey="deviceConnect.step2" parent="div">
             {'Navigate to the '}
             <Bold>{'dashboard'}</Bold>
-            {' on your device'}
+            {' app on your device'}
           </Trans>
         ),
         icon: homeIcon,
@@ -147,7 +147,7 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'isGenuine',
         title: (
-          <Trans i18nKey="deviceConnect:stepGenuine.open" parent="div">
+          <Trans i18nKey="deviceConnect.step3" parent="div">
             {'Allow '}
             <Bold>{'Ledger Manager'}</Bold>
             {' on your device'}
diff --git a/src/components/Idler.js b/src/components/Idler.js
new file mode 100644
index 00000000..12444110
--- /dev/null
+++ b/src/components/Idler.js
@@ -0,0 +1,66 @@
+// @flow
+
+import { PureComponent } from 'react'
+import { createStructuredSelector } from 'reselect'
+import { connect } from 'react-redux'
+import { hasPasswordSelector, autoLockTimeoutSelector } from 'reducers/settings'
+import debounce from 'lodash/debounce'
+import { lock } from 'reducers/application'
+
+type Props = {
+  autoLockTimeout: number,
+  hasPassword: boolean,
+  lock: Function,
+}
+
+const mapStateToProps = createStructuredSelector({
+  autoLockTimeout: autoLockTimeoutSelector,
+  hasPassword: hasPasswordSelector,
+})
+
+const mapDispatchToProps = {
+  lock,
+}
+
+class Idler extends PureComponent<Props> {
+  componentDidMount() {
+    window.addEventListener('keydown', this.debounceOnChange)
+    window.addEventListener('mouseover', this.debounceOnChange)
+    this.interval = setInterval(this.checkForAutoLock, 10000)
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('keydown', this.debounceOnChange)
+    window.removeEventListener('mouseover', this.debounceOnChange)
+    clearInterval(this.interval)
+    this.debounceOnChange.cancel()
+  }
+
+  interval: IntervalID
+
+  lastAction: number = -1
+
+  debounceOnChange = debounce(_ => this.idleTimeHandler(), 1000)
+
+  checkForAutoLock = _ => {
+    const timeout = this.props.autoLockTimeout
+    if (this.props.hasPassword && timeout && timeout !== -1) {
+      if (Date.now() - (this.lastAction + timeout * 60000) > 0) {
+        this.props.lock()
+      }
+    }
+  }
+
+  idleTimeHandler = _ => {
+    this.lastAction = Date.now()
+  }
+
+  render() {
+    return null
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(Idler)
diff --git a/src/components/MainSideBar/index.js b/src/components/MainSideBar/index.js
index fbf843ed..8fa91bf5 100644
--- a/src/components/MainSideBar/index.js
+++ b/src/components/MainSideBar/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 import React, { PureComponent } from 'react'
-import { translate } from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import { connect } from 'react-redux'
 import { compose } from 'redux'
 import { withRouter } from 'react-router'
@@ -87,13 +87,6 @@ class MainSideBar extends PureComponent<Props> {
     push(to)
   }
 
-  ADD_ACCOUNT_EMPTY_STATE = (
-    <Box relative pr={3}>
-      <img style={{ position: 'absolute', top: -10, right: 5 }} alt="" src={i('arrow-add.svg')} />
-      {this.props.t('emptyState.sidebar.text')}
-    </Box>
-  )
-
   handleClickDashboard = () => this.push('/')
   handleOpenSendModal = () => this.props.openModal(MODAL_SEND)
   handleOpenReceiveModal = () => this.props.openModal(MODAL_RECEIVE)
@@ -110,6 +103,13 @@ class MainSideBar extends PureComponent<Props> {
       <AddAccountButton tooltipText={t('addAccounts.title')} onClick={this.handleOpenImportModal} />
     )
 
+    const emptyState = (
+      <Box relative pr={3}>
+        <img style={{ position: 'absolute', top: -10, right: 5 }} alt="" src={i('arrow-add.svg')} />
+        <Trans i18nKey="emptyState.sidebar.text" />
+      </Box>
+    )
+
     return (
       <Box relative bg="white" style={{ width: 230 }}>
         <TopGradient />
@@ -168,7 +168,7 @@ class MainSideBar extends PureComponent<Props> {
           <SideBarList
             title={t('sidebar.accounts', { count: accounts.length })}
             titleRight={addAccountButton}
-            emptyState={this.ADD_ACCOUNT_EMPTY_STATE}
+            emptyState={emptyState}
           >
             {accounts.map(account => (
               <AccountListItem
diff --git a/src/components/Onboarding/helperComponents.js b/src/components/Onboarding/helperComponents.js
index c9e62747..632d79e3 100644
--- a/src/components/Onboarding/helperComponents.js
+++ b/src/components/Onboarding/helperComponents.js
@@ -69,6 +69,19 @@ export function OptionRow({ step, ...p }: { step: StepType }) {
     </Box>
   )
 }
+export function BulletRow({ step, ...p }: { step: StepType }) {
+  const { icon, desc } = step
+  return (
+    <Box horizontal my="7px">
+      <Box {...p} mr="7px">
+        {icon}
+      </Box>
+      <Box justify="center" shrink>
+        <OptionRowDesc>{desc}</OptionRowDesc>
+      </Box>
+    </Box>
+  )
+}
 export const OptionRowDesc = styled(Box).attrs({
   ff: 'Open Sans|Regular',
   fontSize: 4,
diff --git a/src/components/Onboarding/steps/SelectPIN/SelectPINnano.js b/src/components/Onboarding/steps/SelectPIN/SelectPINnano.js
index 98af5d0e..2041a11c 100644
--- a/src/components/Onboarding/steps/SelectPIN/SelectPINnano.js
+++ b/src/components/Onboarding/steps/SelectPIN/SelectPINnano.js
@@ -30,14 +30,9 @@ class SelectPINnano extends PureComponent<Props, *> {
       {
         key: 'step2',
         icon: <IconOptionRow>{'2.'}</IconOptionRow>,
-        desc: t('onboarding.selectPIN.initialize.instructions.nano.step2'),
-      },
-      {
-        key: 'step3',
-        icon: <IconOptionRow>{'3.'}</IconOptionRow>,
         desc: (
           <Box style={{ display: 'block' }}>
-            <Trans i18nKey="onboarding.selectPIN.initialize.instructions.nano.step3">
+            <Trans i18nKey="onboarding.selectPIN.initialize.instructions.nano.step2">
               {'Press the right button to select'}
               <Text ff="Open Sans|SemiBold" color="dark">
                 {'Configure as new device'}
@@ -46,6 +41,11 @@ class SelectPINnano extends PureComponent<Props, *> {
           </Box>
         ),
       },
+      {
+        key: 'step3',
+        icon: <IconOptionRow>{'3.'}</IconOptionRow>,
+        desc: t('onboarding.selectPIN.initialize.instructions.nano.step3'),
+      },
       {
         key: 'step4',
         icon: <IconOptionRow>{'4.'}</IconOptionRow>,
diff --git a/src/components/Onboarding/steps/SelectPIN/SelectPINrestoreNano.js b/src/components/Onboarding/steps/SelectPIN/SelectPINrestoreNano.js
index b0d839b4..d7e63124 100644
--- a/src/components/Onboarding/steps/SelectPIN/SelectPINrestoreNano.js
+++ b/src/components/Onboarding/steps/SelectPIN/SelectPINrestoreNano.js
@@ -30,19 +30,14 @@ class SelectPINrestoreNano extends PureComponent<Props, *> {
       {
         key: 'step2',
         icon: <IconOptionRow>{'2.'}</IconOptionRow>,
-        desc: t('onboarding.selectPIN.restore.instructions.nano.step2'),
-      },
-      {
-        key: 'step3',
-        icon: <IconOptionRow>{'3.'}</IconOptionRow>,
         desc: (
           <Box style={{ display: 'block' }}>
-            <Trans i18nKey="onboarding.selectPIN.restore.instructions.nano.step3">
+            <Trans i18nKey="onboarding.selectPIN.restore.instructions.nano.step2">
               {'Press the left button to cancel'}
               <Text ff="Open Sans|SemiBold" color="dark">
                 {'Initialize as new device?'}
               </Text>
-              {'Press the right button to select'}
+              {'Then press the right button to select'}
               <Text ff="Open Sans|SemiBold" color="dark">
                 {'Restore configuration?'}
               </Text>
@@ -50,6 +45,11 @@ class SelectPINrestoreNano extends PureComponent<Props, *> {
           </Box>
         ),
       },
+      {
+        key: 'step3',
+        icon: <IconOptionRow>{'3.'}</IconOptionRow>,
+        desc: t('onboarding.selectPIN.restore.instructions.nano.step3'),
+      },
       {
         key: 'step4',
         icon: <IconOptionRow>{'4.'}</IconOptionRow>,
diff --git a/src/components/PillsDaysCount.js b/src/components/PillsDaysCount.js
index fe3519b5..16272467 100644
--- a/src/components/PillsDaysCount.js
+++ b/src/components/PillsDaysCount.js
@@ -10,7 +10,7 @@ import Track from 'analytics/Track'
 
 type Props = {
   selected: string,
-  onChange: ({ key: string, value: *, label: string }) => *,
+  onChange: ({ key: string, value: *, label: React$Node }) => *,
   t: T,
 }
 
diff --git a/src/components/SettingsPage/PasswordAutoLockSelect.js b/src/components/SettingsPage/PasswordAutoLockSelect.js
new file mode 100644
index 00000000..556fa845
--- /dev/null
+++ b/src/components/SettingsPage/PasswordAutoLockSelect.js
@@ -0,0 +1,63 @@
+// @flow
+
+import React, { PureComponent } from 'react'
+import { translate } from 'react-i18next'
+import { createStructuredSelector } from 'reselect'
+import { connect } from 'react-redux'
+import { setAutoLockTimeout, saveSettings } from 'actions/settings'
+import Select from 'components/base/Select'
+import type { T } from 'types/common'
+import { autoLockTimeoutSelector } from 'reducers/settings'
+
+type Props = {
+  autoLockTimeout: string,
+  setAutoLockTimeout: (?number) => void,
+  t: T,
+}
+
+const mapStateToProps = createStructuredSelector({
+  autoLockTimeout: autoLockTimeoutSelector,
+})
+
+const mapDispatchToProps = {
+  saveSettings,
+  setAutoLockTimeout,
+}
+
+class PasswordAutoLockSelect extends PureComponent<Props> {
+  handleChangeTimeout = ({ value: timeoutKey }: *) => {
+    this.props.setAutoLockTimeout(+timeoutKey)
+  }
+
+  timeouts = [
+    { value: 1, label: `1 ${this.props.t('app:time.minute')}` },
+    { value: 10, label: `10 ${this.props.t('app:time.minute')}s` },
+    { value: 30, label: `30 ${this.props.t('app:time.minute')}s` },
+    { value: 60, label: `1 ${this.props.t('app:time.hour')}` },
+    { value: -1, label: this.props.t(`app:common.never`) },
+  ]
+
+  render() {
+    const { autoLockTimeout } = this.props
+    const currentTimeout = this.timeouts.find(l => l.value === autoLockTimeout)
+
+    return (
+      <Select
+        small
+        minWidth={250}
+        isSearchable={false}
+        onChange={this.handleChangeTimeout}
+        renderSelected={item => item && item.name}
+        value={currentTimeout}
+        options={this.timeouts}
+      />
+    )
+  }
+}
+
+export default translate()(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps,
+  )(PasswordAutoLockSelect),
+)
diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js
index 1a4e5a5c..9c773cd7 100644
--- a/src/components/SettingsPage/index.js
+++ b/src/components/SettingsPage/index.js
@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
-import { translate } from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import type { T } from 'types/common'
 import { Switch, Route } from 'react-router'
 import type { RouterHistory, Match, Location } from 'react-router'
@@ -15,7 +15,7 @@ import SectionDisplay from './sections/Display'
 import SectionCurrencies from './sections/Currencies'
 import SectionHelp from './sections/Help'
 import SectionAbout from './sections/About'
-import SectionTools from './sections/Tools'
+import SectionExport from './sections/Export'
 
 const mapStateToProps = state => ({
   accountsCount: accountsSelector(state).length,
@@ -40,31 +40,31 @@ class SettingsPage extends PureComponent<Props, State> {
     this._items = [
       {
         key: 'display',
-        label: props.t('settings.tabs.display'),
+        label: <Trans i18nKey="settings.tabs.display" />,
         value: SectionDisplay,
       },
       {
         key: 'currencies',
-        label: props.t('settings.tabs.currencies'),
+        label: <Trans i18nKey="settings.tabs.currencies" />,
         value: SectionCurrencies,
       },
       {
         key: 'about',
-        label: props.t('settings.tabs.about'),
+        label: <Trans i18nKey="settings.tabs.about" />,
         value: SectionAbout,
       },
       {
         key: 'help',
-        label: props.t('settings.tabs.help'),
+        label: <Trans i18nKey="settings.tabs.help" />,
         value: SectionHelp,
       },
     ]
 
     if (EXPERIMENTAL_TOOLS_SETTINGS) {
-      this._items.push({
+      this._items.splice(2, 0, {
         key: 'tool',
         label: 'Experimental Tools',
-        value: SectionTools,
+        value: SectionExport,
       })
     }
 
diff --git a/src/components/SettingsPage/sections/Display.js b/src/components/SettingsPage/sections/Display.js
index a284ba20..0335c741 100644
--- a/src/components/SettingsPage/sections/Display.js
+++ b/src/components/SettingsPage/sections/Display.js
@@ -4,7 +4,11 @@ import React, { PureComponent } from 'react'
 import { translate } from 'react-i18next'
 import { connect } from 'react-redux'
 import { createSelector } from 'reselect'
-import { langAndRegionSelector, counterValueCurrencySelector } from 'reducers/settings'
+import {
+  hasPasswordSelector,
+  langAndRegionSelector,
+  counterValueCurrencySelector,
+} from 'reducers/settings'
 import type { Currency } from '@ledgerhq/live-common/lib/types'
 import type { T } from 'types/common'
 import { EXPERIMENTAL_MARKET_INDICATOR_SETTINGS } from 'config/constants'
@@ -17,6 +21,7 @@ import CounterValueSelect from '../CounterValueSelect'
 import CounterValueExchangeSelect from '../CounterValueExchangeSelect'
 import RegionSelect from '../RegionSelect'
 import PasswordButton from '../PasswordButton'
+import PasswordAutoLockSelect from '../PasswordAutoLockSelect'
 import DevModeButton from '../DevModeButton'
 import SentryLogsButton from '../SentryLogsButton'
 import ShareAnalyticsButton from '../ShareAnalyticsButton'
@@ -32,11 +37,12 @@ type Props = {
   t: T,
   counterValueCurrency: Currency,
   useSystem: boolean,
+  hasPassword: boolean,
 }
 
 class TabGeneral extends PureComponent<Props> {
   render() {
-    const { t, useSystem, counterValueCurrency } = this.props
+    const { t, useSystem, counterValueCurrency, hasPassword } = this.props
 
     return (
       <Section>
@@ -83,6 +89,14 @@ class TabGeneral extends PureComponent<Props> {
           <Row title={t('settings.profile.password')} desc={t('settings.profile.passwordDesc')}>
             <PasswordButton />
           </Row>
+          {hasPassword ? (
+            <Row
+              title={t('app:settings.profile.passwordAutoLock')}
+              desc={t('app:settings.profile.passwordAutoLockDesc')}
+            >
+              <PasswordAutoLockSelect />
+            </Row>
+          ) : null}
           <Row
             title={t('settings.profile.reportErrors')}
             desc={t('settings.profile.reportErrorsDesc')}
@@ -109,10 +123,13 @@ export default translate()(
     createSelector(
       langAndRegionSelector,
       counterValueCurrencySelector,
-      ({ useSystem }, counterValueCurrency) => ({
+      hasPasswordSelector,
+      ({ useSystem }, counterValueCurrency, hasPassword) => ({
         useSystem,
         counterValueCurrency,
+        hasPassword,
       }),
     ),
+    null,
   )(TabGeneral),
 )
diff --git a/src/components/SettingsPage/sections/Export.js b/src/components/SettingsPage/sections/Export.js
new file mode 100644
index 00000000..17932932
--- /dev/null
+++ b/src/components/SettingsPage/sections/Export.js
@@ -0,0 +1,148 @@
+// @flow
+
+import React, { PureComponent } from 'react'
+import { Trans, translate } from 'react-i18next'
+
+import type { T } from 'types/common'
+
+import TrackPage from 'analytics/TrackPage'
+import styled from 'styled-components'
+import { SettingsSection as Section, SettingsSectionHeader as Header } from '../SettingsSection'
+import IconShare from '../../../icons/Share'
+import Button from '../../base/Button'
+import Modal, { ModalBody, ModalContent, ModalFooter, ModalTitle } from '../../base/Modal'
+import Box from '../../base/Box'
+import QRCodeExporter from '../../QRCodeExporter'
+import { BulletRow } from '../../Onboarding/helperComponents'
+import Text from '../../base/Text'
+
+const BulletRowIcon = styled(Box).attrs({
+  ff: 'Rubik|Regular',
+  fontSize: 10,
+  textAlign: 'center',
+  color: 'wallet',
+  pl: 2,
+})`
+  background-color: rgba(100, 144, 241, 0.1);
+  border-radius: 12px;
+  display: inline-flex;
+  height: 18px;
+  width: 18px;
+  padding: 0px;
+  padding-top: 2px;
+`
+
+type Props = {
+  t: T,
+}
+
+type State = {
+  isModalOpened: boolean,
+}
+
+class SectionExport extends PureComponent<Props, State> {
+  state = {
+    isModalOpened: false,
+  }
+
+  onModalOpen = () => {
+    this.setState({ isModalOpened: true })
+  }
+
+  onModalClose = () => {
+    this.setState({ isModalOpened: false })
+  }
+
+  renderModal = ({ onClose }: any) => {
+    const { t } = this.props
+    const stepsImportMobile = [
+      {
+        key: 'step1',
+        icon: <BulletRowIcon>{'1'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step1">
+              {'Tap the'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'+'}
+              </Text>
+              {'button in Accounts'}
+            </Trans>
+          </Box>
+        ),
+      },
+      {
+        key: 'step2',
+        icon: <BulletRowIcon>{'2'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step2">
+              {'Tap'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'Import desktop accounts'}
+              </Text>
+            </Trans>
+          </Box>
+        ),
+      },
+      {
+        key: 'step3',
+        icon: <BulletRowIcon>{'3'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step3" />
+          </Box>
+        ),
+      },
+    ]
+
+    return (
+      <ModalBody onClose={onClose}>
+        <ModalTitle>{t('settings.export.modal.title')}</ModalTitle>
+        <ModalContent flow={2} justify="center" align="center">
+          <Box flow={2}>
+            <QRCodeExporter size={330} />
+          </Box>
+          <Box shrink style={{ width: 330, fontSize: 13, marginTop: 20 }}>
+            <Text ff="Open Sans|SemiBold" color="dark">
+              {t('settings.export.modal.listTitle')}
+            </Text>
+          </Box>
+          <Box style={{ width: 330 }}>
+            {stepsImportMobile.map(step => <BulletRow key={step.key} step={step} />)}
+          </Box>
+        </ModalContent>
+        <ModalFooter horizontal align="center" justify="flex-end" flow={2}>
+          <Button small onClick={onClose} primary>
+            {t('settings.export.modal.button')}
+          </Button>
+        </ModalFooter>
+      </ModalBody>
+    )
+  }
+
+  render() {
+    const { t } = this.props
+    const { isModalOpened } = this.state
+
+    return (
+      <Section style={{ flowDirection: 'column' }}>
+        <TrackPage category="Settings" name="Export" />
+
+        <Header
+          icon={<IconShare size={16} />}
+          title={t('settings.tabs.export')}
+          desc={t('settings.export.desc')}
+          renderRight={
+            <Button small onClick={this.onModalOpen} primary>
+              {t('settings.export.button')}
+            </Button>
+          }
+        />
+        <Modal isOpened={isModalOpened} onClose={this.onModalClose} render={this.renderModal} />
+      </Section>
+    )
+  }
+}
+
+export default translate()(SectionExport)
diff --git a/src/components/SettingsPage/sections/Tools.js b/src/components/SettingsPage/sections/Tools.js
deleted file mode 100644
index 23192ed1..00000000
--- a/src/components/SettingsPage/sections/Tools.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// @flow
-
-/* eslint-disable react/jsx-no-literals */
-
-import React, { PureComponent } from 'react'
-import liveCommonPkg from '@ledgerhq/live-common/package.json'
-import { translate } from 'react-i18next'
-import Box, { Card } from 'components/base/Box'
-import Modal, { ModalBody, ModalContent, ModalTitle } from 'components/base/Modal'
-import Button from 'components/base/Button'
-import QRCodeExporter from 'components/QRCodeExporter'
-
-class TabProfile extends PureComponent<*, *> {
-  state = {
-    qrcodeMobileExportModal: false,
-  }
-
-  onQRCodeMobileExport = () => {
-    this.setState({ qrcodeMobileExportModal: true })
-  }
-
-  onRequestClose = () => {
-    this.setState({ qrcodeMobileExportModal: false })
-  }
-
-  renderQRCodeModal = ({ onClose }: any) => (
-    <ModalBody onClose={onClose} justify="center" align="center">
-      <ModalTitle>{'QRCode Mobile Export'}</ModalTitle>
-      <ModalContent flow={2}>
-        <Box>Scan this animated QRCode with Ledger Live Mobile App</Box>
-        <Box flow={2}>
-          <QRCodeExporter />
-        </Box>
-        <Box style={{ textAlign: 'right' }}>{liveCommonPkg.version}</Box>
-      </ModalContent>
-    </ModalBody>
-  )
-
-  render() {
-    const { qrcodeMobileExportModal } = this.state
-    return (
-      <Card flow={3}>
-        <Box horizontal>
-          <Button small onClick={this.onQRCodeMobileExport} primary>
-            QRCode Mobile Export
-          </Button>
-
-          <Modal
-            isOpened={qrcodeMobileExportModal}
-            onClose={this.onRequestClose}
-            render={this.renderQRCodeModal}
-          />
-        </Box>
-      </Card>
-    )
-  }
-}
-
-export default translate()(TabProfile)
diff --git a/src/components/base/Pills/index.js b/src/components/base/Pills/index.js
index b32e4456..d6bdb62b 100644
--- a/src/components/base/Pills/index.js
+++ b/src/components/base/Pills/index.js
@@ -8,7 +8,7 @@ import Box, { Tabbable } from 'components/base/Box'
 import BoldToggle from 'components/base/BoldToggle'
 
 type Item = {
-  label: string,
+  label: React$Node,
   key: string,
   value?: any,
 }
diff --git a/src/components/layout/Default.js b/src/components/layout/Default.js
index ca47557f..f79744ac 100644
--- a/src/components/layout/Default.js
+++ b/src/components/layout/Default.js
@@ -14,6 +14,7 @@ import * as modals from 'components/modals'
 import Box from 'components/base/Box'
 import GrowScroll from 'components/base/GrowScroll'
 import Track from 'analytics/Track'
+import Idler from 'components/Idler'
 
 import AccountPage from 'components/AccountPage'
 import DashboardPage from 'components/DashboardPage'
@@ -88,6 +89,7 @@ class Default extends Component<Props> {
         {process.platform === 'darwin' && <AppRegionDrag />}
         <ExportLogsBtn hookToShortcut />
         <Track mandatory onMount event="App Starts" />
+        <Idler />
 
         <IsUnlocked>
           <OnboardingOrElse>
diff --git a/src/components/modals/AddAccounts/index.js b/src/components/modals/AddAccounts/index.js
index a9f8fff9..e6edd600 100644
--- a/src/components/modals/AddAccounts/index.js
+++ b/src/components/modals/AddAccounts/index.js
@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
-import { translate } from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import { createStructuredSelector } from 'reselect'
 
 import Track from 'analytics/Track'
@@ -30,7 +30,7 @@ import StepConnectDevice, { StepConnectDeviceFooter } from './steps/02-step-conn
 import StepImport, { StepImportFooter } from './steps/03-step-import'
 import StepFinish, { StepFinishFooter } from './steps/04-step-finish'
 
-const createSteps = ({ t }: { t: T }) => {
+const createSteps = () => {
   const onBack = ({ transitionTo, resetScanState }: StepProps) => {
     resetScanState()
     transitionTo('chooseCurrency')
@@ -38,7 +38,7 @@ const createSteps = ({ t }: { t: T }) => {
   return [
     {
       id: 'chooseCurrency',
-      label: t('addAccounts.breadcrumb.informations'),
+      label: <Trans i18nKey="addAccounts.breadcrumb.informations" />,
       component: StepChooseCurrency,
       footer: StepChooseCurrencyFooter,
       onBack: null,
@@ -46,7 +46,7 @@ const createSteps = ({ t }: { t: T }) => {
     },
     {
       id: 'connectDevice',
-      label: t('addAccounts.breadcrumb.connectDevice'),
+      label: <Trans i18nKey="addAccounts.breadcrumb.connectDevice" />,
       component: StepConnectDevice,
       footer: StepConnectDeviceFooter,
       onBack,
@@ -54,7 +54,7 @@ const createSteps = ({ t }: { t: T }) => {
     },
     {
       id: 'import',
-      label: t('addAccounts.breadcrumb.import'),
+      label: <Trans i18nKey="addAccounts.breadcrumb.import" />,
       component: StepImport,
       footer: StepImportFooter,
       onBack,
@@ -62,7 +62,7 @@ const createSteps = ({ t }: { t: T }) => {
     },
     {
       id: 'finish',
-      label: t('addAccounts.breadcrumb.finish'),
+      label: <Trans i18nKey="addAccounts.breadcrumb.finish" />,
       component: StepFinish,
       footer: StepFinishFooter,
       onBack: null,
@@ -72,7 +72,6 @@ const createSteps = ({ t }: { t: T }) => {
 }
 
 type Props = {
-  t: T,
   device: ?Device,
   existingAccounts: Account[],
   closeModal: string => void,
@@ -143,7 +142,7 @@ const INITIAL_STATE = {
 
 class AddAccounts extends PureComponent<Props, State> {
   state = INITIAL_STATE
-  STEPS = createSteps({ t: this.props.t })
+  STEPS = createSteps()
 
   handleClickAdd = async () => {
     const { addAccount } = this.props
@@ -205,7 +204,7 @@ class AddAccounts extends PureComponent<Props, State> {
   }
 
   render() {
-    const { t, device, existingAccounts } = this.props
+    const { device, existingAccounts } = this.props
     const {
       stepId,
       currency,
@@ -238,6 +237,7 @@ class AddAccounts extends PureComponent<Props, State> {
       onGoStep1: this.onGoStep1,
       editedNames,
     }
+    const title = <Trans i18nKey="addAccounts.title" />
 
     return (
       <Modal
@@ -247,7 +247,7 @@ class AddAccounts extends PureComponent<Props, State> {
         render={({ onClose }) => (
           <Stepper
             key={reset} // THIS IS A HACK because stepper is not controllable. FIXME
-            title={t('addAccounts.title')}
+            title={title}
             initialStepId="chooseCurrency"
             onStepChange={this.handleStepChange}
             onClose={onClose}
diff --git a/src/components/modals/Receive/index.js b/src/components/modals/Receive/index.js
index 9dfaeea7..c0beab10 100644
--- a/src/components/modals/Receive/index.js
+++ b/src/components/modals/Receive/index.js
@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
-import { translate } from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import { createStructuredSelector } from 'reselect'
 
 import SyncSkipUnderPriority from 'components/SyncSkipUnderPriority'
@@ -58,23 +58,23 @@ export type StepProps = DefaultStepProps & {
   onChangeAddressVerified: (?boolean, ?Error) => void,
 }
 
-const createSteps = ({ t }: { t: T }) => [
+const createSteps = () => [
   {
     id: 'account',
-    label: t('receive.steps.chooseAccount.title'),
+    label: <Trans i18nKey="receive.steps.chooseAccount.title" />,
     component: StepAccount,
     footer: StepAccountFooter,
   },
   {
     id: 'device',
-    label: t('receive.steps.connectDevice.title'),
+    label: <Trans i18nKey="receive.steps.connectDevice.title" />,
     component: StepConnectDevice,
     footer: StepConnectDeviceFooter,
     onBack: ({ transitionTo }: StepProps) => transitionTo('account'),
   },
   {
     id: 'confirm',
-    label: t('receive.steps.confirmAddress.title'),
+    label: <Trans i18nKey="receive.steps.confirmAddress.title" />,
     footer: StepConfirmAddressFooter,
     component: StepConfirmAddress,
     onBack: ({ transitionTo }: StepProps) => transitionTo('device'),
@@ -82,7 +82,7 @@ const createSteps = ({ t }: { t: T }) => [
   },
   {
     id: 'receive',
-    label: t('receive.steps.receiveFunds.title'),
+    label: <Trans i18nKey="receive.steps.receiveFunds.title" />,
     component: StepReceiveFunds,
     shouldPreventClose: ({ isAddressVerified }: StepProps) => isAddressVerified === null,
   },
@@ -108,7 +108,7 @@ const INITIAL_STATE = {
 
 class ReceiveModal extends PureComponent<Props, State> {
   state = INITIAL_STATE
-  STEPS = createSteps({ t: this.props.t })
+  STEPS = createSteps()
 
   handleBeforeOpenModal = ({ data }) => {
     const { account } = this.state
diff --git a/src/components/modals/Receive/steps/01-step-account.js b/src/components/modals/Receive/steps/01-step-account.js
index ae3b70a3..e45cc9e1 100644
--- a/src/components/modals/Receive/steps/01-step-account.js
+++ b/src/components/modals/Receive/steps/01-step-account.js
@@ -9,6 +9,7 @@ import Button from 'components/base/Button'
 import SelectAccount from 'components/SelectAccount'
 import CurrencyDownStatusAlert from 'components/CurrencyDownStatusAlert'
 
+import { Trans } from 'react-i18next'
 import type { StepProps } from '../index'
 
 export default function StepAccount({ t, account, onChangeAccount }: StepProps) {
@@ -23,10 +24,10 @@ export default function StepAccount({ t, account, onChangeAccount }: StepProps)
   )
 }
 
-export function StepAccountFooter({ t, transitionTo, account }: StepProps) {
+export function StepAccountFooter({ transitionTo, account }: StepProps) {
   return (
     <Button disabled={!account} primary onClick={() => transitionTo('device')}>
-      {t('common.continue')}
+      <Trans i18nKey="common.continue" />
     </Button>
   )
 }
diff --git a/src/components/modals/Receive/steps/02-step-connect-device.js b/src/components/modals/Receive/steps/02-step-connect-device.js
index f0bed7c8..7f8acd06 100644
--- a/src/components/modals/Receive/steps/02-step-connect-device.js
+++ b/src/components/modals/Receive/steps/02-step-connect-device.js
@@ -1,6 +1,7 @@
 // @flow
 
 import React, { Fragment } from 'react'
+import { Trans } from 'react-i18next'
 
 import Box from 'components/base/Box'
 import Button from 'components/base/Button'
@@ -42,7 +43,7 @@ export function StepConnectDeviceFooter({
         {t('receive.steps.connectDevice.withoutDevice')}
       </Button>
       <Button disabled={!isAppOpened} primary onClick={() => transitionTo('confirm')}>
-        {t('common.continue')}
+        <Trans i18nKey="common.continue" />
       </Button>
     </Box>
   )
diff --git a/src/components/modals/Send/index.js b/src/components/modals/Send/index.js
index cd7b122a..6ed05d4c 100644
--- a/src/components/modals/Send/index.js
+++ b/src/components/modals/Send/index.js
@@ -4,7 +4,7 @@ import React, { PureComponent } from 'react'
 import invariant from 'invariant'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
-import { translate } from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import { createStructuredSelector } from 'reselect'
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 
@@ -72,29 +72,29 @@ export type StepProps<Transaction> = DefaultStepProps & {
   signTransaction: ({ transitionTo: string => void }) => void,
 }
 
-const createSteps = ({ t }: { t: T }) => [
+const createSteps = () => [
   {
     id: 'amount',
-    label: t('send.steps.amount.title'),
+    label: <Trans i18nKey="send.steps.amount.title" />,
     component: StepAmount,
     footer: StepAmountFooter,
   },
   {
     id: 'device',
-    label: t('send.steps.connectDevice.title'),
+    label: <Trans i18nKey="send.steps.connectDevice.title" />,
     component: StepConnectDevice,
     footer: StepConnectDeviceFooter,
     onBack: ({ transitionTo }) => transitionTo('amount'),
   },
   {
     id: 'verification',
-    label: t('send.steps.verification.title'),
+    label: <Trans i18nKey="send.steps.verification.title" />,
     component: StepVerification,
     shouldPreventClose: true,
   },
   {
     id: 'confirmation',
-    label: t('send.steps.confirmation.title'),
+    label: <Trans i18nKey="send.steps.confirmation.title" />,
     component: StepConfirmation,
     footer: StepConfirmationFooter,
     onBack: ({ transitionTo, onRetry }) => {
@@ -136,7 +136,7 @@ class SendModal extends PureComponent<Props, State<*>> {
     }
   }
 
-  STEPS = createSteps({ t: this.props.t })
+  STEPS = createSteps()
   _signTransactionSub = null
   _isUnmounted = false
 
diff --git a/src/components/modals/Send/steps/04-step-confirmation.js b/src/components/modals/Send/steps/04-step-confirmation.js
index f39881b9..50b762cc 100644
--- a/src/components/modals/Send/steps/04-step-confirmation.js
+++ b/src/components/modals/Send/steps/04-step-confirmation.js
@@ -34,6 +34,7 @@ const Title = styled(Box).attrs({
   mt: 2,
 })`
   text-align: center;
+  word-break: break-word;
 `
 
 const Text = styled(Box).attrs({
diff --git a/src/components/modals/ShareAnalytics.js b/src/components/modals/ShareAnalytics.js
index 61d487b0..467b060d 100644
--- a/src/components/modals/ShareAnalytics.js
+++ b/src/components/modals/ShareAnalytics.js
@@ -54,10 +54,6 @@ class ShareAnalytics extends PureComponent<Props, *> {
         key: 'item9',
         desc: t('onboarding.analytics.shareAnalytics.mandatoryContextual.item9'),
       },
-      {
-        key: 'item10',
-        desc: t('onboarding.analytics.shareAnalytics.mandatoryContextual.item10'),
-      },
     ]
     return (
       <Modal
diff --git a/src/components/modals/TechnicalData.js b/src/components/modals/TechnicalData.js
index 12123ede..395cdf46 100644
--- a/src/components/modals/TechnicalData.js
+++ b/src/components/modals/TechnicalData.js
@@ -30,14 +30,6 @@ class TechnicalData extends PureComponent<Props, *> {
         key: 'item3',
         desc: t('onboarding.analytics.technicalData.mandatoryContextual.item3'),
       },
-      {
-        key: 'item4',
-        desc: t('onboarding.analytics.technicalData.mandatoryContextual.item4'),
-      },
-      {
-        key: 'item5',
-        desc: t('onboarding.analytics.technicalData.mandatoryContextual.item5'),
-      },
     ]
 
     return (
diff --git a/src/config/cryptocurrencies.js b/src/config/cryptocurrencies.js
index 4c6d1ea5..c29ccbc7 100644
--- a/src/config/cryptocurrencies.js
+++ b/src/config/cryptocurrencies.js
@@ -27,6 +27,7 @@ const supported: CryptoCurrencyIds[] = [
   'stealthcoin',
   'poswallet',
   'clubcoin',
+  'decred',
   'bitcoin_testnet',
 ]
 
diff --git a/src/main/app.js b/src/main/app.js
index 272b0e40..6d354e68 100644
--- a/src/main/app.js
+++ b/src/main/app.js
@@ -173,4 +173,9 @@ app.on('ready', async () => {
   Menu.setApplicationMenu(menu)
 
   mainWindow = await createMainWindow()
+  await clearSessionCache(mainWindow.webContents.session)
 })
+
+function clearSessionCache(session) {
+  return new Promise(r => session.clearCache(r))
+}
diff --git a/src/reducers/settings.js b/src/reducers/settings.js
index 4ef84c24..2fb056de 100644
--- a/src/reducers/settings.js
+++ b/src/reducers/settings.js
@@ -38,6 +38,7 @@ export type SettingsState = {
   region: ?string,
   orderAccounts: string,
   hasPassword: boolean,
+  autoLockTimeout: number,
   selectedTimeRange: TimeRange,
   marketIndicator: 'eastern' | 'western',
   currenciesSettings: {
@@ -66,6 +67,7 @@ const INITIAL_STATE: SettingsState = {
   region: null,
   orderAccounts: 'balance|asc',
   hasPassword: false,
+  autoLockTimeout: 10,
   selectedTimeRange: 'month',
   marketIndicator: 'western',
   currenciesSettings: {},
@@ -229,6 +231,7 @@ export const exchangeSettingsForAccountSelector: ESFAS = createSelector(
 
 export const marketIndicatorSelector = (state: State) => state.settings.marketIndicator
 export const sentryLogsSelector = (state: State) => state.settings.sentryLogs
+export const autoLockTimeoutSelector = (state: State) => state.settings.autoLockTimeout
 export const shareAnalyticsSelector = (state: State) => state.settings.shareAnalytics
 export const selectedTimeRangeSelector = (state: State) => state.settings.selectedTimeRange
 export const hasCompletedOnboardingSelector = (state: State) =>
diff --git a/src/sentry/install.js b/src/sentry/install.js
index 5d75ed47..7f2b3622 100644
--- a/src/sentry/install.js
+++ b/src/sentry/install.js
@@ -14,13 +14,17 @@ export default (Raven: any, shouldSendCallback: () => boolean, userId: string) =
     tags: {
       git_commit: __GIT_REVISION__,
     },
+    sampleRate: 0.01,
     environment: __DEV__ ? 'development' : 'production',
     shouldSendCallback,
     ignoreErrors: [
+      'failed with status code',
       'status code 404',
       'timeout',
       'socket hang up',
-      'getaddrinfo ',
+      'getaddrinfo',
+      'could not read from HID device',
+      'ENOTFOUND',
       'ETIMEDOUT',
       'ECONNRESET',
       'ENETUNREACH',
diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json
index a6b17710..8bdd8cd5 100644
--- a/static/i18n/en/app.json
+++ b/static/i18n/en/app.json
@@ -2,16 +2,16 @@
   "common": {
     "labelYes": "Yes",
     "labelNo": "No",
+    "never": "Never",
     "apply": "Apply",
     "confirm": "Confirm",
     "cancel": "Cancel",
-    "getSupport": "Get Support",
+    "getSupport": "Get support",
     "delete": "Delete",
     "launch": "Launch",
     "continue": "Continue",
     "learnMore": "Learn more",
     "help": "Help",
-    "dismiss": "Dismiss",
     "skipThisStep": "Skip this step",
     "needHelp": "Need help?",
     "areYouSure": "Are you sure?",
@@ -38,7 +38,7 @@
     "reverify": "Re-verify",
     "verify": "Verify",
     "copy": "Copy",
-    "copyAddress": "Copy address",
+    "copyAddress": "Copy",
     "copied": "Copied",
     "addressCopied": "Address copied",
     "lockScreen": {
@@ -54,7 +54,7 @@
       "outdated": "Paused",
       "error": "Synchronization error",
       "refresh": "Refresh",
-      "ago": "Synced {{time}}"
+      "ago": "Synchronized {{time}}"
     }
   },
   "operation": {
@@ -68,6 +68,9 @@
     "week": "Week",
     "month": "Month",
     "year": "Year",
+    "minute": "Minute",
+    "second": "Second",
+    "hour": "Hour",
     "since": {
       "day": "past day",
       "week": "past week",
@@ -79,7 +82,7 @@
     "menu": "Menu",
     "accounts": "Accounts ({{count}})",
     "manager": "Manager",
-    "exchange": "Buy/Trade",
+    "exchange": "Buy crypto",
     "developer": "Dev tools"
   },
   "account": {
@@ -134,25 +137,22 @@
   "currentAddress": {
     "title": "Current address",
     "for": "Address for account <1><0>{{accountName}}</0></1>",
-    "messageIfUnverified": "Verify the address on your device for optimal security. Press the right button to confirm.",
-    "messageIfAccepted": "{{currencyName}} address confirmed. Please verify the address if you copy/paste it or if you scan the QR code.",
-    "messageIfSkipped": "Your receive address has not been confirmed on your Ledger device. Please verify your {{currencyName}} address for optimal security."
+    "messageIfUnverified": "Please verify that the Bitcoin address shown on your device matches the one on your phone",
+    "messageIfAccepted": "Address confirmed, please re-verify it if you copy/paste or scan the QR code.",
+    "messageIfSkipped": "Your {{currencyName}} address has not been confirmed on your Ledger device. Please verify it for optimal security."
   },
   "deviceConnect": {
-    "step1": {
-      "connect": "Connect and unlock your <1>Ledger device</1>"
-    },
-    "step2": {
-      "open": "Open the <1><0>{{managerAppName}}</0></1> app on your device"
-    }
+    "step1": "Connect and unlock your <1>Ledger device</1>",
+    "step2": "Navigate to the <1><0>{{managerAppName}}</0></1> app on your device",
+    "step3": "Allow <1><0>Ledger Manager</0></1> on your device"
   },
   "emptyState": {
     "sidebar": {
-      "text": "Press this button to add accounts to your portfolio"
+      "text": "Press this button to add accounts to the Portfolio"
     },
     "dashboard": {
-      "title": "Add accounts to your portfolio",
-      "desc": "Your portfolio has no accounts the first time Ledger Live is launched. Open the Manager to install apps on your Ledger device before you start adding accounts to your portfolio.",
+      "title": "Install apps or add accounts",
+      "desc": "Open the Manager to install apps or add accounts if your Ledger device already has apps installed",
       "buttons": {
         "addAccount": "Add accounts",
         "installApp": "Open Manager"
@@ -161,7 +161,7 @@
   },
   "exchange": {
     "title": "Trade",
-    "desc": "Try a few trading services we've selected for you",
+    "desc": "Try a few services we've selected",
     "visitWebsite": "Visit website",
     "coinhouse": "Coinhouse is a trusted platform for individuals and institutional investors looking to analyze, acquire, sell and securely store crypto assets.",
     "changelly": "Changelly is a popular instant crypto asset exchange with 100+ coins and tokens listed.",
@@ -201,13 +201,13 @@
     "legacyUnsplitAccount": "{{accountName}} (legacy) (unsplit)",
     "unsplitAccount": "{{accountName}} (unsplit)",
     "noAccountToImport": "No existing {{currencyName}} accounts to add",
-    "success": "Account successfully added to your portfolio",
-    "success_plural": "Accounts successfully added to your portfolio",
-    "successDescription": "Your account has been created.",
-    "successDescription_plural": "Your accounts have been created.",
+    "success": "Account successfully added",
+    "success_plural": "Accounts successfully added",
+    "successDescription": "Add more accounts or return to Portfolio",
+    "successDescription_plural": "Add more accounts or return to Portfolio",
     "createNewAccount": {
-      "title": "Add a new account",
-      "noOperationOnLastAccount": "There are no transactions on your last created <1><0>{{accountName}}</0></1> account. You must first receive crypto assets on that account before you can add a new one.",
+      "title": "Add new account",
+      "noOperationOnLastAccount": "Can't add a new account before you've received on your <1><0>{{accountName}}</0></1> account",
       "noAccountToCreate": "No <1><0>{{currencyName}}</0></1> account was found to create"
     },
     "cta": {
@@ -293,7 +293,8 @@
       "confirmAddress": {
         "title": "Verification",
         "action": "Verify address on device",
-        "text": "A {{currencyName}} receive address will be displayed on your device. Carefully verify that it matches the address on your computer.",
+        "text": "Please verify that the {{currencyName}} address shown on your device matches the one on your computer"
+        ,
         "support": "Contact us"
       },
       "receiveFunds": {
@@ -307,7 +308,7 @@
     "steps": {
       "amount": {
         "title": "Details",
-        "selectAccountDebit": "Select an account to debit",
+        "selectAccountDebit": "Account to debit",
         "recipientAddress": "Recipient address",
         "amount": "Amount",
         "fees": "Network fees",
@@ -323,15 +324,15 @@
       },
       "verification": {
         "title": "Verification",
-        "warning": "Please verify all transaction details now displayed on your device\n",
-        "body": "Once verified, press the right button to confirm and sign the transaction"
+        "warning": "Please verify all transaction details on your device",
+        "body": "Confirm the transaction on your device to send it"
       },
       "confirmation": {
         "title": "Confirmation",
         "success": {
           "title": "Transaction sent",
-          "text": "The transaction has been signed and sent to the network. Your account balance will update once the blockchain has confirmed the transaction.",
-          "cta": "View operation details"
+          "text": "Your account balance will update once the blockchain has confirmed the transaction",
+          "cta": "View details"
         },
         "pending": {
           "title": "Broadcasting transaction..."
@@ -347,33 +348,48 @@
     "title": "Settings",
     "tabs": {
       "display": "General",
+      "export": "Export accounts",
       "currencies": "Currencies",
       "help": "Help",
       "about": "About"
     },
+    "export": {
+      "desc": "Import accounts on your Ledger Live Mobile app",
+      "button": "Export",
+      "modal":{
+        "button": "Done",
+        "title": "Scan to export to mobile",
+        "listTitle": "To import accounts on your Ledger Live Mobile app:",
+        "step1": "Tap the <1><0>+</0></1> button in Accounts",
+        "step2": "Tap <1><0>Import desktop accounts</0></1>",
+        "step3": "Scan until the loader hits 100%"
+      }
+    },
     "display": {
-      "desc": "Change settings that affect Ledger Live in general.",
+      "desc": "Configure general Ledger Live settings.",
       "language": "Display language",
       "languageDesc": "Set the language displayed in Ledger Live.",
       "counterValue": "Countervalue",
-      "counterValueDesc": "Choose the currency to display next to your balance and operations.",
+      "counterValueDesc": "Choose the currency shown next to your balance and operations.",
       "exchange": "Rate provider",
-      "exchangeDesc": "Choose the provider of the exchange rate from Bitcoin to {{fiat}}. The value of crypto assets is first calculated in Bitcoin, before being converted to {{fiat}} (crypto asset → BTC → {{fiat}}).",
+      "exchangeDesc": "Provides the exchange rate from Bitcoin to {{fiat}}, used to estimate the value of your crypto assets (crypto asset → BTC → {{fiat}}).",
       "region": "Region",
-      "regionDesc": "Choose the region in which you’re located to set the Ledger Live's time zone.",
+      "regionDesc": "Choose your region, used to set Ledger Live's time zone.",
       "stock": "Regional market indicator",
-      "stockDesc": "Choose Western to display an increase in market value in green. Choose Eastern to display an increase in market value in red."
+      "stockDesc": "Choose Western to display an increase in market value in blue or Eastern to display it in red."
     },
     "currencies": {
       "desc": "Select a crypto asset to edit its settings.",
       "exchange": "Rate provider ({{ticker}} → BTC)",
-      "exchangeDesc": "Choose the provider of the rate between {{currencyName}} and Bitcoin. The indicative total value of your portfolio is calculated by converting your {{currencyName}} to Bitcoin, which is then converted to your base currency.",
+      "exchangeDesc": "Choose the provider of the exchange rate from {{currencyName}} to Bitcoin, used to estimate the value of your crypto assets ({{currencyName}} → BTC → {{fiat}}).",
       "confirmationsNb": "Number of confirmations",
       "confirmationsNbDesc": "Set the number of network confirmations for a transaction to be marked as confirmed."
     },
     "profile": {
       "password": "Password lock",
       "passwordDesc": "Set a password to prevent unauthorized access to Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.",
+      "passwordAutoLock": "Auto-lock",
+      "passwordAutoLockDesc": "Optional, how long should the app be idle before it locks itself.",
       "changePassword": "Change password",
       "softResetTitle": "Clear cache",
       "softResetDesc": "Clear the Ledger Live cache to force resynchronization with the blockchain.",
@@ -382,35 +398,35 @@
       "hardResetDesc": "Erase all Ledger Live data stored on your computer, including your accounts, transaction history and settings.",
       "hardReset": "Reset",
       "developerMode": "Developer mode",
-      "developerModeDesc": "Show developer apps in the Manager and enable testnet apps.",
+      "developerModeDesc": "Show developer and testnet apps in the Manager.",
       "analytics": "Analytics",
-      "analyticsDesc": "Enable analytics of anonymous data to help Ledger improve the user experience. This includes the operating system, language, firmware versions and the number of added accounts.",
-      "reportErrors": "Report bugs",
-      "reportErrorsDesc": "Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.",
-      "launchOnboarding": "Configure device",
-      "launchOnboardingDesc": "Securely initialize or restore a Ledger device to use with Ledger Live. Your accounts and settings are kept."
+      "analyticsDesc": "Enable analytics to help Ledger understand how to improve user experience. This includes clicks, page visits, redirections, actions (send, receive, lock, etc.), end of page scrolls, (un)installing and version of apps, app version, number of accounts, crypto assets and operations, session durations, Ledger device type and firmware.",
+      "reportErrors": "Bug reports",
+      "reportErrorsDesc": "Automatically send reports to help Ledger fix bugs.",
+      "launchOnboarding": "Device setup",
+      "launchOnboardingDesc": "Set up as new or restore a Ledger device. Accounts and settings are kept."
     },
     "about": {
-      "desc": "Information about Ledger Live, terms and conditions, and privacy policy."
+      "desc": "App information, Terms and Conditions, and Privacy Policy."
     },
     "help": {
-      "desc": "Learn about Ledger Live features or get help.",
+      "desc": "Learn more about Ledger Live or get help.",
       "version": "Version",
       "releaseNotesBtn": "Details",
       "faq": "Ledger Support",
-      "faqDesc": "A problem? Get help with Ledger Live, Ledger devices, supported crypto assets and apps.",
-      "terms": "Terms and conditions",
-      "termsDesc": "By using Ledger Live you are deemed to have accepted our terms and conditions.",
-      "privacy": "Privacy policy",
-      "privacyDesc": "Refer to our privacy policy to learn what personal data we collect, why and how we use it."
+      "faqDesc": "A problem? Get help using Ledger Live with your hardware wallet.",
+      "terms": "Terms of Use",
+      "termsDesc": "By using Ledger Live you are deemed to have accepted our Terms of Use.",
+      "privacy": "Privacy Policy",
+      "privacyDesc": "Refer to our Privacy Policy to learn what personal data we collect, why and how we use it."
     },
     "hardResetModal": {
       "title": "Reset Ledger Live",
-      "desc": "Erase all Ledger Live data stored on your computer, including your accounts, transaction history and settings. The private keys to access your crypto assets in the blockchain remain secure on your Ledger device and on your Recovery sheet."
+      "desc": "Erase all Ledger Live data stored on your computer, including your accounts, transaction history and settings? The private keys providing access to your crypto assets remain secure on your Ledger device and Recovery sheet."
     },
     "softResetModal": {
       "title": "Clear cache",
-      "desc": "Clearing the Ledger Live cache forces network resynchronization. Your settings and accounts are not affected. The private keys to access your crypto assets in the blockchain remain secure on your Ledger device and on your Recovery sheet."
+      "desc": "Clearing the cache forces network resynchronization. Your settings and accounts are preserved. The private keys providing access to your crypto assets remain secure on your Ledger device and Recovery sheet."
     },
     "resetFallbackModal": {
       "title": "User action required",
@@ -422,7 +438,7 @@
     },
     "removeAccountModal": {
       "title": "Remove account",
-      "desc": "The account will no longer be included in your portfolio. This operation does not affect your assets. Accounts can always be re-added."
+      "desc": "This will not affect your crypto assets. Accounts can always be re-added."
     },
     "openUserDataDirectory": {
       "title": "View user data",
@@ -452,13 +468,13 @@
       "subTitle": "Change your password"
     },
     "setPassword": {
-      "title": "Enable password lock",
+      "title": "Password lock",
       "subTitle": "Set a password",
       "desc": "Make sure to remember your password. Losing your password requires resetting Ledger Live and re-adding accounts."
     },
     "disablePassword": {
       "title": "Disable password lock",
-      "desc": "Ledger Live data will be stored unencrypted on your computer. This includes account names, balances, transactions and public addresses."
+      "desc": "Ledger Live data will be stored unencrypted on your computer. This includes account names, transactions and public addresses."
     }
   },
   "update": {
@@ -503,17 +519,17 @@
     "init": {
       "title": "Get started with your Ledger device",
       "newDevice": {
-        "title": "Initialize a new Ledger device"
+        "title": "Initialize as new device"
       },
       "restoreDevice": {
-        "title": "Restore a Ledger device"
+        "title": "Restore device from recovery phrase"
       },
       "initializedDevice": {
-        "title": "Use a device that's already initialized"
+        "title": "Use an initialized device"
       }
     },
     "noDevice": {
-      "title": "Do not have a Ledger device yet?",
+      "title": "Don't have a Ledger device?",
       "buyNew": {
         "title": "Buy a Ledger device"
       },
@@ -535,23 +551,23 @@
     },
     "selectPIN": {
       "disclaimer": {
-        "note1": "Choose your own PIN code, this code will unlock your device.",
-        "note2": "An 8-digit PIN code offers an optimum level of security.",
-        "note3": "Never use a device supplied with a PIN code or a 24-word recovery phrase."
+        "note1": "Always choose your own PIN code.",
+        "note2": "Use 8 digits for optimal security.",
+        "note3": "Never use a device supplied with a PIN code or a recovery phrase."
       },
       "initialize": {
         "title": "Choose your PIN code",
         "instructions": {
           "nano": {
-            "step1": "Connect the Ledger Nano S to your computer.",
-            "step2": "Press both buttons simultaneously as instructed on the screen.",
-            "step3": "Press the right button to select <1><0>Configure as new device?</0></1>",
-            "step4": "Choose a PIN code between 4 and 8 digits long, followed by the checkmark (✓)."
+            "step1": "Connect the Ledger Nano S to your computer. Press both buttons to begin.",
+            "step2": "Press the right button to select <1><0>Configure as new device?.</0></1>",
+            "step3": "Press the left or right button to select a digit. Press both buttons to validate.",
+            "step4": "Select ✓ to confirm your PIN code. Select ⬅ to erase a digit."
           },
           "blue": {
             "step1": "Connect the Ledger Blue to your computer.",
-            "step2": "Tap on <1><0>Configure as new device.</0></1>",
-            "step3": "Choose a PIN code between 4 and 8 digits long."
+            "step2": "Tap on <1><0>Configure as new device</0></1>.",
+            "step3": "Choose a PIN code of 4 to 8 digits."
           }
         }
       },
@@ -559,15 +575,15 @@
         "title": "Choose your PIN code",
         "instructions": {
           "nano": {
-            "step1": "Connect the Ledger Nano S to your computer.",
-            "step2": "Press both buttons simultaneously as instructed on the screen.",
-            "step3": "Press the left button to cancel <1><0>Initialize as new device?</0></1>. Then press the right button to select <3><0>Restore configuration?</0></3>",
-            "step4": "Choose a PIN code between 4 and 8 digits long, followed by the checkmark (✓)."
+            "step1": "Connect the Ledger Nano S to your computer. Press both buttons to begin.",
+            "step2": "Press the left button to cancel <1><0>Initialize as new device?</0></1>. Then press the right button to select <3><0>Restore configuration?</0></3>.",
+            "step3": "Press the left or right button to select a digit. Press both buttons to validate.",
+            "step4": "Select ✓ to confirm your PIN code. Select ⬅ to erase a digit."
           },
           "blue": {
             "step1": "Connect the Ledger Blue to your computer.",
             "step2": "Tap on <1><0>Restore configuration</0></1>.",
-            "step3": "Choose a PIN code between 4 and 8 digits long."
+            "step3": "Choose a PIN code of 4 to 8 digits."
           }
         }
       }
@@ -575,30 +591,30 @@
     "writeSeed": {
       "initialize": {
         "title": "Save your recovery phrase",
-        "desc": "Your device will generate a 24-word recovery phrase to back up your private keys",
+        "desc": "Your device will display a 24-word recovery phrase to back up your private keys",
         "nano": {
-          "step1": "Copy the word displayed below <1><0>Word #1</0></1> in position 1 on a blank Recovery sheet.",
-          "step2": "Press the right button to display <1><0>Word #2</0></1> and repeat the process until all 24 words are copied on the Recovery sheet.",
-          "step3": "Confirm your recovery phrase: select each requested word and press both buttons to validate it."
+          "step1": "Write <1><0>Word #1</0></1> in position 1 on a blank Recovery sheet.",
+          "step2": "Press the right button to continue and write down all 24 words.",
+          "step3": "Confirm your recovery phrase: select and validate each word by pressing both buttons."
         },
         "blue": {
-          "step1": "Copy each word of the recovery phrase on a blank Recovery sheet. Copy the words in the same order.",
-          "step2": "Tap <1><0>Next</0></1> to move to the next words. Repeat the process until the <3><0>Confirmation</0></3> screen appears.",
-          "step3": "Type each requested word to confirm your recovery phrase."
+          "step1": "Write down each word on a blank Recovery sheet while keeping the order.",
+          "step2": "Tap <1><0>Next</0></1> and write down all words until the <3><0>Confirmation</0></3> screen appears.",
+          "step3": "Enter each word to confirm your recovery phrase."
         }
       },
       "restore": {
         "title": "Enter your recovery phrase",
-        "desc": "Copy the 24-word recovery phrase from your Recovery sheet on your device.",
+        "desc": "Enter the recovery phrase saved on your Recovery sheet",
         "nano": {
-          "step1": "Select the length of your recovery phrase. Press both buttons to continue.",
-          "step2": "Select the first letters of <1><0>Word #1</0></1> by pressing the right or left button. Press both buttons to confirm each letter.",
-          "step3": "Select <1><0>Word #1</0></1> from the suggested words. Press both buttons to continue.",
+          "step1": "Choose the length of your recovery phrase.",
+          "step2": "Enter the first letters of <1><0>Word #1</0></1> until suggested words appear.",
+          "step3": "Choose <1><0>Word #1</0></1> from the suggested words by pressing both buttons.",
           "step4": "Repeat the process until the last word."
         },
         "blue": {
           "step1": "Select the length of your recovery phrase.",
-          "step2": "Type the first word of your recovery phrase. Select the word when it appears.",
+          "step2": "Type the first word of your recovery phrase. Tap the word when it appears.",
           "step3": "Repeat the process until the last word."
         }
       },
@@ -606,20 +622,20 @@
         "note1": "Carefully secure your 24-word recovery phrase out of sight.",
         "note2": "Make sure you are the sole holder of your recovery phrase.",
         "note3": "Ledger does not keep any backup of your recovery phrase.",
-        "note4": "Never use a device supplied with a recovery phrase or a PIN code."
+        "note4": "Never use a device supplied with a PIN code or a recovery phrase."
       }
     },
     "genuineCheck": {
       "title": "Security checklist",
       "descGeneric": "Before continuing, please complete the security checklist",
-      "descRestore": "Before getting started, please confirm",
+      "descRestore": "Before getting started, please confirm:",
       "step1": {
         "title": "Did you choose your PIN code by yourself?"
       },
       "step2": {
         "title": "Did you save your recovery phrase by yourself?"
       },
-      "step3": {
+      "step3":{
         "title": "Is your Ledger device genuine?"
       },
       "isGenuinePassed": "Your device is genuine",
@@ -630,19 +646,19 @@
       "errorPage": {
         "title": {
           "pinFailed": "Didn't choose your own PIN code?",
-          "recoveryPhraseFailed": "Didn't save your own recovery phrase?",
+          "recoveryPhraseFailed": "Didn't save your recovery phrase by yourself?",
           "isGenuineFail": "Oops, your device does not seem genuine..."
         },
         "desc": {
-          "pinFailed": "Never use a device supplied with a PIN code. If your device was provided with a PIN code, please contact us.",
-          "recoveryPhraseFailed": "Only save a recovery phrase that is displayed on your device. Please contact us in case of doubt. Otherwise, go back to the security checklist.",
+          "pinFailed": "Never use a device supplied with a PIN code. Please contact us when in doubt.",
+          "recoveryPhraseFailed": "Only save a recovery phrase that was displayed on your device and to you alone. Please contact us when in doubt.",
           "isGenuineFail": "Your device did not pass the authenticity test required to connect to Ledger’s secure server. Please contact Ledger Support to get assistance."
         }
       }
     },
     "setPassword": {
       "title": "Password lock (optional)",
-      "desc": "Set a password to prevent unauthorized access to Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.",
+        "desc": "Set a password to prevent unauthorized access to Ledger Live data on your computer, including account names, transactions and public addresses",
       "disclaimer": {
         "note1": "Make sure to remember your password. Do not share it.",
         "note2": "Losing your password requires resetting Ledger Live and re-adding accounts.",
@@ -650,39 +666,36 @@
       }
     },
     "analytics": {
-      "title": "Analytics and bug reports",
-      "desc": "Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.",
+      "title": "Bugs and analytics",
+      "desc": "Share anonymized data to help improve Ledger security products and services.",
       "shareAnalytics": {
-        "title": "Share analytics",
-        "desc": "Enable analytics to help Ledger understand how to improve the user experience.",
+        "title": "Analytics",
+        "desc": "Enable analytics to help Ledger understand how to improve user experience.",
         "mandatoryContextual": {
-          "item1": "In-app page visits",
-          "item2": "Actions (send, receive, lock)",
-          "item3": "Clicks",
-          "item4": "Redirections to webpages",
-          "item5": "Scrolled to end of page",
-          "item6": "Install/Uninstall",
-          "item7": "Number of accounts, currencies and operations",
+          "item1": "Clicks",
+          "item2": "In-app page visits",
+          "item3": "Redirection to webpage",
+          "item4": "Actions: send, receive, lock, etc.",
+          "item5": "End of page scroll",
+          "item6": "App (un)installation and version",
+          "item7": "Number of accounts, crypto assets and operations",
           "item8": "Overall and page session duration",
-          "item9": "Type of Ledger device",
-          "item10": "Device firmware and app version numbers"
+          "item9": "Ledger device type and firmware"
         }
       },
       "sentryLogs": {
-        "title": "Report bugs",
+        "title": "Bug reports",
         "desc": "Automatically send reports to help Ledger fix bugs."
       },
       "technicalData": {
-        "title": "Technical data *",
-        "desc": "Ledger will automatically collect technical information to get basic feedback on usage. This information is anonymous and does not contain personal data.",
+        "title": "Technical data*",
+        "desc": "Ledger will automatically collect fully anonymized technical data to help improve user experience.",
         "mandatoryText": "* mandatory",
         "mandatoryContextual": {
           "title": "Technical data",
           "item1": "Anonymous unique application ID",
-          "item2": "OS name and version",
-          "item3": "Ledger Live version",
-          "item4": "Application language or region",
-          "item5": "OS language or region"
+          "item2": "Ledger Live version, language and region",
+          "item3": "OS version, language and region"
         }
       },
       "terms": {
@@ -692,7 +705,7 @@
     },
     "finish": {
       "title": "Your device is ready!",
-      "desc": "Proceed to your portfolio and start adding your accounts...",
+      "desc": "Install some apps on your device and access the Portfolio",
       "openAppButton": "Open Ledger Live"
     }
   },
@@ -711,27 +724,27 @@
     },
     "DeviceNotGenuine": {
       "title": "Possibly not genuine",
-      "description": "Request Ledger Support assistance."
+      "description": "Request Ledger Support assistance"
     },
     "DeviceGenuineSocketEarlyClose": {
       "title": "Sorry, try again (genuine-close)",
       "description": null
     },
     "DeviceSocketFail": {
-      "title": "Oops, try again",
-      "description": "Some connection failed, so please try again."
+      "title": "Oops, connection failed",
+      "description": "Please try again"
     },
     "DeviceSocketNoBulkStatus": {
-      "title": "Oops, try again",
-      "description": "Some connection failed, so please try again."
+      "title": "Oops, connection failed",
+      "description": "Please try again"
     },
     "DeviceSocketNoHandler": {
-      "title": "Oops, try again",
-      "description": "Some connection failed, so please try again."
+      "title": "Oops, connection failed",
+      "description": "Please try again"
     },
     "DisconnectedDevice": {
-      "title": "Oops, device was disconnected",
-      "description": "The connection to the device was lost, so please try again."
+      "title": "Oops, device connection lost",
+      "description": "Please try again"
     },
     "EnpointConfig": {
       "title": "Invalid endpoint",
@@ -743,55 +756,55 @@
     },
     "HardResetFail": {
       "title": "Oops, could not reset",
-      "description": "Please retry or contact Ledger Support."
+      "description": "Please try again or contact us when in doubt"
     },
     "LatestMCUInstalledError": {
       "title": "Oops, nothing to update",
-      "description": "Needlessly tried to update the device microcontroller. Contact Ledger Support if there's a problem with your device."
+      "description": "Needlessly tried to update the device microcontroller. Please contact Ledger Support if there's a problem with your device."
     },
     "LedgerAPIError": {
       "title": "Sorry, try again (API HTTP {{status}})",
-      "description": "Interacting with Ledger's API server went wrong. Please retry."
+      "description": "Please retry. Interacting with Ledger's API server went wrong."
     },
     "LedgerAPIErrorWithMessage": {
       "title": "Oops, {{message}}",
-      "description": "Please retry or contact Ledger Support."
+      "description": "Please retry or contact Ledger Support"
     },
     "LedgerAPINotAvailable": {
       "title": "Sorry, {{currencyName}} services unavailable",
-      "description": "Please retry or contact Ledger Support."
+      "description": "Please retry or contact Ledger Support"
     },
     "ManagerAPIsFail": {
-      "title": "Oops, Manager services unavailable.",
-      "description": "Please check the network status."
+      "title": "Oops, Manager services unavailable",
+      "description": "Please check the network status"
     },
     "ManagerAppAlreadyInstalled": {
-      "title": "Oops, that's already installed.",
-      "description": "Check your device to see which apps are already installed."
+      "title": "Oops, that's already installed",
+      "description": "Check your device to see which apps are already installed"
     },
     "ManagerAppRelyOnBTC": {
       "title": "Bitcoin and Ethereum apps required",
-      "description": "Install the latest Bitcoin and Ethereum apps first."
+      "description": "Install the latest Bitcoin and Ethereum apps first"
     },
     "ManagerDeviceLocked": {
       "title": "Please unlock your device",
-      "description": "Your device was locked. Please unlock it."
+      "description": "Your device was locked, please unlock it"
     },
     "ManagerNotEnoughSpace": {
       "title": "Sorry, not enough storage left",
-      "description": "Please uninstall some apps to make space. This will not affect your crypto assets."
+      "description": "Uninstall some apps to make space. This will not affect your crypto assets."
     },
     "ManagerUninstallBTCDep": {
       "title": "Sorry, this app is required",
-      "description": "Uninstall the Bitcoin or Ethereum app last."
+      "description": "Uninstall the Bitcoin or Ethereum app last"
     },
     "NetworkDown": {
       "title": "Oops, internet seems down",
-      "description": "Please check your internet connection."
+      "description": "Please check your internet connection"
     },
     "NoAddressesFound": {
       "title": "Sorry, no accounts found",
-      "description": "Something went wrong with address calculation, try again or contact Ledger Support."
+      "description": "Something went wrong with address calculation, try again or contact Ledger Support"
     },
     "NotEnoughBalance": {
       "title": "Oops, insufficient balance",
@@ -810,22 +823,22 @@
     },
     "SelectExchangesLoadError": {
       "title": "Unable to load",
-      "description": "Can't load the exchanges"
+      "description": "Please try again later"
     },
     "TimeoutError": {
       "title": "Oops, a time out occurred",
-      "description": "It took too long for the server to respond."
+      "description": "It took too long for the server to respond, please retry"
     },
     "TimeoutTagged": {
       "title": "Oops, a time out occurred ({{tag}})",
-      "description": "It took too long for the server to respond."
+      "description": "It took too long for the server to respond"
     },
     "TransportError": {
-      "title": "Something went wrong. Please reconnect your device.",
+      "title": "Something went wrong, please reconnect your device",
       "description": "{{message}}"
     },
     "TransportStatusError": {
-      "title": "Something went wrong. Please reconnect your device.",
+      "title": "Something went wrong, please reconnect your device",
       "description": "{{message}}"
     },
     "UserRefusedFirmwareUpdate": {
@@ -834,38 +847,38 @@
     },
     "UserRefusedOnDevice": {
       "title": "Transaction refused on device",
-      "description": "Please retry or contact Ledger Support in case of doubt."
+      "description": "Please retry or contact Ledger Support in case of doubt"
     },
     "UserRefusedAddress": {
       "title": "Receive address rejected",
-      "description": "Please try again or contact Ledger Support"
+      "description": "Please try again or contact Ledger Support when in doubt"
     },
     "UpdateYourApp": {
       "title": "App update required",
       "description": "Uninstall and reinstall the {{managerAppName}} app in the Manager"
     },
     "WebsocketConnectionError": {
-      "title": "Sorry, try again (websocket error).",
+      "title": "Sorry, try again (websocket error)",
       "description": null
     },
     "WebsocketConnectionFailed": {
-      "title": "Sorry, try again (websocket failed).",
+      "title": "Sorry, try again (websocket failed)",
       "description": null
     },
     "WrongDeviceForAccount": {
-      "title": "Oops, wrong device for ‘{{accountName}}’.",
-      "description": "The connected device is not associated with the account you selected. Please connect the right device."
+      "title": "Oops, wrong device for ‘{{accountName}}’",
+      "description": "Please connect the device that manages the selected account"
     },
     "DeviceAppVerifyNotSupported": {
-      "title": "Open Manager to update this App",
-      "description": "The app verification is not supported"
+      "title": "App update required",
+      "description": "Open Manager to update the app"
     },
     "InvalidAddress": {
       "title": "This is not a valid {{currencyName}} address"
     },
     "CantOpenDevice": {
       "title": "Oops, couldn’t connect to device",
-      "description": "Device detected but connection failed. Please retry and get help if the problem persists."
+      "description": "Device detected but connection failed. Please try again or contact us if the problem persists."
     },
     "ETHAddressNonEIP": {
       "title": "Auto-verification not available: carefully verify the address",
@@ -875,7 +888,7 @@
       "title": "Couldn't scan this QR-code: auto-verification not supported by this address"
     },
     "FeeNotLoaded": {
-      "title": "Couldn’t load fee rates. Please set manual fees"
+      "title": "Couldn’t load fee rates, please set manual fees"
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5a71aaaf..9afa1d4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,6 +12,13 @@
   resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
   integrity sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=
 
+"@aeternity/ledger-app-api@0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@aeternity/ledger-app-api/-/ledger-app-api-0.0.4.tgz#79d253b46cc6b0b18ef7cb57c3684bbe7e723c51"
+  integrity sha512-aXvCJX9fdT/EJbRKBdc2mu8fvvWu80A8JyFdfvS4bsaDOGjBaIfFFYbEpxaXef8TBE5zV8u7RN1PaXDPGeDUZg==
+  dependencies:
+    "@ledgerhq/hw-transport" "^4.21.0"
+
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
@@ -1670,7 +1677,7 @@
     camelcase "^5.0.0"
     prettier "^1.13.7"
 
-"@ledgerhq/hw-app-btc@^4.24.0", "@ledgerhq/hw-app-btc@^4.27.0":
+"@ledgerhq/hw-app-btc@^4.24.0":
   version "4.27.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.27.0.tgz#11fc822bd34a47a39b1a7ae03ced69cf1d432796"
   integrity sha512-7Ck48wCBb6nd9UXarNeGOsOqbOTi2cs4AxFhbDNrVLvPiBSH0yEiNQEF95J6u5BxKkAdM1GV9LoRumR4KhZGqQ==
@@ -1686,6 +1693,14 @@
     "@ledgerhq/hw-transport" "^4.15.0"
     create-hash "^1.1.3"
 
+"@ledgerhq/hw-app-btc@^v4.30.0":
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.30.0.tgz#50cef544c361072ce12b12b1e8166d7a8b0d9dbd"
+  integrity sha512-xVXcI4cvBZiqx2o6fB+3tt0HhzJwGH17EoGP3PRJoFvIRi3Mnf3R0CU5k8Y7xFzISvmBEO2GKcetjg4dfgqDKw==
+  dependencies:
+    "@ledgerhq/hw-transport" "^4.24.0"
+    create-hash "^1.1.3"
+
 "@ledgerhq/hw-app-eth@^4.24.0":
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.24.0.tgz#b62514e0d18672d6d35d76dfbeaf93b67d2e5324"
@@ -1734,17 +1749,17 @@
   dependencies:
     events "^2.0.0"
 
-"@ledgerhq/hw-transport@^4.24.0":
+"@ledgerhq/hw-transport@^4.21.0", "@ledgerhq/hw-transport@^4.24.0":
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.24.0.tgz#8def925d8c2e1f73d15128d9e27ead729870be58"
   integrity sha512-L34TG1Ss7goRB+5BxtvBwUuu0CmDSIxS33oUqkpEy6rCs31k7XicV48iUGAnRnt8hNY2DvJ9WFyaOroUE9h6wQ==
   dependencies:
     events "^3.0.0"
 
-"@ledgerhq/ledger-core@2.0.0-rc.11":
-  version "2.0.0-rc.11"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.11.tgz#5b314e222f487dfa8f525ba1ef008ae30b289339"
-  integrity sha512-HmtUd3WrVhJQtjNe6qO/hGrnzrE2YbdaTQnLhsQyD3qN1vUwHmanHjqOqVLFRI8a3KqVdMFqYMvn3N5c0hsLuQ==
+"@ledgerhq/ledger-core@2.0.0-rc.12":
+  version "2.0.0-rc.12"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.12.tgz#bdd3e4b601acb0c74c640f40bea2609bb5e4b0f4"
+  integrity sha512-nwPAmDlGGSx/nRzwxKodmN1KBKtFmElE0FkbbAn1s0xiX6C8wMPRWPtD7oTufJ5MsfSfJg4ELsscEiaHFbZFKA==
   dependencies:
     "@ledgerhq/hw-app-btc" "^4.7.3"
     "@ledgerhq/hw-transport-node-hid" "^4.7.6"
@@ -1753,11 +1768,12 @@
     bindings "^1.3.0"
     nan "^2.6.2"
 
-"@ledgerhq/live-common@4.4.2":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.4.2.tgz#0c60efe9f13fa17c39db880ee87d68561ba54da8"
-  integrity sha512-oghcqyZY9G2xSH/PDDqTH2DZ+JLeRLEN0nEEo1t48zdXsu6LZ5ZweF8pK3jSETi+IfLYOzUuB93iJM1+AcVYAA==
+"@ledgerhq/live-common@4.6.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.6.0.tgz#d99b82123e5275affebded1001ace6e1e98d117e"
+  integrity sha512-kyKa4o7fR0DrGmu2GxlgMEkVE4aA9BJujr+q5bTpRhO5xDv2jSHT52NOPdhB6H7EfbHChaBaKv/C6wW7Q37Xyw==
   dependencies:
+    "@aeternity/ledger-app-api" "0.0.4"
     "@ledgerhq/hw-app-btc" "^4.24.0"
     "@ledgerhq/hw-app-eth" "^4.24.0"
     "@ledgerhq/hw-app-xrp" "^4.24.0"