Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

100% French locale, Reordering of English locale, Fixes #5457: issue with verify-locale-strings.js #5470

Merged
merged 14 commits into from
Oct 9, 2018
Merged

100% French locale, Reordering of English locale, Fixes #5457: issue with verify-locale-strings.js #5470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ced5570
french locales: fix typos and improve wording
Bunjin Oct 8, 2018
ca3e29e
french locales: more fixes and rewording
Bunjin Oct 8, 2018
3ec8834
fixed typo
Bunjin Oct 8, 2018
ba11bd7
fixed typo
Bunjin Oct 8, 2018
fc0a91c
added missing translations
Bunjin Oct 8, 2018
c142e4c
fixed alphabetical order
Bunjin Oct 8, 2018
3763d60
fixed alphabetical order
Bunjin Oct 8, 2018
f416726
added missing translations for FR
Bunjin Oct 8, 2018
d63a77e
fixed verify-locale-strings.js
Bunjin Oct 8, 2018
9d616d9
fixed indentation
Bunjin Oct 8, 2018
e986450
fixed indentation
Bunjin Oct 8, 2018
e31af97
updated french locale
Bunjin Oct 9, 2018
4c8b998
updated changelog with changes logs
Bunjin Oct 9, 2018
321b3bf
a few fixes after receiving comments, mostly Caps removing and adding
Bunjin Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Current Develop Branch

- Update transaction statuses when switching networks.
- [#5470](https://github.com/MetaMask/metamask-extension/pull/5470) 100% coverage in French locale, fixed the procedure to verify proposed locale.

## 4.12.0 Thursday September 27 2018

Expand Down
176 changes: 88 additions & 88 deletions app/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"message": "Accept"
},
"accessingYourCamera": {
"message": "Accesing your camera..."
"message": "Accessing your camera..."
},
"account": {
"message": "Account"
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -234,6 +249,9 @@
"currentNetwork": {
"message": "Current Network"
},
"currentRpc": {
"message": "Current RPC"
},
"customGas": {
"message": "Customize Gas"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -504,6 +513,9 @@
"importUsingSeed": {
"message": "Import using account seed phrase"
},
"info": {
"message": "Info"
},
"infoHelp": {
"message": "Info & Help"
},
Expand Down Expand Up @@ -532,7 +544,7 @@
"message": "Invalid Request"
},
"invalidRPC": {
"message": "Invalid RPC URI"
"message": "Invalid RPC URL"
},
"invalidSeedPhrase": {
"message": "Invalid seed phrase"
Expand Down Expand Up @@ -656,6 +668,9 @@
"newPassword": {
"message": "New Password (min 8 chars)"
},
"newPassword8Chars": {
"message": "New Password (min 8 chars)"
},
"newRecipient": {
"message": "New Recipient"
},
Expand Down Expand Up @@ -698,16 +713,38 @@
"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"
},
"or": {
"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"
},
Expand Down Expand Up @@ -865,40 +902,13 @@
"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"
},
"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"
},
Expand All @@ -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"
},
Expand All @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand All @@ -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"
},
Expand All @@ -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"
},
Expand All @@ -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"
},
Expand All @@ -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"
},
Expand Down
Loading