Merge pull request #6969 from MetaMask/developv7.0.0

Master Version Bump

6 files changed, 137 insertions, 11 deletions

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index cc087867a..430d1b50c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1,4 +1,16 @@
 {
+  "shareAddress": {
+    "message": "Share Address"
+  },
+  "shareAddressToConnect": {
+    "message": "Share your address to connect to $1?"
+  },
+  "shareAddressInfo": {
+    "message": "Sharing your address with $1 will allow you to interact with this dapp. This permission is to protect your privacy by default."
+  },
+  "privacyModeDefault": {
+    "message": "Privacy Mode is now enabled by default"
+  },
   "privacyMode": {
     "message": "Privacy Mode"
   },
@@ -80,12 +92,21 @@
   "activityLog": {
     "message": "activity log"
   },
+  "add": {
+    "message": "Add"
+  },
   "address": {
     "message": "Address"
   },
   "addNetwork": {
     "message": "Add Network"
   },
+  "addRecipient": {
+    "message": "Add Recipient"
+  },
+  "addressBook": {
+    "message": "Address Book"
+  },
   "advanced": {
     "message": "Advanced"
   },
@@ -98,6 +119,18 @@
   "addCustomToken": {
     "message": "Add custom token"
   },
+  "addToAddressBook": {
+    "message": "Add to address book"
+  },
+  "addToAddressBookModalPlaceholder": {
+    "message": "e.g. John D."
+  },
+  "addAlias": {
+    "message": "Add alias"
+  },
+  "addEthAddress": {
+    "message": "Add an Ethereum address"
+  },
   "addToken": {
     "message": "Add Token"
   },
@@ -172,6 +205,18 @@
   "back": {
     "message": "Back"
   },
+  "backToAll": {
+    "message": "Back to All"
+  },
+  "backupApprovalNotice": {
+    "message": "Backup your Secret Recovery code to keep your wallet and funds secure."
+  },
+  "backupApprovalInfo": {
+    "message": "This secret code is required to recover your wallet in case you lose your device, forget your password, have to re-install MetaMask, or want to access your wallet on another device."
+  },
+  "backupNow": {
+    "message": "Backup now"
+  },
   "balance": {
     "message": "Balance"
   },
@@ -237,9 +282,15 @@
   "bytes": {
     "message": "Bytes"
   },
+  "off": {
+    "message": "Off"
+  },
   "ok": {
     "message": "Ok"
   },
+  "on": {
+    "message": "On"
+  },
   "optionalBlockExplorerUrl": {
     "message": "Block Explorer URL (optional)"
   },
@@ -348,6 +399,12 @@
   "connectToTrezor": {
     "message": "Connect to Trezor"
   },
+  "contactList": {
+    "message": "Contact List"
+  },
+  "contactListDescription": {
+    "message": "Add, edit, remove, and manage your contacts"
+  },
   "continue": {
     "message": "Continue"
   },
@@ -457,6 +514,9 @@
   "delete": {
     "message": "Delete"
   },
+  "deleteAccount": {
+    "message": "Delete Account"
+  },
   "denExplainer": {
     "message": "Your DEN is your password-encrypted storage within MetaMask."
   },
@@ -496,6 +556,9 @@
   "directDepositEtherExplainer": {
     "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit."
   },
+  "dismiss": {
+    "message": "Dismiss"
+  },
   "done": {
     "message": "Done"
   },
@@ -523,6 +586,9 @@
   "editAccountName": {
     "message": "Edit Account Name"
   },
+  "editContact":{
+    "message": "Edit Contact"
+  },
   "editingTransaction": {
     "message": "Make changes to your transaction"
   },
@@ -556,9 +622,24 @@
   "endOfFlowMessage8": {
     "message": "MetaMask cannot recover your seedphrase. Learn more."
   },
+  "endOfFlowMessage9": {
+    "message": "Learn more."
+  },
+  "endOfFlowMessage10": {
+    "message": "All Done"
+  },
   "ensNameNotFound": {
     "message": "ENS name not found"
   },
+  "ensRegistrationError": {
+    "message": "Error in ENS name registration"
+  },
+  "ensNotFoundOnCurrentNetwork": {
+    "message": "ENS name not found on the current network. Try switching to Main Ethereum Network."
+  },
+  "enterAnAlias": {
+    "message": "Enter an alias"
+  },
   "enterPassword": {
     "message": "Enter password"
   },
@@ -571,6 +652,9 @@
   "eth": {
     "message": "ETH"
   },
+  "ethereumPublicAddress": {
+    "message": "Ethereum Public Address"
+  },
   "etherscanView": {
     "message": "View account on Etherscan"
   },
@@ -881,6 +965,9 @@
   "loadingTokens": {
     "message": "Loading Tokens..."
   },
+  "loadMore": {
+    "message": "Load More"
+  },
   "localhost": {
     "message": "Localhost 8545"
   },
@@ -902,6 +989,9 @@
   "memorizePhrase": {
     "message": "Memorize this phrase."
   },
+  "memo": {
+    "message": "memo"
+  },
   "menu": {
     "message": "Menu"
   },
@@ -935,6 +1025,12 @@
   "myAccounts": {
     "message": "My Accounts"
   },
+  "myWalletAccounts": {
+    "message": "My Wallet Accounts"
+  },
+  "myWalletAccountsDescription": {
+    "message": "All of your MetaMask created accounts will automatically be added to this section."
+  },
   "mustSelectOne": {
     "message": "Must select at least 1 token."
   },
@@ -967,10 +1063,16 @@
   "newAccount": {
     "message": "New Account"
   },
+  "newAccountDetectedDialogMessage": {
+    "message": "New address detected! Click here to add to your address book."
+  },
   "newAccountNumberName": {
     "message": "Account $1",
     "description": "Default name of next account to be created on create account screen"
   },
+  "newContact": {
+    "message": "New Contact"
+  },
   "newContract": {
     "message": "New Contract"
   },
@@ -1170,7 +1272,7 @@
     "message": "Queue"
   },
   "readdToken": {
-    "message": "You can add this token back in the future by going go to “Add token” in your accounts options menu."
+    "message": "You can add this token back in the future by going to “Add token” in your accounts options menu."
   },
   "readMore": {
     "message": "Read more here."
@@ -1181,9 +1283,15 @@
   "receive": {
     "message": "Receive"
   },
+  "recents": {
+    "message": "Recents"
+  },
   "recipientAddress": {
     "message": "Recipient Address"
   },
+  "recipientAddressPlaceholder": {
+    "message": "Search, public address (0x), or ENS"
+  },
   "refundAddress": {
     "message": "Your Refund Address"
   },
@@ -1208,6 +1316,15 @@
   "resetAccountDescription": {
     "message": "Resetting your account will clear your transaction history."
   },
+  "deleteNetwork": {
+    "message": "Delete Network?"
+  },
+  "deleteNetworkDescription": {
+    "message": "Are you sure you want to delete this network?"
+  },
+  "remindMeLater": {
+    "message": "Remind me later"
+  },
   "restoreFromSeed": {
     "message": "Restore account?"
   },
@@ -1457,7 +1574,7 @@
     "message": "there can only be a space between words"
   },
   "speedUp": {
-    "message": "speed up"
+    "message": "Speed Up"
   },
   "speedUpTitle": {
     "message": "Speed Up Transaction"
@@ -1652,6 +1769,9 @@
   "transfer": {
     "message": "Transfer"
   },
+  "transferBetweenAccounts": {
+    "message": "Transfer between my accounts"
+  },
   "transferFrom": {
     "message": "Transfer From"
   },
@@ -1732,6 +1852,9 @@
   "useOldUI": {
     "message": "Use old UI"
   },
+  "userName":{
+    "message": "Username"
+  },
   "validFileImport": {
     "message": "You must select a valid file to import."
   },
@@ -1744,6 +1867,9 @@
   "viewinExplorer": {
     "message": "View in Explorer"
   },
+  "viewContact": {
+    "message": "View Contact"
+  },
   "viewOnCustomBlockExplorer": {
     "message": "View at $1"
   },
@@ -1802,6 +1928,6 @@
     "message": "MetaMask will never ask for your seed phrase!"
   },
   "zeroGasPriceOnSpeedUpError": {
-    "message":"Zero gas price on speed up"
+    "message": "Zero gas price on speed up"
   }
 }
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 06531b1dc..bf466fdc2 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1235,7 +1235,7 @@
   },
   "pending": {
     "message": "pendiente"
-  },  
+  },
   "popularTokens": {
     "message": "Tokens Corrientes"
   },
