aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-21 04:01:08 +0800
committerkumavis <aaron@kumavis.me>2018-03-21 04:01:08 +0800
commit29cc2f8ab9628d21cc32962666879c71be4e69d1 (patch)
tree592a68784a7e8f7ee600249380fb2f4e11d1e8dd /ui/app/accounts
parent2ddc2cc1fbe5249f70d80e2a74146cb87dcc8421 (diff)
parentfd3e240dd934c0938a57344a6ae09a213aaa8e37 (diff)
downloadtangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.gz
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.bz2
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.lz
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.xz
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.zst
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
Diffstat (limited to 'ui/app/accounts')
-rw-r--r--ui/app/accounts/import/index.js6
-rw-r--r--ui/app/accounts/import/json.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js
index 98924b6d9..00b1aab8e 100644
--- a/ui/app/accounts/import/index.js
+++ b/ui/app/accounts/import/index.js
@@ -36,7 +36,7 @@ AccountImportSubview.prototype.render = function () {
h('div.new-account-import-form', [
h('.new-account-import-disclaimer', [
- h('span', 'Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts '),
+ h('span', t('importAccountMsg')),
h('span', {
style: {
cursor: 'pointer',
@@ -47,12 +47,12 @@ AccountImportSubview.prototype.render = function () {
url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
})
},
- }, 'here'),
+ }, t('here')),
]),
h('div.new-account-import-form__select-section', [
- h('div.new-account-import-form__select-label', 'Select Type'),
+ h('div.new-account-import-form__select-label', t('selectType')),
h(Select, {
className: 'new-account-import-form__select',
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index f638e07c5..326e052f2 100644
--- a/ui/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
@@ -85,7 +85,7 @@ class JsonImportSubview extends Component {
const state = this.state
if (!state) {
- const message = 'You must select a valid file to import.'
+ const message = t('validFileImport')
return this.props.displayWarning(message)
}