aboutsummaryrefslogtreecommitdiffstats
path: root/app/_locales/en/messages.json
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-05-17 04:56:32 +0800
committerkumavis <aaron@kumavis.me>2018-05-17 04:56:32 +0800
commit44f31f9a7e212550914c7b354cdd8e69534990cb (patch)
treef55cd86d2c123becb2392112c2da953550e559d6 /app/_locales/en/messages.json
parent8e1cad5ff60a67117bd6802dce15345d7b2542a4 (diff)
parent76c8cb3d7b1cbd5b5a3e48fac4b08e44ad936850 (diff)
downloadtangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.gz
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.zst
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps
Diffstat (limited to 'app/_locales/en/messages.json')
-rw-r--r--app/_locales/en/messages.json13
1 files changed, 11 insertions, 2 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a40c2635c..90beda418 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -393,6 +393,9 @@
"message": "Imported",
"description": "status showing that an account has been fully loaded into the keyring"
},
+ "importUsingSeed": {
+ "message": "Import using account seed phrase"
+ },
"infoHelp": {
"message": "Info & Help"
},
@@ -632,7 +635,7 @@
"message": "Reset Account"
},
"restoreFromSeed": {
- "message": "Restore from seed phrase"
+ "message": "Restore account?"
},
"restoreVault": {
"message": "Restore Vault"
@@ -721,7 +724,7 @@
"message": "New Password (min 8 chars)"
},
"seedPhraseReq": {
- "message": "seed phrases are 12 words long"
+ "message": "Seed phrases are 12 words long"
},
"select": {
"message": "Select"
@@ -896,6 +899,9 @@
"unknownNetworkId": {
"message": "Unknown network ID"
},
+ "unlockMessage": {
+ "message": "The decentralized web awaits"
+ },
"uriErrorMsg": {
"message": "URIs require the appropriate HTTP/HTTPS prefix."
},
@@ -924,6 +930,9 @@
"warning": {
"message": "Warning"
},
+ "welcomeBack": {
+ "message": "Welcome Back!"
+ },
"welcomeBeta": {
"message": "Welcome to MetaMask Beta"
},