@@ -1504,7 +1504,7 @@
     "message": "Tu frase semilla privada"
   },
   "zeroGasPriceOnSpeedUpError": {
-    "message":"No hubo precio de gas al agilizar"
+    "message": "No hubo precio de gas al agilizar"
   },
   "currencyConversion": {
     "message": "Cambio de Monedas"
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index c8cde27f6..9763bd273 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -318,7 +318,7 @@
     "message": "i-click ito",
     "description": "tulad ng -i-click dito- para sa mas maraming impormasyon (kasama ng troubleTokenBalances)"
   },
-  "hide": { 
+  "hide": {
     "message": "Itago"
   },
   "hideToken": {
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index d04ba1ee7..563bae1b1 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -1145,7 +1145,7 @@
   },
   "seedPhraseAlert": {
     "message": "Opozorilo o seed phrase"
-  },  
+  },
   "select": {
     "message": "Izberi"
   },
@@ -1549,6 +1549,6 @@
     "message": "Vaš zasebni seed phrase"
   },
   "zeroGasPriceOnSpeedUpError": {
-    "message":"Ničelni gas price na pospešitvi"
+    "message": "Ničelni gas price na pospešitvi"
   }
 }
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index aee6474b6..622e0d818 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -655,5 +655,5 @@
   },
   "yourSigRequested": {
     "message": "Chữ ký của bạn đang được yêu cầu"
-   }
+  }
 }
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 18e30188e..2559fc0ad 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -651,7 +651,7 @@
     "description": "status showing that an account has been fully loaded into the keyring"
   },
   "importUsingSeed": {
-    "message": "利用助憶詞匯入帳戶" ,
+    "message": "利用助憶詞匯入帳戶",
     "description": "登入頁面下方"
   },
   "importWithSeedPhrase": {
@@ -1584,6 +1584,6 @@
     "message": "您每一次在交易時，都會看到這個圖案。"
   },
   "zeroGasPriceOnSpeedUpError": {
-    "message":"加速的 Gas 價格為 0"
+    "message": "加速的 Gas 價格為 0"
   }
 }