* origin/develop: (58 commits)
Fix site icon fallback letter (#8815)
add hover style to list-item (#8813)
Fix site icon size (#8814)
Consolidate connected account alerts (#8802)
lowercase web3
Use markdown-to-jsx@6.11.4 (#8809)
Update app/_locales/en/messages.json
Update app/_locales/en/messages.json
also remove 'dapp' from descriptions
remove all user-facing instances of 'dapp'
update button styling on home/asset page (#8800)
Fix handling of permissions of removed accounts (#8803)
Clear permssions during createNewVaultAndRestore (#8804)
Hide token transfers on ETH asset page (#8799)
Fix account name editing (#8801)
Fix connect flow account list height (#8798)
Update color of menu item icons (#8797)
Update "Connected accounts" empty description (#8796)
Stop reporting failed transactions to Sentry (#8795)
Omit state snapshot from Sentry errors (#8794)
...
"message":"MetaMask is not connected this site. To connect to a decentralized app (dapp), find the connect button on their site."
"message":"MetaMask is not connected this site. To connect to a web3 site, find the connect button on their site."
},
},
"primary":{
"currentAccountNotConnected":{
"message":"Primary"
"message":"Your current account is not connected"
},
"lastActive":{
"message":"Last active"
},
},
"switchToThisAccount":{
"switchToThisAccount":{
"message":"Switch to this account"
"message":"Switch to this account"
@ -73,12 +70,6 @@
"showIncomingTransactionsDescription":{
"showIncomingTransactionsDescription":{
"message":"Select this to use Etherscan to show incoming transactions in the transactions list"
"message":"Select this to use Etherscan to show incoming transactions in the transactions list"
},
},
"cancelling":{
"message":"Cancelling..."
},
"cancelledConnectionWithMetaMask":{
"message":"Cancelled Connection With MetaMask"
},
"chartOnlyAvailableEth":{
"chartOnlyAvailableEth":{
"message":"Chart only available on Ethereum networks."
"message":"Chart only available on Ethereum networks."
},
},
@ -88,12 +79,9 @@
"connectWithMetaMask":{
"connectWithMetaMask":{
"message":"Connect With MetaMask"
"message":"Connect With MetaMask"
},
},
"connectingWithMetaMask":{
"message":"Connecting With MetaMask..."
},
"connectTo":{
"connectTo":{
"message":"Connect to $1",
"message":"Connect to $1",
"description":"$1 is the name/origin of a site/dapp that the user can connect to metamask"
"description":"$1 is the name/origin of a web3 site/application that the user can connect to metamask"
},
},
"connectToAll":{
"connectToAll":{
"message":"Connect to all your $1",
"message":"Connect to all your $1",
@ -109,7 +97,7 @@
},
},
"connectToMultipleNumberOfAccounts":{
"connectToMultipleNumberOfAccounts":{
"message":"$1 accounts",
"message":"$1 accounts",
"description":"$1 is the number of accounts to which the site/dapp is asking to connect; this will substitute $1 in connectToMultiple"
"description":"$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
},
},
"contractInteraction":{
"contractInteraction":{
"message":"Contract Interaction"
"message":"Contract Interaction"
@ -148,6 +136,12 @@
"accountSelectionRequired":{
"accountSelectionRequired":{
"message":"You need to select an account!"
"message":"You need to select an account!"
},
},
"active":{
"message":"Active"
},
"activity":{
"message":"Activity"
},
"activityLog":{
"activityLog":{
"message":"activity log"
"message":"activity log"
},
},
@ -193,17 +187,11 @@
"alertsSettingsDescription":{
"alertsSettingsDescription":{
"message":"Enable or disable each alert"
"message":"Enable or disable each alert"
},
},
"alertSettingsSwitchToConnected":{
"message":"Opening popup with an unconnected account selected"
},
"alertSettingsSwitchToConnectedDescription":{
"message":"This alert is shown when you open the popup with an unconnected account selected."
},
"alertSettingsUnconnectedAccount":{
"alertSettingsUnconnectedAccount":{
"message":"Switching to an unconnected account"
"message":"Browsing a website with an unconnected account selected"
},
},
"alertSettingsUnconnectedAccountDescription":{
"alertSettingsUnconnectedAccountDescription":{
"message":"This alert is shown in the popup when you switch from a connected account to an unconnected account."
"message":"This alert is shown in the popup when you are browsing a connected Web3 site, but the currently selected account is not connected."
},
},
"allowOriginSpendToken":{
"allowOriginSpendToken":{
"message":"Allow $1 to spend your $2?",
"message":"Allow $1 to spend your $2?",
@ -242,6 +230,9 @@
"asset":{
"asset":{
"message":"Asset"
"message":"Asset"
},
},
"assets":{
"message":"Assets"
},
"attemptingConnect":{
"attemptingConnect":{
"message":"Attempting to connect to blockchain."
"message":"Attempting to connect to blockchain."
},
},
@ -370,7 +361,7 @@
"message":"Confirmed"
"message":"Confirmed"
},
},
"confirmPassword":{
"confirmPassword":{
"message":"Confirm Password"
"message":"Confirm password"
},
},
"confirmSecretBackupPhrase":{
"confirmSecretBackupPhrase":{
"message":"Confirm your Secret Backup Phrase"
"message":"Confirm your Secret Backup Phrase"
@ -784,10 +775,10 @@
"message":" Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts "
"message":" Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts "
},
},
"importAccountSeedPhrase":{
"importAccountSeedPhrase":{
"message":"Import an Account with Seed Phrase"
"message":"Import an account with seed phrase"
},
},
"importWallet":{
"importWallet":{
"message":"Import Wallet"
"message":"Import wallet"
},
},
"importYourExisting":{
"importYourExisting":{
"message":"Import your existing wallet using a 12 word seed phrase"
"message":"Import your existing wallet using a 12 word seed phrase"
@ -929,9 +920,6 @@
"metamaskVersion":{
"metamaskVersion":{
"message":"MetaMask Version"
"message":"MetaMask Version"
},
},
"missingYourTokens":{
"message":"Don't see your tokens?"
},
"mobileSyncText":{
"mobileSyncText":{
"message":"Please enter your password to confirm it's you!"
"message":"Please enter your password to confirm it's you!"
},
},
@ -986,7 +974,7 @@
"message":"New Contract"
"message":"New Contract"
},
},
"newPassword":{
"newPassword":{
"message":"New Password (min 8 chars)"
"message":"New password (min 8 chars)"
},
},
"newNetwork":{
"newNetwork":{
"message":"New Network"
"message":"New Network"
@ -997,9 +985,6 @@
"noAlreadyHaveSeed":{
"noAlreadyHaveSeed":{
"message":"No, I already have a seed phrase"
"message":"No, I already have a seed phrase"
},
},
"notConnected":{
"message":"Not connected"
},
"protectYourKeys":{
"protectYourKeys":{
"message":"Protect Your Keys!"
"message":"Protect Your Keys!"
},
},
@ -1015,6 +1000,9 @@
"onlyConnectTrust":{
"onlyConnectTrust":{
"message":"Only connect with sites you trust."
"message":"Only connect with sites you trust."
},
},
"onlyAddTrustedNetworks":{
"message":"A malicious Ethereum network provider can lie about the state of the blockchain and record your network activity. Only add custom networks you trust."
},
"optionalChainId":{
"optionalChainId":{
"message":"ChainID (optional)"
"message":"ChainID (optional)"
},
},
@ -1090,7 +1078,7 @@
"description":"For importing an account from a private key"
"description":"For importing an account from a private key"
},
},
"pending":{
"pending":{
"message":"pending"
"message":"Pending"
},
},
"permissionCheckedIconDescription":{
"permissionCheckedIconDescription":{
"message":"You have approved this permission"
"message":"You have approved this permission"
@ -1281,6 +1269,12 @@
"seedPhrasePlaceholder":{
"seedPhrasePlaceholder":{
"message":"Separate each word with a single space"
"message":"Separate each word with a single space"
},
},
"seedPhrasePlaceholderPaste":{
"message":"Paste seed phrase from clipboard"
},
"showSeedPhrase":{
"message":"Show seed phrase"
},
"seedPhraseReq":{
"seedPhraseReq":{
"message":"Seed phrases contain 12, 15, 18, 21, or 24 words"
"message":"Seed phrases contain 12, 15, 18, 21, or 24 words"
},
},
@ -1305,6 +1299,9 @@
"selectType":{
"selectType":{
"message":"Select Type"
"message":"Select Type"
},
},
"buy":{
"message":"Buy"
},
"send":{
"send":{
"message":"Send"
"message":"Send"
},
},
@ -1455,10 +1452,10 @@
"message":"Select the account you want to view. You can only choose one at a time."
"message":"Select the account you want to view. You can only choose one at a time."
},
},
"step3HardwareWallet":{
"step3HardwareWallet":{
"message":"3. Start using dApps and more!"
"message":"3. Start using web3 sites and more!"
},
},
"step3HardwareWalletMsg":{
"step3HardwareWalletMsg":{
"message":"Use your hardware account like you would with any Ethereum account. Connect to dApps, send ETH, buy and store ERC20 tokens and non-fungible tokens like CryptoKitties."
"message":"Use your hardware account like you would with any Ethereum account. Connect to web3 sites, send ETH, buy and store ERC20 tokens and non-fungible tokens like CryptoKitties."
},
},
"storePhrase":{
"storePhrase":{
"message":"Store this phrase in a password manager like 1Password."
"message":"Store this phrase in a password manager like 1Password."
"message":"This account is not connected. Switch to a connected account ($1)?",
"description":"$1 will be replaced by the name of the connected account"
},
"symbol":{
"symbol":{
"message":"Symbol"
"message":"Symbol"
},
},
@ -1600,6 +1587,9 @@
"transactionTime":{
"transactionTime":{
"message":"Transaction Time"
"message":"Transaction Time"
},
},
"showTransactionTimeDescription":{
"message":"Select this to display pending transaction time estimates in the activity tab while on the Main Ethereum Network. Note: estimates are approximations based on network conditions."
},
"transfer":{
"transfer":{
"message":"Transfer"
"message":"Transfer"
},
},
@ -1626,10 +1616,7 @@
"unapproved":{
"unapproved":{
"message":"Unapproved"
"message":"Unapproved"
},
},
"unconnectedAccountAlertDescription":{
"alertDisableTooltip":{
"message":"$1 is not connected to $2."
},
"unconnectedAccountAlertDisableTooltip":{
"message":"This can be changed in \"Settings > Alerts\""
"message":"This can be changed in \"Settings > Alerts\""
},
},
"units":{
"units":{
@ -1702,7 +1689,7 @@
"message":"Visit our web site"
"message":"Visit our web site"
},
},
"walletSeed":{
"walletSeed":{
"message":"Wallet Seed"
"message":"Seed phrase"
},
},
"welcomeBack":{
"welcomeBack":{
"message":"Welcome Back!"
"message":"Welcome Back!"
@ -1746,7 +1733,7 @@
},
},
"decryptMessageNotice":{
"decryptMessageNotice":{
"message":"$1 would like to read this message to complete your action",
"message":"$1 would like to read this message to complete your action",
"description":"$1 is website or dapp name"
"description":"$1 is the web3 site name"
},
},
"decryptMetamask":{
"decryptMetamask":{
"message":"Decrypt message"
"message":"Decrypt message"
@ -1766,12 +1753,6 @@
},
},
"encryptionPublicKeyNotice":{
"encryptionPublicKeyNotice":{
"message":"$1 would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.",
"message":"$1 would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.",
Mark Stacey
5 years ago
