From 930dac110aa9127380673e119b0eaab9d45b1198 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Sat, 25 Aug 2018 18:00:38 -0700 Subject: Add ActivityLog component --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 14e867b33..ad276306f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -17,6 +17,9 @@ "accountSelectionRequired": { "message": "You need to select an account!" }, + "activityLog": { + "message": "activity log" + }, "address": { "message": "Address" }, -- cgit v1.2.3 From 084158f1a2af9d117c054420e895f4ae76a94df0 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 31 Aug 2018 12:34:22 -0700 Subject: Add tests for TransactionActivityLog. Make changes to rendering events --- app/_locales/en/messages.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ad276306f..dc5f5dc58 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -860,6 +860,9 @@ "save": { "message": "Save" }, + "speedUp": { + "message": "speed up" + }, "speedUpTitle": { "message": "Speed Up Transaction" }, @@ -1088,6 +1091,24 @@ "total": { "message": "Total" }, + "transaction": { + "message": "transaction" + }, + "transactionConfirmed": { + "message": "Transaction confirmed." + }, + "transactionCreated": { + "message": "Transaction created with a value of $1." + }, + "transactionDropped": { + "message": "Transaction dropped." + }, + "transactionSubmitted": { + "message": "Transaction submitted." + }, + "transactionUpdatedGas": { + "message": "Transaction updated with a gas price of $1." + }, "transactions": { "message": "transactions" }, @@ -1134,6 +1155,9 @@ "unavailable": { "message": "Unavailable" }, + "units": { + "message": "units" + }, "unknown": { "message": "Unknown" }, -- cgit v1.2.3 From f1a309e0cc110060cc56252ec5f7626ca6403fab Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 7 Sep 2018 13:59:05 -0700 Subject: Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events --- app/_locales/en/messages.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index dc5f5dc58..2cfd15f50 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1095,19 +1095,22 @@ "message": "transaction" }, "transactionConfirmed": { - "message": "Transaction confirmed." + "message": "Transaction confirmed on $2." }, "transactionCreated": { - "message": "Transaction created with a value of $1." + "message": "Transaction created with a value of $1 on $2." }, "transactionDropped": { - "message": "Transaction dropped." + "message": "Transaction dropped on $2." }, "transactionSubmitted": { - "message": "Transaction submitted." + "message": "Transaction submitted on $2." + }, + "transactionUpdated": { + "message": "Transaction updated on $2." }, "transactionUpdatedGas": { - "message": "Transaction updated with a gas price of $1." + "message": "Transaction updated with a gas price of $1 on $2." }, "transactions": { "message": "transactions" -- cgit v1.2.3 From 5a6c333506e4000602c1a1106cee6d06fe83afa8 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Mon, 17 Sep 2018 10:34:29 -0700 Subject: Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal --- app/_locales/en/messages.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 2cfd15f50..ed2e7a119 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -61,6 +61,12 @@ "attemptingConnect": { "message": "Attempting to connect to blockchain." }, + "attemptToCancel": { + "message": "Attempt to Cancel?" + }, + "attemptToCancelDescription": { + "message": "Attempting to cancel does not guarantee your original transaction will be cancelled. If cancelled, you are still required to pay a transaction fee to the network." + }, "attributions": { "message": "Attributions" }, @@ -116,6 +122,12 @@ "cancel": { "message": "Cancel" }, + "cancelAttempt": { + "message": "Cancel Attempt" + }, + "cancellationGasFee": { + "message": "Cancellation Gas Fee" + }, "classicInterface": { "message": "Use classic interface" }, @@ -1228,6 +1240,9 @@ "whatsThis": { "message": "What's this?" }, + "yesLetsTry": { + "message": "yes, let's try" + }, "youNeedToAllowCameraAccess": { "message": "You need to allow camera access to use this feature." }, -- cgit v1.2.3 From 95e1eff4ca3d784d6fcba21035a535f8f3398cdc Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Mon, 17 Sep 2018 18:32:35 -0700 Subject: Add TransactionDetails modal --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ed2e7a119..570284126 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1112,6 +1112,9 @@ "transactionCreated": { "message": "Transaction created with a value of $1 on $2." }, + "transactionWithNonce": { + "message": "Transaction $1" + }, "transactionDropped": { "message": "Transaction dropped on $2." }, -- cgit v1.2.3 From b579ee9619d5d775484f382b800c3426311da19d Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Tue, 11 Sep 2018 17:32:37 -0700 Subject: Refactor settings page to use JSX and follow component file folder structure --- app/_locales/en/messages.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 2cfd15f50..359eee9ef 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -216,6 +216,9 @@ "currentConversion": { "message": "Current Conversion" }, + "currentLanguage": { + "message": "current language" + }, "currentNetwork": { "message": "Current Network" }, @@ -596,6 +599,9 @@ "metamaskSeedWords": { "message": "MetaMask Seed Words" }, + "metamaskVersion": { + "message": "metamask version" + }, "min": { "message": "Minimum" }, @@ -906,6 +912,9 @@ "selectCurrency": { "message": "Select Currency" }, + "selectLocale": { + "message": "Select Locale" + }, "selectService": { "message": "Select Service" }, -- cgit v1.2.3 From 9088fd1de49197d0e436f989c6698f2d4c36d456 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Wed, 19 Sep 2018 16:55:58 -0700 Subject: Add Current Conversion Updated string to translations --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 359eee9ef..779608809 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1197,6 +1197,9 @@ "unlockMessage": { "message": "The decentralized web awaits" }, + "updatedWithDate": { + "message": "Updated $1" + }, "uriErrorMsg": { "message": "URIs require the appropriate HTTP/HTTPS prefix." }, -- cgit v1.2.3 From 01166b26edc5b979e5cbc7fe76df6fbfc272bea7 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 20 Sep 2018 15:53:53 -0700 Subject: Fix translation casing --- app/_locales/en/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 779608809..951e24ec1 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -217,7 +217,7 @@ "message": "Current Conversion" }, "currentLanguage": { - "message": "current language" + "message": "Current Language" }, "currentNetwork": { "message": "Current Network" @@ -600,7 +600,7 @@ "message": "MetaMask Seed Words" }, "metamaskVersion": { - "message": "metamask version" + "message": "MetaMask Version" }, "min": { "message": "Minimum" -- cgit v1.2.3 From 431beb943675f2e9b7b5e5ce9c7f55d45f10905f Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 20 Sep 2018 19:35:45 -0700 Subject: Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModal from modal components. --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 570284126..bcd897bba 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1244,7 +1244,7 @@ "message": "What's this?" }, "yesLetsTry": { - "message": "yes, let's try" + "message": "Yes, let's try" }, "youNeedToAllowCameraAccess": { "message": "You need to allow camera access to use this feature." -- cgit v1.2.3 From 0fa9299cd150ff81095da76352a55da4909bf812 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Wed, 19 Sep 2018 22:18:28 -0230 Subject: Add "Cancel All" button to confirm footer --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index f6cf7cf69..c48c5cc6d 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -128,6 +128,9 @@ "cancellationGasFee": { "message": "Cancellation Gas Fee" }, + "cancelN": { + "message": "Cancel all $1 transactions" + }, "classicInterface": { "message": "Use classic interface" }, -- cgit v1.2.3 From 7610248f8c09f9fb86da700ae2818e9b4bd07832 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Mon, 24 Sep 2018 01:46:52 -0230 Subject: s/Cancel/Reject/ on confirm screen for clarity --- app/_locales/en/messages.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index c48c5cc6d..6f99c50e1 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -784,6 +784,12 @@ "refundAddress": { "message": "Your Refund Address" }, + "reject": { + "message": "Reject" + }, + "rejectTxsN": { + "message": "Reject $1 transactions" + }, "rejected": { "message": "Rejected" }, -- cgit v1.2.3 From 2e35c05f148a823d04b5a0009afd45b3fcd1d3fa Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Mon, 24 Sep 2018 02:37:19 -0230 Subject: Confirm rejecting multiple transactions with modal --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 6f99c50e1..e963fc5bd 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -790,6 +790,9 @@ "rejectTxsN": { "message": "Reject $1 transactions" }, + "rejectTxsDescription": { + "message": "You are about to batch reject $1 transactions." + }, "rejected": { "message": "Rejected" }, -- cgit v1.2.3 From d28453234c795dc94e99b2ffea9006a6338eca2a Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Thu, 27 Sep 2018 16:34:58 -0230 Subject: Reword batch reject confirm as "Reject All" --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index e963fc5bd..89abb0e76 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -787,6 +787,9 @@ "reject": { "message": "Reject" }, + "rejectAll": { + "message": "Reject All" + }, "rejectTxsN": { "message": "Reject $1 transactions" }, -- cgit v1.2.3 From 2c5fb11b374b36638997e1225f397f2dccb2b1e7 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Wed, 3 Oct 2018 13:49:03 -0230 Subject: Remove "Copy Contract Address" from token options --- app/_locales/en/messages.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 89abb0e76..d7431fc2c 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -200,9 +200,6 @@ "copy": { "message": "Copy" }, - "copyContractAddress": { - "message": "Copy Contract Address" - }, "copyAddress": { "message": "Copy address to clipboard" }, -- cgit v1.2.3 From 41db5d0570a69450a077174742aab24f1308ed6a Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 4 Oct 2018 10:56:58 -0700 Subject: Update "cancel" copy --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d7431fc2c..c26dc7ecd 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -65,7 +65,7 @@ "message": "Attempt to Cancel?" }, "attemptToCancelDescription": { - "message": "Attempting to cancel does not guarantee your original transaction will be cancelled. If cancelled, you are still required to pay a transaction fee to the network." + "message": "Submitting this attempt does not guarantee your original transaction will be cancelled. If the cancellation attempt is successful, you will be charged the transaction fee above." }, "attributions": { "message": "Attributions" -- cgit v1.2.3 From 50d91f998d0dc228c1d5dac7966df89d6c3fe6c4 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 4 Oct 2018 19:26:41 -0700 Subject: Translate method names in the transaction list only when applicable --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d7431fc2c..f19b6cd4d 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1163,6 +1163,9 @@ "transfer": { "message": "Transfer" }, + "transferFrom": { + "message": "Transfer From" + }, "transfers": { "message": "Transfers" }, -- cgit v1.2.3 From cd91b45686864c5d38fc95e3a561ca66b36ade7c Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 9 Oct 2018 16:47:38 +0200 Subject: 100% French locale, reordering of English locale, fixes #5457 (#5470) * french locales: fix typos and improve wording * french locales: more fixes and rewording * fixed typo * fixed typo * added missing translations * fixed alphabetical order * fixed alphabetical order * added missing translations for FR * fixed verify-locale-strings.js * fixed indentation * fixed indentation * updated french locale * updated changelog with changes logs * a few fixes after receiving comments, mostly Caps removing and adding --- app/_locales/en/messages.json | 176 +++++++++++++++++++++--------------------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 14ba158df..66f378ab8 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3,7 +3,7 @@ "message": "Accept" }, "accessingYourCamera": { - "message": "Accesing your camera..." + "message": "Accessing your camera..." }, "account": { "message": "Account" @@ -99,7 +99,7 @@ "message": "Borrow With Dharma (Beta)" }, "browserNotSupported": { - "message": "Your Browser is not supported..." + "message": "Your Browser is not supported..." }, "builtInCalifornia": { "message": "MetaMask is designed and built in California." @@ -167,6 +167,21 @@ "connecting": { "message": "Connecting..." }, + "connectingToKovan": { + "message": "Connecting to Kovan Test Network" + }, + "connectingToMainnet": { + "message": "Connecting to Main Ethereum Network" + }, + "connectingToRopsten": { + "message": "Connecting to Ropsten Test Network" + }, + "connectingToRinkeby": { + "message": "Connecting to Rinkeby Test Network" + }, + "connectingToUnknown": { + "message": "Connecting to Unknown Network" + }, "connectToLedger": { "message": "Connect to Ledger" }, @@ -234,6 +249,9 @@ "currentNetwork": { "message": "Current Network" }, + "currentRpc": { + "message": "Current RPC" + }, "customGas": { "message": "Customize Gas" }, @@ -340,15 +358,6 @@ "enterPasswordContinue": { "message": "Enter password to continue" }, - "parameters": { - "message": "Parameters" - }, - "passwordNotLongEnough": { - "message": "Password not long enough" - }, - "passwordsDontMatch": { - "message": "Passwords Don't Match" - }, "etherscanView": { "message": "View account on Etherscan" }, @@ -504,6 +513,9 @@ "importUsingSeed": { "message": "Import using account seed phrase" }, + "info": { + "message": "Info" + }, "infoHelp": { "message": "Info & Help" }, @@ -532,7 +544,7 @@ "message": "Invalid Request" }, "invalidRPC": { - "message": "Invalid RPC URI" + "message": "Invalid RPC URL" }, "invalidSeedPhrase": { "message": "Invalid seed phrase" @@ -656,6 +668,9 @@ "newPassword": { "message": "New Password (min 8 chars)" }, + "newPassword8Chars": { + "message": "New Password (min 8 chars)" + }, "newRecipient": { "message": "New Recipient" }, @@ -698,6 +713,13 @@ "oldUIMessage": { "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu." }, + "onlySendToEtherAddress": { + "message": "Only send ETH to an Ethereum address." + }, + "onlySendTokensToAccountAddress": { + "message": "Only send $1 to an Ethereum account address.", + "description": "displays token symbol" + }, "openInTab": { "message": "Open in tab" }, @@ -705,9 +727,24 @@ "message": "or", "description": "choice between creating or importing a new account" }, + "orderOneHere": { + "message": "Order a Trezor or Ledger and keep your funds in cold storage" + }, "origin": { "message": "Origin" }, + "outgoing": { + "message": "Outgoing" + }, + "parameters": { + "message": "Parameters" + }, + "passwordNotLongEnough": { + "message": "Password not long enough" + }, + "passwordsDontMatch": { + "message": "Passwords Don't Match" + }, "password": { "message": "Password" }, @@ -865,24 +902,6 @@ "rpc": { "message": "Custom RPC" }, - "currentRpc": { - "message": "Current RPC" - }, - "connectingToMainnet": { - "message": "Connecting to Main Ethereum Network" - }, - "connectingToRopsten": { - "message": "Connecting to Ropsten Test Network" - }, - "connectingToKovan": { - "message": "Connecting to Kovan Test Network" - }, - "connectingToRinkeby": { - "message": "Connecting to Rinkeby Test Network" - }, - "connectingToUnknown": { - "message": "Connecting to Unknown Network" - }, "sampleAccountName": { "message": "E.g. My new account", "description": "Help user understand concept of adding a human-readable name to their account" @@ -890,15 +909,6 @@ "save": { "message": "Save" }, - "speedUp": { - "message": "speed up" - }, - "speedUpTitle": { - "message": "Speed Up Transaction" - }, - "speedUpSubtitle": { - "message": "Increase your gas price to attempt to overwrite and speed up your transaction" - }, "saveAsCsvFile": { "message": "Save as CSV File" }, @@ -909,6 +919,12 @@ "saveSeedAsFile": { "message": "Save Seed Words As File" }, + "scanInstructions": { + "message": "Place the QR code in front of your camera" + }, + "scanQrCode": { + "message": "Scan QR Code" + }, "search": { "message": "Search" }, @@ -918,15 +934,6 @@ "secretPhrase": { "message": "Enter your secret twelve word phrase here to restore your vault." }, - "showHexData": { - "message": "Show Hex Data" - }, - "showHexDataDescription": { - "message": "Select this to show the hex data field on the send screen" - }, - "newPassword8Chars": { - "message": "New Password (min 8 chars)" - }, "seedPhraseReq": { "message": "Seed phrases are 12 words long" }, @@ -963,19 +970,6 @@ "separateEachWord": { "message": "Separate each word with a single space" }, - "onlySendToEtherAddress": { - "message": "Only send ETH to an Ethereum address." - }, - "onlySendTokensToAccountAddress": { - "message": "Only send $1 to an Ethereum account address.", - "description": "displays token symbol" - }, - "orderOneHere": { - "message": "Order a Trezor or Ledger and keep your funds in cold storage" - }, - "outgoing": { - "message": "Outgoing" - }, "searchTokens": { "message": "Search Tokens" }, @@ -1000,33 +994,6 @@ "settings": { "message": "Settings" }, - "step1HardwareWallet": { - "message": "1. Connect Hardware Wallet" - }, - "step1HardwareWalletMsg": { - "message": "Connect your hardware wallet directly to your computer." - }, - "step2HardwareWallet": { - "message": "2. Select an Account" - }, - "step2HardwareWalletMsg": { - "message": "Select the account you want to view. You can only choose one at a time." - }, - "step3HardwareWallet": { - "message": "3. Start using dApps and more!" - }, - "step3HardwareWalletMsg": { - "message": "Use your hardware account like you would with any Ethereum account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." - }, - "info": { - "message": "Info" - }, - "scanInstructions": { - "message": "Place the QR code in front of your camera" - }, - "scanQrCode": { - "message": "Scan QR Code" - }, "shapeshiftBuy": { "message": "Buy with Shapeshift" }, @@ -1036,6 +1003,12 @@ "showQRCode": { "message": "Show QR Code" }, + "showHexData": { + "message": "Show Hex Data" + }, + "showHexDataDescription": { + "message": "Select this to show the hex data field on the send screen" + }, "sign": { "message": "Sign" }, @@ -1060,6 +1033,15 @@ "spaceBetween": { "message": "there can only be a space between words" }, + "speedUp": { + "message": "speed up" + }, + "speedUpTitle": { + "message": "Speed Up Transaction" + }, + "speedUpSubtitle": { + "message": "Increase your gas price to attempt to overwrite and speed up your transaction" + }, "status": { "message": "Status" }, @@ -1072,6 +1054,24 @@ "stateLogError": { "message": "Error in retrieving state logs." }, + "step1HardwareWallet": { + "message": "1. Connect Hardware Wallet" + }, + "step1HardwareWalletMsg": { + "message": "Connect your hardware wallet directly to your computer." + }, + "step2HardwareWallet": { + "message": "2. Select an Account" + }, + "step2HardwareWalletMsg": { + "message": "Select the account you want to view. You can only choose one at a time." + }, + "step3HardwareWallet": { + "message": "3. Start using dApps and more!" + }, + "step3HardwareWalletMsg": { + "message": "Use your hardware account like you would with any Ethereum account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." + }, "submit": { "message": "Submit" }, -- cgit v1.2.3 From f88373237bebbaf286cab9085871166307ae9ab1 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Toral Date: Tue, 2 Oct 2018 20:29:03 -0500 Subject: Added account options on home screen --- app/_locales/en/messages.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 66f378ab8..97fc402fa 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -364,6 +364,9 @@ "exchangeRate": { "message": "Exchange Rate" }, + "expandView": { + "message": "Expand View" + }, "exportPrivateKey": { "message": "Export Private Key" }, @@ -723,6 +726,9 @@ "openInTab": { "message": "Open in tab" }, + "accountOptions": { + "message": "Account Options" + }, "or": { "message": "or", "description": "choice between creating or importing a new account" -- cgit v1.2.3 From 999a599a78ce742a209d37bf831b89a96e6cc3e5 Mon Sep 17 00:00:00 2001 From: Noel Yoo Date: Wed, 10 Oct 2018 20:55:11 +0900 Subject: Fix formatting of locale files (#5479) --- app/_locales/en/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 97fc402fa..6b76140f2 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -140,7 +140,7 @@ "close": { "message": "Close" }, - "chromeRequiredForHardwareWallets":{ + "chromeRequiredForHardwareWallets": { "message": "You need to use MetaMask on Google Chrome in order to connect to your Hardware Wallet." }, "confirm": { @@ -501,7 +501,7 @@ "message": "Import Account" }, "importAccountMsg": { - "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 " }, "importAnAccount": { "message": "Import an account" @@ -689,7 +689,7 @@ "noDeposits": { "message": "No deposits received" }, - "noConversionRateAvailable":{ + "noConversionRateAvailable": { "message": "No Conversion Rate Available" }, "noTransactionHistory": { -- cgit v1.2.3 From fa228f1c7ed263807f0969119f73c0faad63eb5e Mon Sep 17 00:00:00 2001 From: noelyoo Date: Wed, 10 Oct 2018 22:49:04 +0900 Subject: Alphabetize en locale json keys --- app/_locales/en/messages.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 6b76140f2..d7cec0619 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -14,6 +14,9 @@ "accountName": { "message": "Account Name" }, + "accountOptions": { + "message": "Account Options" + }, "accountSelectionRequired": { "message": "You need to select an account!" }, @@ -726,9 +729,6 @@ "openInTab": { "message": "Open in tab" }, - "accountOptions": { - "message": "Account Options" - }, "or": { "message": "or", "description": "choice between creating or importing a new account" @@ -745,22 +745,22 @@ "parameters": { "message": "Parameters" }, - "passwordNotLongEnough": { - "message": "Password not long enough" - }, - "passwordsDontMatch": { - "message": "Passwords Don't Match" - }, "password": { "message": "Password" }, "passwordCorrect": { "message": "Please make sure your password is correct." }, + "passwordsDontMatch": { + "message": "Passwords Don't Match" + }, "passwordMismatch": { "message": "passwords don't match", "description": "in password creation process, the two new password fields did not match" }, + "passwordNotLongEnough": { + "message": "Password not long enough" + }, "passwordShort": { "message": "password not long enough", "description": "in password creation process, the password is not long enough to be secure" @@ -863,9 +863,6 @@ "retryWithMoreGas": { "message": "Retry with a higher gas price here" }, - "walletSeed": { - "message": "Wallet Seed" - }, "restore": { "message": "Restore" }, @@ -1264,6 +1261,9 @@ "visitWebSite": { "message": "Visit our web site" }, + "walletSeed": { + "message": "Wallet Seed" + }, "warning": { "message": "Warning" }, -- cgit v1.2.3 From ba21606dfb15a5ce767f1225b32738a2ecdd80ee Mon Sep 17 00:00:00 2001 From: Noel Yoo Date: Fri, 12 Oct 2018 00:50:59 +0900 Subject: Fix en, ko locales (#5483) * Fix en typo * Fix ko typo * Remove unnecessary space * Fix ko typo * Improve translation in ko --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d7cec0619..d8467e9eb 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1222,7 +1222,7 @@ "message": "Ooops! Something went wrong...." }, "unknownCameraError": { - "message": "There was an error while trying to access you camera. Please try again..." + "message": "There was an error while trying to access your camera. Please try again..." }, "unlock": { "message": "Unlock" -- cgit v1.2.3 From c821a8354c8eba05885ca219f39aedafbd4f8052 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Tue, 16 Oct 2018 06:00:47 +0800 Subject: Add txReceipt data to transaction details (#5513) --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d8467e9eb..13b0da230 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -424,6 +424,9 @@ "gasLimitTooLow": { "message": "Gas limit must be at least 21000" }, + "gasUsed": { + "message": "Gas Used" + }, "generatingSeed": { "message": "Generating Seed..." }, -- cgit v1.2.3