Merge branch 'master' into i18n

1 files changed, 18 insertions, 4 deletions

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a0c9088cb..2884392e8 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -46,6 +46,9 @@
   "balanceIsInsufficientGas": {
     "message": "Insufficient balance for current gas total"
   },
+  "beta": {
+    "message": "BETA"
+  },
   "betweenMinAndMax": {
     "message": "must be greater than or equal to $1 and less than or equal to $2.",
     "description": "helper for inputting hex as decimal input"
@@ -83,8 +86,8 @@
   "continueToCoinbase": {
     "message": "Continue to Coinbase"
   },
-  "contractPublished": {
-    "message": "Contract Published"
+  "contractDeployment": {
+    "message": "Contract Deployment"
   },
   "conversionProgress": {
     "message": "Conversion in progress"
@@ -101,8 +104,8 @@
   "copy": {
     "message": "Copy"
   },
-  "copyAddress": {
-    "message": "Copy Address to clipboard"
+  "copyToClipboard": {
+    "message": "Copy to clipboard"
   },
   "copyButton": {
     "message": " Copy "
@@ -144,6 +147,10 @@
   "depositBTC": {
     "message": "Deposit your BTC to the address below:"
   },
+  "depositCoin": {
+    "message": "Deposit your $1 to the address below",
+    "description": "Tells the user what coin they have selected to deposit with shapeshift"
+  },
   "depositEth": {
     "message": "Deposit Eth"
   },
@@ -363,6 +370,10 @@
   "newAccount": {
     "message": "New Account"
   },
+  "newAccountNumberName": {
+    "message": "Account $1",
+    "description": "Default name of next account to be created on create account screen"
+  }
   "newContract": {
     "message": "New Contract"
   },
@@ -415,6 +426,9 @@
   "pasteSeed": {
     "message": "Paste your seed phrase here!"
   },
+  "pleaseReviewTransaction": {
+    "message": "Please review your transaction."
+  },
   "privateKey": {
     "message": "Private Key",
     "description": "select this type of file to use to import an account"