From 2fd132407c565b0a6b764929c198d87150b993b5 Mon Sep 17 00:00:00 2001
From: Thibaut Boustany <thibaut@kastor.fr>
Date: Wed, 13 Jun 2018 18:34:08 +0200
Subject: [PATCH 1/2] Fix account name not showing

---
 src/components/CurrentAddress/index.js | 3 +--
 static/i18n/en/app.yml                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/CurrentAddress/index.js b/src/components/CurrentAddress/index.js
index a4529e09..8c2b9b9b 100644
--- a/src/components/CurrentAddress/index.js
+++ b/src/components/CurrentAddress/index.js
@@ -183,8 +183,7 @@ class CurrentAddress extends PureComponent<Props> {
           <Box>
             {accountName ? (
               <Trans i18nKey="app:currentAddress.for" parent="div">
-                {'Address for '}
-                <strong>{accountName}</strong>
+                Address for <strong>{accountName}</strong>
               </Trans>
             ) : (
               t('app:currentAddress.title')
diff --git a/static/i18n/en/app.yml b/static/i18n/en/app.yml
index 49deffcf..34be68fd 100644
--- a/static/i18n/en/app.yml
+++ b/static/i18n/en/app.yml
@@ -93,7 +93,7 @@ dashboard:
     balance: Balance
 currentAddress:
   title: Current address
-  for: Address for
+  for: Address for <1><0>{{accountName}}</0></1>
   message: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam blandit velit egestas leo tincidunt
 deviceConnect:
   step1:

From 9545fa31719232195b58993368b4e7ddc0e31c69 Mon Sep 17 00:00:00 2001
From: Thibaut Boustany <thibaut@kastor.fr>
Date: Thu, 14 Jun 2018 10:14:52 +0200
Subject: [PATCH 2/2] More i18n strings

---
 src/components/AdvancedOptions/BitcoinKind.js     | 2 +-
 src/components/AdvancedOptions/EthereumKind.js    | 2 +-
 src/components/AdvancedOptions/RippleKind.js      | 2 +-
 src/components/modals/AccountSettingRenderBody.js | 2 +-
 src/components/modals/Send/Footer.js              | 2 +-
 static/i18n/en/app.yml                            | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/AdvancedOptions/BitcoinKind.js b/src/components/AdvancedOptions/BitcoinKind.js
index 93de6bfd..28810fef 100644
--- a/src/components/AdvancedOptions/BitcoinKind.js
+++ b/src/components/AdvancedOptions/BitcoinKind.js
@@ -15,7 +15,7 @@ type Props = {
 }
 
 export default translate()(({ isRBF, onChangeRBF, t }: Props) => (
-  <Spoiler title="Advanced options">
+  <Spoiler title={t('app:send.steps.amount.advancedOptions')}>
     <Box horizontal align="center" flow={5}>
       <Box style={{ width: 200 }}>
         <Label>
diff --git a/src/components/AdvancedOptions/EthereumKind.js b/src/components/AdvancedOptions/EthereumKind.js
index 5126104c..0fac97b3 100644
--- a/src/components/AdvancedOptions/EthereumKind.js
+++ b/src/components/AdvancedOptions/EthereumKind.js
@@ -14,7 +14,7 @@ type Props = {
 }
 
 export default translate()(({ gasLimit, onChangeGasLimit, t }: Props) => (
-  <Spoiler title="Advanced options">
+  <Spoiler title={t('app:send.steps.amount.advancedOptions')}>
     <Box horizontal align="center" flow={5}>
       <Box style={{ width: 200 }}>
         <Label>
diff --git a/src/components/AdvancedOptions/RippleKind.js b/src/components/AdvancedOptions/RippleKind.js
index 44b3c3c0..b87cff5f 100644
--- a/src/components/AdvancedOptions/RippleKind.js
+++ b/src/components/AdvancedOptions/RippleKind.js
@@ -14,7 +14,7 @@ type Props = {
 }
 
 export default translate()(({ tag, onChangeTag, t }: Props) => (
-  <Spoiler title="Advanced options">
+  <Spoiler title={t('app:send.steps.amount.advancedOptions')}>
     <Box horizontal align="center" flow={5}>
       <Box style={{ width: 200 }}>
         <Label>
diff --git a/src/components/modals/AccountSettingRenderBody.js b/src/components/modals/AccountSettingRenderBody.js
index 66475d9a..60968fd2 100644
--- a/src/components/modals/AccountSettingRenderBody.js
+++ b/src/components/modals/AccountSettingRenderBody.js
@@ -174,7 +174,7 @@ class HelperComp extends PureComponent<Props, State> {
                 />
               </Box>
             </Container>
-            <Spoiler title="Advanced logs">
+            <Spoiler title={t('app:account.settings.advancedLogs')}>
               <textarea
                 readOnly
                 style={{
diff --git a/src/components/modals/Send/Footer.js b/src/components/modals/Send/Footer.js
index e36c3f05..a6fdcdba 100644
--- a/src/components/modals/Send/Footer.js
+++ b/src/components/modals/Send/Footer.js
@@ -95,7 +95,7 @@ class Footer extends PureComponent<
             </Box>
           )}
           <Button primary onClick={onNext} disabled={!canNext || !canBeSpent}>
-            {'Next'}
+            {t('app:common.next')}
           </Button>
         </Box>
       </ModalFooter>
diff --git a/static/i18n/en/app.yml b/static/i18n/en/app.yml
index 34be68fd..3b55c6fe 100644
--- a/static/i18n/en/app.yml
+++ b/static/i18n/en/app.yml
@@ -68,6 +68,7 @@ account:
       receiveFunds: Receive Funds
   settings:
     title: Edit Account
+    advancedLogs: Advanced logs
     accountName:
       title: Account name
       desc: Lorem ipsum dolort amet