diff options
52 files changed, 1149 insertions, 1070 deletions
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 4f2747d2..8eaa5a4a 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -232,7 +232,7 @@ "message": "Počet desetinných míst přesnosti" }, "defaultNetwork": { - "message": "Výchozí síť pro Etherové transakce je Main Net." + "message": "Výchozí síť pro DEXové transakce je Main Net." }, "denExplainer": { "message": "Váš DEN je heslem šifrované uložiště v Dex Sanu." @@ -250,8 +250,8 @@ "depositEth": { "message": "Vložit Eth" }, - "depositEther": { - "message": "Vložit Ether" + "depositDex": { + "message": "Vložit DEX" }, "depositFiat": { "message": "Vklad s fiat měnou" @@ -263,7 +263,7 @@ "message": "Vklad přes ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit Ether a vložit ho přímo do peněženky Dex San. Bez založení účtu." + "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit DEX a vložit ho přímo do peněženky Dex San. Bez založení účtu." }, "details": { "message": "Podrobnosti" @@ -272,10 +272,10 @@ "message": "Přímý vklad" }, "directDepositEther": { - "message": "Vložit Ether přímo" + "message": "Vložit DEX přímo" }, "directDepositEtherExplainer": { - "message": "Pokud už vlastníte nějaký Ether, nejrychleji ho dostanete do peněženky přímým vkladem." + "message": "Pokud už vlastníte nějaký DEX, nejrychleji ho dostanete do peněženky přímým vkladem." }, "done": { "message": "Hotovo" @@ -311,7 +311,7 @@ "message": "Hesla nejsou stejná" }, "etherscanView": { - "message": "Prohlédněte si účet na Etherscan" + "message": "Prohlédněte si účet na DEXscan" }, "exchangeRate": { "message": "Směnný kurz" @@ -377,11 +377,11 @@ "message": "Cena paliva je povinná" }, "getEther": { - "message": "Získejte Ether" + "message": "Získejte DEX" }, "getEtherFromFaucet": { - "message": "Získejte Ether z faucetu za $1.", - "description": "Displays network name for Ether faucet" + "message": "Získejte DEX z faucetu za $1.", + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": "musí být větší nebo roven $1.", @@ -404,7 +404,7 @@ "message": "Skrýt token?" }, "howToDeposit": { - "message": "Jakým způsobem chcete vložit Ether?" + "message": "Jakým způsobem chcete vložit DEX?" }, "holdEther": { "message": "Dovoluje vám držet ether a tokeny a slouží jako most k decentralizovaným aplikacím." @@ -531,7 +531,7 @@ "message": "Musíte zvolit aspoň 1 token." }, "needEtherInWallet": { - "message": "Potřebujete Ether v peněžence, abyste mohli pomocí Dex Sanu interagovat s decentralizovanými aplikacemi." + "message": "Potřebujete DEX v peněžence, abyste mohli pomocí Dex Sanu interagovat s decentralizovanými aplikacemi." }, "needImportFile": { "message": "Musíte zvolit soubor k importu.", @@ -703,7 +703,7 @@ "connectingToKovan": { "message": "Připojuji se k Kovan Test Network" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "Připojuji se k Rinkeby Test Network" }, "connectingToUnknown": { @@ -840,6 +840,9 @@ "testFaucet": { "message": "Testovací faucet" }, + "testnet": { + "message": "DEXON Testnet" + }, "to": { "message": "Komu" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index cf661431..516bd066 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -229,7 +229,7 @@ "message": "Dezimalangabe der Präzision" }, "defaultNetwork": { - "message": "Das Standardnetzwerk für Ether Transaktionen ist das Main Net." + "message": "Das Standardnetzwerk für DEX Transaktionen ist das Main Net." }, "denExplainer": { "message": "Dein DEN ist dein passwortverschlüsselter Speicher innerhalb von Dex San." @@ -247,7 +247,7 @@ "depositEth": { "message": "Eth kaufen" }, - "depositEther": { + "depositDex": { "message": "Ether einzahlen" }, "depositFiat": { @@ -269,10 +269,10 @@ "message": "Sofortige Einzahlung" }, "directDepositEther": { - "message": "Sofort Ether einzahlen" + "message": "Sofort DEX einzahlen" }, "directDepositEtherExplainer": { - "message": "Wenn du bereits Ether besitzt, ist die sofortige Einzahlung die schnellste Methode Ether in deine neue Wallet zu bekommen." + "message": "Wenn du bereits DEX besitzt, ist die sofortige Einzahlung die schnellste Methode DEX in deine neue Wallet zu bekommen." }, "done": { "message": "Fertig" @@ -308,7 +308,7 @@ "message": "Passwörter stimmen nicht überein" }, "etherscanView": { - "message": "Account auf Etherscan anschauen" + "message": "Account auf DEXscan anschauen" }, "exchangeRate": { "message": "Wechselrate" @@ -378,7 +378,7 @@ }, "getEtherFromFaucet": { "message": "Ether für $1 vom Faucet holen", - "description": "Zeigt den Netzwerknamen für den Ether Faucet an" + "description": "Zeigt den Netzwerknamen für den DEX Faucet an" }, "greaterThanMin": { "message": "Muss größer oder gleich $1 sein.", @@ -401,7 +401,7 @@ "message": "Token ausblenden?" }, "howToDeposit": { - "message": "Wie möchtest du Ether einzahlen?" + "message": "Wie möchtest du DEX einzahlen?" }, "holdEther": { "message": "Es erlaubt dir ether & Token zu halten und dient dir als Verbindung zu dezentralisierten Applikationen." @@ -522,7 +522,7 @@ "message": "Du musst mindestens 1 Token auswählen." }, "needEtherInWallet": { - "message": "Um dezentralisierte Applikationen mit Dex San verwenden zu können, benötigst du Ether in deiner Wallet." + "message": "Um dezentralisierte Applikationen mit Dex San verwenden zu können, benötigst du DEX in deiner Wallet." }, "needImportFile": { "message": "Für den Import musst du eine Datei auswählen.", @@ -691,7 +691,7 @@ "connectingToKovan": { "message": " Verbinde zum Kovan Testnetzwerk" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": " Verbinde zum Rinkeby Testnetzwerk" }, "connectingToUnknown": { @@ -819,6 +819,9 @@ "testFaucet": { "message": "Testfaucet" }, + "testnet": { + "message": "DEXON Testnet" + }, "to": { "message": "An" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index c2cd3c07..1375b6a6 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -343,7 +343,7 @@ "message": "Decimals of Precision" }, "defaultNetwork": { - "message": "The default network for Ether transactions is Main Net." + "message": "The default network for DEX transactions is Main Net." }, "denExplainer": { "message": "Your DEN is your password-encrypted storage within Dex San." @@ -361,8 +361,8 @@ "depositEth": { "message": "Deposit Eth" }, - "depositEther": { - "message": "Deposit Ether" + "depositDex": { + "message": "Deposit DEX" }, "depositFiat": { "message": "Deposit with Fiat" @@ -374,7 +374,7 @@ "message": "Deposit with ShapeShift" }, "depositShapeShiftExplainer": { - "message": "If you own other cryptocurrencies, you can trade and deposit Ether directly into your Dex San wallet. No Account Needed." + "message": "If you own other cryptocurrencies, you can trade and deposit DEX directly into your Dex San wallet. No Account Needed." }, "details": { "message": "Details" @@ -383,10 +383,10 @@ "message": "Direct Deposit" }, "directDepositEther": { - "message": "Directly Deposit Ether" + "message": "Directly Deposit DEX" }, "directDepositEtherExplainer": { - "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit." + "message": "If you already have some DEX, the quickest way to get DEX in your new wallet by direct deposit." }, "done": { "message": "Done" @@ -434,7 +434,7 @@ "message": "ETH" }, "etherscanView": { - "message": "View account on Etherscan" + "message": "View account on DEXscan" }, "exchangeRate": { "message": "Exchange Rate" @@ -527,11 +527,11 @@ "message": "Generating transaction" }, "getEther": { - "message": "Get Ether" + "message": "Get DEX" }, "getEtherFromFaucet": { - "message": "Get Ether from a faucet for the $1", - "description": "Displays network name for Ether faucet" + "message": "Get DEX from a faucet for the $1", + "description": "Displays network name for DEX faucet" }, "getHelp": { "message": "Get Help." @@ -578,7 +578,7 @@ "message": "History" }, "howToDeposit": { - "message": "How would you like to deposit Ether?" + "message": "How would you like to deposit DEX?" }, "holdEther": { "message": "It allows you to hold ether & tokens, and serves as your bridge to decentralized applications." @@ -702,7 +702,7 @@ "message": "seed words only have lowercase characters" }, "mainnet": { - "message": "Main Dexon Network" + "message": "Main DEOXN Network" }, "menu": { "message": "Menu" @@ -735,7 +735,7 @@ "message": "Must select at least 1 token." }, "needEtherInWallet": { - "message": "To interact with decentralized applications using Dex San, you’ll need Ether in your wallet." + "message": "To interact with decentralized applications using Dex San, you’ll need DEX in your wallet." }, "needImportFile": { "message": "You must select a file to import.", @@ -1240,6 +1240,9 @@ "testFaucet": { "message": "Test Faucet" }, + "testnet": { + "message": "DEXON Testnet" + }, "to": { "message": "To" }, @@ -1418,7 +1421,7 @@ "message": "View Account" }, "viewOnEtherscan": { - "message": "View on Etherscan" + "message": "View on DEXscan" }, "visitWebSite": { "message": "Visit our web site" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 2509bda9..753a7090 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -164,7 +164,7 @@ "connectingToKovan": { "message": "Conectando a la red de test Kovan" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "Conectando a la red de test Rinkeby" }, "connectingToUnknown": { @@ -244,7 +244,7 @@ "message": "Los decimales deben ser al menos 0 y no más de 36" }, "defaultNetwork": { - "message": "La red por defecto para las transacciones de Ether es MainNet (red principal)" + "message": "La red por defecto para las transacciones de DEX es MainNet (red principal)" }, "denExplainer": { "message": "El DEN es tu contraseña encriptada almacenada dentro de Dex San" @@ -260,10 +260,10 @@ "description": "Informa al usuario que moneda ha elegido para depositar en shapeshift" }, "depositEth": { - "message": "Depositar Ether" + "message": "Depositar DEX" }, - "depositEther": { - "message": "Depositar Ether" + "depositDex": { + "message": "Depositar DEX" }, "depositFiat": { "message": "Depositar con fiat (divisa nacional)" @@ -275,7 +275,7 @@ "message": "Depositar con ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Si posees otras criptomonedas, puedes intercambiar y depositar Ether directamente en tu billetera de Dex San. No necesitas tener una cuenta." + "message": "Si posees otras criptomonedas, puedes intercambiar y depositar DEX directamente en tu billetera de Dex San. No necesitas tener una cuenta." }, "details": { "message": "Detalles" @@ -284,10 +284,10 @@ "message": "Depósito directo" }, "directDepositEther": { - "message": "Depositar Ether directamente" + "message": "Depositar DEX directamente" }, "directDepositEtherExplainer": { - "message": "Si posees Ether, la forma más rápida de transferirlo a tu nueva billetera es depositándolo directamente" + "message": "Si posees DEX, la forma más rápida de transferirlo a tu nueva billetera es depositándolo directamente" }, "done": { "message": "Completo" @@ -317,7 +317,7 @@ "message": "Ingresa tu contraseña para confirmar" }, "etherscanView": { - "message": "Ver la cuenta en Etherscan" + "message": "Ver la cuenta en DEXscan" }, "exchangeRate": { "message": "Tipo de cambio" @@ -383,11 +383,11 @@ "message": "Generando semilla..." }, "getEther": { - "message": "Conseguir Ether" + "message": "Conseguir DEX" }, "getEtherFromFaucet": { - "message": "Obtenga Ether de un faucet (grifo) por $1", - "description": "Muestra el nombre de la red para el faucet (grifo) de Ether" + "message": "Obtenga DEX de un faucet (grifo) por $1", + "description": "Muestra el nombre de la red para el faucet (grifo) de DEX" }, "greaterThanMin": { "message": "Debe ser mayor o igual a $1", @@ -413,7 +413,7 @@ "message": "Te permite mantener tus ether y tokens, así como puente para aplicaciones descentralizadas" }, "howToDeposit": { - "message": "¿Cómo te gustaria depositar Ether?" + "message": "¿Cómo te gustaria depositar DEX?" }, "import": { "message": "Importar", @@ -534,7 +534,7 @@ "message": "Mis cuentas" }, "needEtherInWallet": { - "message": "Para interactuar con una aplicación descentralizada usando Dex San, necesitas tener Ether en tu billetera" + "message": "Para interactuar con una aplicación descentralizada usando Dex San, necesitas tener DEX en tu billetera" }, "needImportFile": { "message": "Debes seleccionar un archivo para importar", @@ -742,7 +742,7 @@ "message": "Enviar" }, "sendETH": { - "message": "Enviar Ether" + "message": "Enviar DEX" }, "sendTokens": { "message": "Enviar tokens" @@ -816,6 +816,9 @@ "testFaucet": { "message": "Probar Faucet" }, + "testnet": { + "message": "DEXON Testnet" + }, "to": { "message": "Para" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 9b2e319e..32332a89 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -304,7 +304,7 @@ "message": "Décimales de précision" }, "defaultNetwork": { - "message": "Le réseau par défaut pour les transactions Ether est le \"Réseau principal Ethereum\"." + "message": "Le réseau par défaut pour les transactions DEX est Main Net." }, "denExplainer": { "message": "Votre DEN est votre stockage crypté par mot de passe dans Dex San." @@ -322,8 +322,8 @@ "depositEth": { "message": "Déposer Eth" }, - "depositEther": { - "message": "Déposer de l'Ether" + "depositDex": { + "message": "Déposer DEX" }, "depositFiat": { "message": "Déposer de la monnaie-fiat" @@ -347,7 +347,7 @@ "message": "Dépôt direct d'Ether" }, "directDepositEtherExplainer": { - "message": "Si vous avez déjà de l'Ether, le moyen le plus rapide d'obtenir des Ether dans votre nouveau portefeuille est par dépôt direct." + "message": "Si vous avez déjà de l'Ether, le moyen le plus rapide d'obtenir des DEX dans votre nouveau portefeuille est par dépôt direct." }, "done": { "message": "Terminé" @@ -392,7 +392,7 @@ "message": "Entrez votre mot de passe pour continuer" }, "etherscanView": { - "message": "Afficher le compte sur Etherscan" + "message": "Afficher le compte sur DEXscan" }, "exchangeRate": { "message": "Taux de change" @@ -467,7 +467,7 @@ "message": "Préparation de la transaction" }, "getEther": { - "message": "Obtenir des Ether" + "message": "Obtenir des DEX" }, "getEtherFromFaucet": { "message": "Obtenir de l'Ether d'une faucet pour $1", @@ -1126,6 +1126,9 @@ "testFaucet": { "message": "Faucet Testnet" }, + "testnet": { + "message": "DEXON Testnet" + }, "to": { "message": "Destinataire" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index da63b0dd..0900f11f 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -238,8 +238,8 @@ "depositEth": { "message": "Eth जमाआर्थ" }, - "depositEther": { - "message": "जमा - Ether" + "depositDex": { + "message": "जमा - DEX" }, "depositFiat": { "message": "फिएट के साथ जमा हो" diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index c94ddc8d..4576472e 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -39,1313 +39,1238 @@ "message": "Domèn ki nan lis anba a ap mande pou jwenn aksè a blòkchou Ethereum ak pou wè kont ou ye kounye a. Toujou double tcheke ke ou sou sit ki kòrèk la anvan apwouve aksè." }, "accept": { - "message": "Aksepte" + "message": "Aksepte" }, "accessingYourCamera": { - "message": "Aksè a Kamera" + "message": "Aksè a Kamera" }, "account": { - "message": "Kont" + "message": "Kont" }, "accountDetails": { - "message": "Detay Kont" + "message": "Detay Kont" }, "accountName": { - "message": "Non Kont" - }, - "accountOptions": { - "message": "Opsyon kont" + "message": "Non Kont" }, "accountSelectionRequired": { - "message": "Ou bezwen chwazi yon kont!" + "message": "Ou bezwen chwazi yon kont!" }, "activityLog": { - "message": "aktivite ki fèt" + "message": "aktivite ki fèt" }, "address": { - "message": "Adrès" + "message": "Adrès" }, "addCustomToken": { - "message": "Ajoute token" + "message": "Ajoute token" }, "addToken": { - "message": "Ajoute Token" + "message": "Ajoute Token" }, "addTokens": { - "message": "Ajoute Token" + "message": "Ajoute Token" }, "addSuggestedTokens": { - "message": "Ajoute Token Yo Sikjere W" + "message": "Ajoute Token Yo Sikjere W" }, "addAcquiredTokens": { - "message": "Ajoute tokens yo ou te achte lè l sèvi avèk MetaMask" + "message": "Ajoute tokens yo ou te achte lè l sèvi avèk MetaMask" }, "amount": { - "message": "Kantite lajan" + "message": "Kantite lajan" }, "amountPlusGas": { - "message": "Kantite lajan + Gaz" + "message": "Kantite lajan + Gaz" }, "appDescription": { - "message": "Ekstansyon Navigatè Ethereum", - "description": "The description of the application" + "message": "Ethereum Ekstansyon Navigatè", + "description": "The description of the application" }, "appName": { - "message": "MetaMask", - "description": "The name of the application" + "message": "MetaMask", + "description": "The name of the application" }, "approve": { - "message": "Apwouve" + "message": "Apwouve" }, "approved": { - "message": "Apwouve" + "message": "Apwouve" }, "attemptingConnect": { - "message": "Eseye konekte nan blockchain." - }, - "attemptToCancel": { - "message": "Eseye anile?" - }, - "attemptToCancelDescription": { - "message": "Soumèt tantativ sa a pa garanti ke yo pral anile tranzaksyon ou anile. Si tantativ anile an gen siksè, ou pral chaje frè yo tranzaksyon pi wo a." + "message": "Eseye konekte nan blockchain." }, "attributions": { - "message": "Atribisyon" + "message": "Atribisyon" }, "available": { - "message": "Disponib" + "message": "Disponib" }, "back": { - "message": "Retounen" + "message": "Retounen" }, "balance": { - "message": "Balans" + "message": "Balans" }, "balances": { - "message": "Balans Token" + "message": "Balans Token" }, "balanceIsInsufficientGas": { - "message": "Ensifizan balans pou total gaz aktyèl la" + "message": "Ensifizan balans pou total gaz aktyèl la" }, "beta": { - "message": "BETA" + "message": "BETA" }, "betweenMinAndMax": { - "message": "dwe plis pase oswa egal a $ 1 mwens ke oswa egal a $ 2.", - "description": "helper for inputting hex as decimal input" + "message": "dwe plis pase oswa egal a $ 1 mwens ke oswa egal a $ 2.", + "description": "helper for inputting hex as decimal input" }, "blockiesIdenticon": { - "message": "Itilize Blockies Identicon" + "message": "Itilize Blockies Identicon" }, "borrowDharma": { - "message": "Prete Avèk Dharma (Beta)" + "message": "Prete Avèk Dharma (Beta)" }, "browserNotSupported": { - "message": "Navigatè ou a pa sipòte..." + "message": "Navigatè ou a pa sipòte..." }, "builtInCalifornia": { - "message": "MetaMask fèt e bati nan California." + "message": "MetaMask fèt e bati nan California." }, "buy": { - "message": "Achte" + "message": "Achte" }, "buyCoinbase": { - "message": "Achte sou Coinbase" + "message": "Achte sou Coinbase" }, "buyCoinbaseExplainer": { - "message": "Coinbase se fason ki pi popilè nan mond lan yo achte ak vann Bitcoin, Ethereum, ak Litecoin." + "message": "Coinbase se fason ki pi popilè nan mond lan yo achte ak vann Bitcoin, DEXeum, ak Litecoin." }, "bytes": { - "message": "Bytes" + "message": "Bytes" }, "ok": { - "message": "Oke" + "message": "Oke" }, "cancel": { - "message": "Anile" - }, - "cancelAttempt": { - "message": "Teste Anile" - }, - "cancellationGasFee": { - "message": "Anilasyon Gaz Chaj" - }, - "cancelN": { - "message": "Anile tout $ 1 tranzaksyon" + "message": "Anile" }, "classicInterface": { - "message": "Sèvi ak fas klasik la" + "message": "Sèvi ak fas klasik la" }, "clickCopy": { - "message": "Klike sou kopi" - }, - "clickToAdd": { - "message": "Klike sou $ 1 pou ajoute yo nan kont ou" + "message": "Klike sou kopi" }, "close": { - "message": "Fèmen" + "message": "Fèmen" }, "chromeRequiredForHardwareWallets": { - "message": "Ou bezwen sèvi ak MetaMask sou Google Chrome yo nan lòd yo konekte sou Hardware Wallet." + "message": "Ou bezwen sèvi ak MetaMask sou Google Chrome yo nan lòd yo konekte sou Hardware Wallet." }, "confirm": { - "message": "Konfime" + "message": "Konfime" }, "confirmed": { - "message": "Konfime" + "message": "Konfime" }, "confirmContract": { - "message": "Konfime Kontra" + "message": "Konfime Kontra" }, "confirmPassword": { - "message": "Konfime Modpas" + "message": "Konfime Modpas" }, "confirmTransaction": { - "message": "Konfime Tranzaksyon" + "message": "Konfime Tranzaksyon" }, "connectHardwareWallet": { - "message": "Konekte Materyèl Wallet" + "message": "Konekte Hardware Wallet" }, "connect": { - "message": "Konekte" + "message": "Konekte" }, "connecting": { - "message": "Koneksyon..." - }, - "connectingToKovan": { - "message": "Konekte nan Kovan Tès Rezo a" - }, - "connectingToMainnet": { - "message": "Konekte ak Prensipal Ethereum Rezo a" - }, - "connectingToRopsten": { - "message": "Konekte ak Ropsten Tès Rezo a" - }, - "connectingToRinkeby": { - "message": "Konekte nan Rinkeby Tès Rezo a" - }, - "connectingToUnknown": { - "message": "Konekte nan rezo enkoni" + "message": "Koneksyon..." }, "connectToLedger": { - "message": "Konekte ak Ledger" + "message": "Konekte ak Ledger" }, "connectToTrezor": { - "message": "Konekte ak Trezor" + "message": "Konekte ak Trezor" }, "continue": { - "message": "Kontinye" + "message": "Kontinye" }, "continueToCoinbase": { - "message": "Kontinye Coinbase" + "message": "Kontinye Coinbase" }, "contractDeployment": { - "message": "Kontra Deplwaman" + "message": "Kontra Deplwaman" }, "conversionProgress": { - "message": "Konvèsyon nan Pwogrè" + "message": "Konvèsyon nan Pwogrè" }, "copiedButton": { - "message": "Kopye" + "message": "Kopye" }, "copiedClipboard": { - "message": "Kopi nan Clipboard" + "message": "Kopi nan Clipboard" }, "copiedExclamation": { - "message": "Kopye!" + "message": "Kopye!" }, "copiedSafe": { - "message": "Mwen te kopye li yon kote ki san danje" + "message": "Mwen te kopye li yon kote ki san danje" }, "copy": { - "message": "Kopye" + "message": "Kopye" }, "copyAddress": { - "message": "Kopi adrès clipboard" + "message": "Kopi adrès clipboard" }, "copyToClipboard": { - "message": "Kopi clipboard" + "message": "Kopi clipboard" }, "copyButton": { - "message": " Kopi " + "message": " Kopi " }, "copyPrivateKey": { - "message": "Sa a se kle prive ou (klike pou ou kopye)" + "message": "Sa a se kle prive ou (klike pou ou kopye)" }, "create": { - "message": "Kreye" + "message": "Kreye" }, "createAccount": { - "message": "Kreye Kont" + "message": "Kreye Kont" }, "createDen": { - "message": "Kreye" + "message": "Kreye" }, "crypto": { - "message": "Crypto", - "description": "Exchange type (cryptocurrencies)" + "message": "Crypto", + "description": "Change tip (cryptocurrencies)" }, "currentConversion": { - "message": "Konvèsyon aktyèl" - }, - "currentLanguage": { - "message": "Lang Aktyèl" + "message": "Konvèsyon aktyèl" }, "currentNetwork": { - "message": "Rezo aktyèl" - }, - "currentRpc": { - "message": "Aktyèl RPC" + "message": "Rezo aktyèl" }, "customGas": { - "message": "Koutim Gaz" + "message": "Koutim Gaz" }, "customToken": { - "message": "Koutim Token" + "message": "Koutim Token" }, "customize": { - "message": "Koutim" + "message": "Koutim" }, "customRPC": { - "message": "Koutim RPC" + "message": "Koutim RPC" }, "decimalsMustZerotoTen": { - "message": "Desimal yo dwe omwen 0, epi pa dwe plis pase 36." + "message": "Desimal yo dwe omwen 0, epi pa dwe plis pase 36." }, "decimal": { - "message": "Presizyon desimal la" + "message": "Presizyon desimal la" }, "defaultNetwork": { - "message": "Dfo rezo a pou tranzaksyon Ether se Mainnet." + "message": "Dfo rezo a pou tranzaksyon DEX se Mainnet." }, "denExplainer": { - "message": "DEN ou se depo modpas avèk chif ou nan MetaMask." + "message": "DEN ou se depo modpas avèk chif ou nan MetaMask." }, "deposit": { - "message": "Depo" + "message": "Depo" }, "depositBTC": { - "message": "Depoze BTC ou nan adrès ki anba a:" + "message": "Depoze BTC ou nan adrès ki anba a:" }, "depositCoin": { - "message": "Depoze $1 ou nan adrès ki anba a", - "description": "Tells the user what coin they have selected to deposit with shapeshift" + "message": "Depoze $1 ou nan adrès ki anba a", + "description": "Tells the user what coin they have selected to deposit with shapeshift" }, "depositEth": { - "message": "Depo Eth" + "message": "Depo Eth" }, - "depositEther": { - "message": "Depo Ether" + "depositDex": { + "message": "Depo DEX" }, "depositFiat": { - "message": "Depo ak Fiat" + "message": "Depo ak Fiat" }, "depositFromAccount": { - "message": "Depo nan yon lòt kont" + "message": "Depo nan yon lòt kont" }, "depositShapeShift": { - "message": "Depo avèk ShapeShift" + "message": "Depo avèk ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Si ou posede lòt cryptocurrencies, ou ka chanje ak depo Ether dirèkteman nan Wallet MetaMask ou. Pa gen kont ki nesesè." + "message": "Si ou posede lòt cryptocurrencies, ou ka chanje ak depo DEX dirèkteman nan Wallet MetaMask ou. Pa gen kont ki nesesè." }, "details": { - "message": "Detay yo" + "message": "Detay yo" }, "directDeposit": { - "message": "Depo Dirèk" + "message": "Depo Dirèk" }, "directDepositEther": { - "message": "Dirèkteman Depo Ether" + "message": "Dirèkteman Depo DEX" }, "directDepositEtherExplainer": { - "message": "Si ou deja gen kèk Ether, fason ki pi rapid yo ka resevwa Ether nan nouvo Wallet ou pa depo dirèk." + "message": "Si ou deja gen kèk DEX, fason ki pi rapid yo ka resevwa DEX nan nouvo Wallet ou pa depo dirèk." }, "done": { - "message": "Fini" + "message": "Fini" }, "downloadGoogleChrome": { - "message": "Telechaje Google Chrome" + "message": "Telechaje Google Chrome" }, "downloadStateLogs": { - "message": "Telechaje State Logs" + "message": "Telechaje State Logs" }, "dontHaveAHardwareWallet": { - "message": "Pa gen yon materyèl bous?" + "message": "Pa gen yon materyèl bous?" }, "dropped": { - "message": "Tonbe" + "message": "Tonbe" }, "edit": { - "message": "Korije" + "message": "Korije" }, "editAccountName": { - "message": "Korije Non Kont" + "message": "Korije Non Kont" }, "editingTransaction": { - "message": "Fè chanjman nan tranzaksyon ou" + "message": "Fè chanjman nan tranzaksyon ou" }, "emailUs": { - "message": "Imèl nou!" + "message": "Imèl nou!" }, "encryptNewDen": { - "message": "Ankripte nouvo DEN ou" + "message": "Ankripte nouvo DEN ou" }, "ensNameNotFound": { - "message": "Nou pa jwenn non ENS ou a" + "message": "Nou pa jwenn non ENS ou a" }, "enterPassword": { - "message": "Mete modpas" + "message": "Mete modpas" }, "enterPasswordConfirm": { - "message": "Antre nan modpas ou a konfime" + "message": "Antre nan modpas ou a konfime" }, "enterPasswordContinue": { - "message": "Mete modpas pou kontinye" + "message": "Mete modpas pou kontinye" }, - "eth": { - "message": "ETH" + "parameters": { + "message": "Paramèt" + }, + "passwordNotLongEnough": { + "message": "Modpas la pa ase" + }, + "passwordsDontMatch": { + "message": "Modpas Pa Koresponn ak" }, "etherscanView": { - "message": "Gade kont sou Etherscan" + "message": "Gade kont sou DEXscan" }, "exchangeRate": { - "message": "Chanje to" - }, - "expandView": { - "message": "Elaji Wè" + "message": "Chanje to" }, "exportPrivateKey": { - "message": "Voye Kòd Prive" + "message": "Voye Kòd Prive" }, "exportPrivateKeyWarning": { - "message": "Voye kle prive ak pwòp risk ou." + "message": "Voye kle prive ak pwòp risk ou." }, "failed": { - "message": "Tonbe" + "message": "Tonbe" }, "fiat": { - "message": "FIAT", - "description": "Exchange type" + "message": "FIAT", + "description": "Exchange type" }, "fileImportFail": { - "message": "Enpòte dosye ki pa travay? Klike la a!", - "description": "Helps user import their account from a JSON file" + "message": "Enpòte dosye ki pa travay? Klike la a!", + "description": "Helps user import their account from a JSON file" }, "followTwitter": { - "message": "Swiv nou sou Twitter" + "message": "Swiv nou sou Twitter" }, "forgetDevice": { - "message": "Bliye aparèy sa a" + "message": "Bliye aparèy sa a" }, "from": { - "message": "Soti nan" + "message": "Soti nan" }, "fromToSame": { - "message": "Adrès orijinal le ak sa ou resevwa pake menm" + "message": "Adrès orijinal le ak sa ou resevwa pake menm" }, "fromShapeShift": { - "message": "Soti nan ShapeShift" + "message": "Soti nan ShapeShift" }, "functionType": { - "message": "Kalite Fonksyon" + "message": "Kalite Fonksyon" }, "gas": { - "message": "Gaz", - "description": "Short indication of gas cost" + "message": "Gaz", + "description": "Short indication of gas cost" }, "gasFee": { - "message": "Frè gaz" + "message": "Frè gaz" }, "gasLimit": { - "message": "Limit gaz" + "message": "Limit gaz" }, "gasLimitCalculation": { - "message": "Nou kalkile gaz limit sijere a ki baze sou pousantaj siksè rezo a." + "message": "Nou kalkile gaz limit sijere a ki baze sou pousantaj siksè rezo a." }, "gasLimitRequired": { - "message": "Limit gaz nesesè" + "message": "Limit gaz nesesè" }, "gasLimitTooLow": { - "message": "Limit gaz dwe omwen 21000" - }, - "gasUsed": { - "message": "Gaz yo Itilize" + "message": "Limit gaz dwe omwen 21000" }, "generatingSeed": { - "message": "Grenn jenerasyon..." + "message": "Génération Seed..." }, "gasPrice": { - "message": "Pri gaz (GWEI)" + "message": "Pri gaz (GWEI)" }, "gasPriceCalculation": { - "message": "Nou kalkile pri yo gaz ki sijere ki baze sou pousantaj siksè rezo." + "message": "Nou kalkile pri yo gaz ki sijere ki baze sou pousantaj siksè rezo." }, "gasPriceRequired": { - "message": "Pri Gaz la Egzije" + "message": "Pri Gaz la Egzije" }, "generatingTransaction": { - "message": "Tranzaksyon kap fè" + "message": "Tranzaksyon kap fè" }, "getEther": { - "message": "Jwenn Ether" + "message": "Jwenn DEX" }, "getEtherFromFaucet": { - "message": "Jwenn Ether nan yon tiyo pou $1 la", - "description": "Displays network name for Ether faucet" + "message": "Jwenn DEX nan yon tiyo pou $1 la", + "description": "Displays network name for DEX faucet" }, "getHelp": { - "message": "Jwenn èd." + "message": "Jwenn èd." }, "greaterThanMin": { - "message": "dwe pi gran pase oswa egal a $ 1.", - "description": "helper for inputting hex as decimal input" + "message": "dwe pi gran pase oswa egal a $ 1.", + "description": "helper for inputting hex as decimal input" }, "hardware": { - "message": "materyèl" + "message": "hardware" }, "hardwareWalletConnected": { - "message": "Materyèl Wallet konekte" + "message": "Hardware Wallet konekte" }, "hardwareWallets": { - "message": "Materyèl Wallet konekte" + "message": "Hardware Wallet konekte" }, "hardwareWalletsMsg": { - "message": "Chwazi yon Materyèl Wallet ou ta renmen itilize ak MetaMask" + "message": "Chwazi yon Hardware Wallet ou ta renmen itilize ak MetaMask" }, "havingTroubleConnecting": { - "message": "Èske w gen pwoblèm pou konekte?" + "message": "Èske w gen pwoblèm pou konekte?" }, "here": { - "message": "isit la", - "description": "as in -click here- for more information (goes with troubleTokenBalances)" + "message": "isit la", + "description": "as in -click here- for more information (goes with troubleTokenBalances)" }, "hereList": { - "message": "Isit la nan yon lis !!!!" + "message": "Isit la nan yon lis !!!!" }, "hexData": { - "message": "Hex Data" + "message": "Hex Data" }, "hide": { - "message": "Kache" + "message": "Kache" }, "hideToken": { - "message": "Kache Token" + "message": "Kache Token" }, "hideTokenPrompt": { - "message": "Kache Token?" + "message": "Kache Token?" }, "history": { - "message": "Istwa" + "message": "Istwa" }, "howToDeposit": { - "message": "Ki jan ou ta renmen depo Ether?" + "message": "Ki jan ou ta renmen depo DEX?" }, "holdEther": { - "message": "Li pèmèt ou kenbe ether & tokens, epi sèvi kòm on pon pou desantralize aplikasyon." + "message": "Li pèmèt ou kenbe ether & tokens, epi sèvi kòm on pon pou desantralize aplikasyon." }, "import": { - "message": "Pòte", - "description": "Button to import an account from a selected file" + "message": "Pòte", + "description": "Button to import an account from a selected file" }, "importAccount": { - "message": "Pòte Kont" + "message": "Pòte Kont" }, "importAccountMsg": { - "message": " Kont pòte pa pral asosye avèk orijinal ou te kreye nan kont MetaMask seed fraz. Aprann plis sou kont enpòte " + "message": " Kont pòte pa pral asosye avèk orijinal ou te kreye nan kont MetaMask seed fraz. Aprann plis sou kont enpòte " }, "importAnAccount": { - "message": "Pòte yon kont" + "message": "Pòte yon kont" }, "importDen": { - "message": "Pòte ki deja egziste DEN" + "message": "Pòte ki deja egziste DEN" }, "imported": { - "message": "Pòte", - "description": "status showing that an account has been fully loaded into the keyring" + "message": "Pòte", + "description": "status showing that an account has been fully loaded into the keyring" }, "importUsingSeed": { - "message": "Pòte lè sèvi avèk seed fraz" - }, - "info": { - "message": "Enfo" + "message": "Pòte lè sèvi avèk seed fraz" }, "infoHelp": { - "message": "Enfo & Èd" + "message": "Enfo & Èd" }, "initialTransactionConfirmed": { - "message": "Premye tranzaksyon ou konfime sou rezo a. Klike sou OK pou tounen." + "message": "Premye tranzaksyon ou konfime sou rezo a. Klike sou OK pou tounen." }, "insufficientFunds": { - "message": "Lajan ensifizan." + "message": "Lajan ensifizan." }, "insufficientTokens": { - "message": "Tokens pa valab." + "message": "Tokens pa valab." }, "invalidAddress": { - "message": "Adrès pa valab" + "message": "Adrès pa valab" }, "invalidAddressRecipient": { - "message": "Moun ki resevwa adrès la pa valab" + "message": "Moun ki resevwa adrès la pa valab" }, "invalidGasParams": { - "message": "Gaz Paramèt la pa valab" + "message": "Gaz Paramèt la pa valab" }, "invalidInput": { - "message": "Sa ou rantre a pa valab" + "message": "Sa ou rantre a pa valab" }, "invalidRequest": { - "message": "Demann pa valab" + "message": "Demann pa valab" }, "invalidRPC": { - "message": "RPC URI pa valab" + "message": "RPC URI pa valab" }, "invalidSeedPhrase": { - "message": "Seed fraz pa valab" + "message": "Seed fraz pa valab" }, "jsonFail": { - "message": "Yon bagay ale mal. Tanpri, asire w ke dosye JSON ou an byen fòmate." + "message": "Yon bagay ale mal. Tanpri, asire w ke dosye JSON ou an byen fòmate." }, "jsonFile": { - "message": "JSON Dosye", - "description": "format for importing an account" + "message": "JSON Dosye", + "description": "format for importing an account" }, "keepTrackTokens": { - "message": "Gade tokens yo ou te achte ak kont MetaMask ou." + "message": "Gade tokens yo ou te achte ak kont MetaMask ou." }, "kovan": { - "message": "Kovan Tès Rezo" + "message": "Kovan Tès Rezo" }, "knowledgeDataBase": { - "message": "Vizite baz nou an" + "message": "Vizite baz nou an" }, "max": { - "message": "Maksimòm" + "message": "Maksimòm" }, "learnMore": { - "message": "Aprann plis" + "message": "Aprann plis" }, "ledgerAccountRestriction": { - "message": "Ou bezwen sèvi ak dènye kont ou anvan ou ka ajoute yon nouvo." + "message": "Ou bezwen sèvi ak dènye kont ou anvan ou ka ajoute yon nouvo." }, "lessThanMax": { - "message": "dwe mwens pase oswa egal a $ 1.", - "description": "helper for inputting hex as decimal input" + "message": "dwe mwens pase oswa egal a $ 1.", + "description": "helper for inputting hex as decimal input" }, "likeToAddTokens": { - "message": "Èske ou ta renmen ajoute sa nan tokens?" + "message": "Èske ou ta renmen ajoute sa nan tokens?" }, "links": { - "message": "Lyen" + "message": "Lyen" }, "limit": { - "message": "Limitasyon" + "message": "Limitasyon" }, "loading": { - "message": "Telechaje..." + "message": "Telechaje..." }, "loadingTokens": { - "message": "Telechaje Tokens..." + "message": "Telechaje Tokens..." }, "localhost": { - "message": "Localhost 8545" + "message": "Localhost 8545" }, "login": { - "message": "Ouvri" + "message": "Ouvri" }, "logout": { - "message": "Dekonekte" + "message": "Dekonekte" }, "loose": { - "message": "Pèdi" + "message": "Pèdi" }, "loweCaseWords": { - "message": "seed mo sèlman gen karaktè miniskil" + "message": "seed mo sèlman gen karaktè miniskil" }, "mainnet": { - "message": "Prensipal Ethereum Rezo a" + "message": "Main DEXeum Network" }, "menu": { - "message": "Opsyon" + "message": "Opsyon" }, "message": { - "message": "Mesaje" + "message": "Mesaje" }, "metamaskDescription": { - "message": "MetaMask sekirize idantite pou Ethereum." + "message": "MetaMask sekirize idantite pou DEXeum." }, "metamaskSeedWords": { - "message": "MetaMask Seed Mo" - }, - "metamaskVersion": { - "message": "MetaMask Vèsyon" + "message": "MetaMask Seed Mo" }, "min": { - "message": "Minimòm" - }, - "missingYourTokens": { - "message": "Ou pa wè token ou a?" + "message": "Minimòm" }, "myAccounts": { - "message": "Kont mwen" + "message": "Kont mwen" }, "mustSelectOne": { - "message": "Ou dwe chwazi omwen 1 token." + "message": "Ou dwe chwazi omwen 1 token." }, "needEtherInWallet": { - "message": "Pou kominike avèk aplikasyon desantralize ou dwe itilize MetaMask, ou pral bezwen Ether nan Wallet ou." + "message": "Pou kominike avèk aplikasyon desantralize ou dwe itilize MetaMask, ou pral bezwen DEX nan Wallet ou." }, "needImportFile": { - "message": "Ou dwe chwazi yon dosye pou enpòte.", - "description": "User is important an account and needs to add a file to continue" + "message": "Ou dwe chwazi yon dosye pou enpòte.", + "description": "User is important an account and needs to add a file to continue" }, "needImportPassword": { - "message": "Ou dwe antre nan yon modpas pou dosye ou te chwazi a.", - "description": "Password and file needed to import an account" + "message": "Ou dwe antre nan yon modpas pou dosye ou te chwazi a.", + "description": "Password and file needed to import an account" }, "negativeETH": { - "message": "Pa ka voye kantite lajan negatif ETH." + "message": "Pa ka voye kantite lajan negatif ETH." }, "networks": { - "message": "Rezo" + "message": "Rezo" }, "nevermind": { - "message": "Pa pwoblèm" + "message": "Pa pwoblèm" }, "newAccount": { - "message": "Nouvo Kont" + "message": "Nouvo Kont" }, "newAccountNumberName": { - "message": "Kont $1", - "description": "Default name of next account to be created on create account screen" + "message": "Kont $1", + "description": "Default name of next account to be created on create account screen" }, "newContract": { - "message": "Nouvo Kontra" + "message": "Nouvo Kontra" }, "newPassword": { - "message": "Nouvo modpas (minit 8)" - }, - "newPassword8Chars": { - "message": "Nouvo modpas (minit 8)" + "message": "Nouvo modpas (minit 8)" }, "newRecipient": { - "message": "Nouvo Benefisyè" + "message": "Nouvo Benefisyè" }, "newRPC": { - "message": "Nouvo RPC URL" + "message": "Nouvo RPC URL" }, "next": { - "message": "Aprè sa" + "message": "Aprè sa" }, "noAddressForName": { - "message": "Pa gen adrès ki etabli pou non sa a." + "message": "Pa gen adrès ki etabli pou non sa a." }, "noDeposits": { - "message": "Pa gen depo ou te resevwa" + "message": "Pa gen depo ou te resevwa" }, "noConversionRateAvailable": { - "message": "Pa gen okenn Konvèsyon Disponib" + "message": "Pa gen okenn Konvèsyon Disponib" }, "noTransactionHistory": { - "message": "Pa gen istwa tranzaksyon." + "message": "Pa gen istwa tranzaksyon." }, "noTransactions": { - "message": "Pa gen tranzaksyon" + "message": "Pa gen tranzaksyon" }, "notFound": { - "message": "Pa jwenn" + "message": "Pa jwenn" }, "notStarted": { - "message": "Pa kòmanse" + "message": "Pa kòmanse" }, "noWebcamFoundTitle": { - "message": "Pa jwenn webcam" + "message": "Pa jwenn webcam" }, "noWebcamFound": { - "message": "Nou pakay jwenn webcam òdinatè ou. Tanpri eseye ankò." + "message": "Nou pakay jwenn webcam òdinatè ou. Tanpri eseye ankò." }, "oldUI": { - "message": "Ansyen Itilizatè kouòdone" + "message": "Ansyen Itilizatè kouòdone" }, "oldUIMessage": { - "message": "Ou te retounen nan Ansyen Itilizatè kouòdone. Ou ka chanje tounen nan nouvo Ansyen Itilizatè nan opsyon a nan meni an tèt la." - }, - "onlySendToEtherAddress": { - "message": "Sèlman voye ETH nan yon adrès Ethereum." - }, - "onlySendTokensToAccountAddress": { - "message": "Sèlman voye $ 1 nan yon adrès kont Ethereum.", - "description": "displays token symbol" + "message": "Ou te retounen nan Ansyen Itilizatè kouòdone. Ou ka chanje tounen nan nouvo Ansyen Itilizatè nan opsyon a nan meni an tèt la." }, "openInTab": { - "message": "Louvri nan etikèt" + "message": "Louvri nan etikèt" }, "or": { - "message": "oubyen", - "description": "choice between creating or importing a new account" - }, - "orderOneHere": { - "message": "Mete nan lòd on Trezor oswa Ledger epi kenbe lajan ou nan yon stòk frèt." + "message": "oubyen", + "description": "choice between creating or importing a new account" }, "origin": { - "message": "Orijin" - }, - "outgoing": { - "message": "Ap kite" - }, - "parameters": { - "message": "Paramèt" + "message": "Orijin" }, "password": { - "message": "Modpas" + "message": "Modpas" }, "passwordCorrect": { - "message": "Tanpri asire ke modpas ou kòrèk." - }, - "passwordsDontMatch": { - "message": "Modpas pa matche" + "message": "Tanpri asire ke modpas ou kòrèk." }, "passwordMismatch": { - "message": "modpas sa pa menm", - "description": "in password creation process, the two new password fields did not match" - }, - "passwordNotLongEnough": { - "message": "Modpas pa lontan ase" + "message": "modpas sa pa menm", + "description": "in password creation process, the two new password fields did not match" }, "passwordShort": { - "message": "modpas pa sifi", - "description": "in password creation process, the password is not long enough to be secure" + "message": "modpas pa sifi", + "description": "in password creation process, the password is not long enough to be secure" }, "pastePrivateKey": { - "message": "Kole fraz prive ou a la:", - "description": "For importing an account from a private key" + "message": "Kole fraz prive ou a la:", + "description": "For importing an account from a private key" }, "pasteSeed": { - "message": "Kole seed fraz ou a la!" + "message": "Kole seed fraz ou a la!" }, "pending": { - "message": "l ap mache" + "message": "l ap mache" }, "personalAddressDetected": { - "message": "Adrès pèsonèl detekte. Antre adrès kontra token la." + "message": "Adrès pèsonèl detekte. Antre adrès kontra token la." }, "pleaseReviewTransaction": { - "message": "Tanpri revize tranzaksyon ou." + "message": "Tanpri revize tranzaksyon ou." }, "popularTokens": { - "message": "Popilè Tokens" + "message": "Popilè Tokens" }, "prev": { - "message": "Avan" - }, - "primaryCurrencySetting": { - "message": "Lajan ou itilize pi plis la" - }, - "primaryCurrencySettingDescription": { - "message": "Chwazi ETH pou bay priyorite montre valè nan ETH. Chwazi Fiat priyorite montre valè nan lajan ou chwazi a." + "message": "Avan" }, "privacyMsg": { - "message": "Règleman sou enfòmasyon prive" + "message": "Règleman sou enfòmasyon prive" }, "privateKey": { - "message": "Prive kle", - "description": "select this type of file to use to import an account" + "message": "Prive kle", + "description": "select this type of file to use to import an account" }, "privateKeyWarning": { - "message": "Atansyon: pa janm divilge kle sa. Nenpòt moun kapab avèk kle prive ou a vòlè sa ou gen ou sou kont ou a." + "message": "Atansyon: pa janm divilge kle sa. Nenpòt moun kapab avèk kle prive ou a vòlè sa ou gen ou sou kont ou a." }, "privateNetwork": { - "message": "Rezo Prive" + "message": "Rezo Prive" }, "qrCode": { - "message": "Montre QR Kòd" + "message": "Montre QR Kòd" }, "queue": { - "message": "Queue" + "message": "Queue" }, "readdToken": { - "message": "Ou ka ajoute token sa aprè sa ankò ou prale nan \"Ajoute token\" nan opsyon meni kont ou an." + "message": "Ou ka ajoute token sa aprè sa ankò ou prale nan \"Ajoute token\" nan opsyon meni kont ou an." }, "readMore": { - "message": "Li plis isit la." + "message": "Li plis isit la." }, "readMore2": { - "message": "Li plis isit la." + "message": "Li plis isit la." }, "receive": { - "message": "Resevwa" + "message": "Resevwa" }, "recipientAddress": { - "message": "Adrès pou resevwa" + "message": "Adrès pou resevwa" }, "refundAddress": { - "message": "Adrès pou resevwa" - }, - "reject": { - "message": "Rejte" - }, - "rejectAll": { - "message": "Rejte Tout" - }, - "rejectTxsN": { - "message": "Rejete $ 1 tranzaksyon" - }, - "rejectTxsDescription": { - "message": "Ou se sou rejte $ 1 yon anpil nan tranzaksyon yo." + "message": "Adrès pou resevwa" }, "rejected": { - "message": "Rejete" + "message": "Rejte" }, "reset": { - "message": "Repwograme" + "message": "Repwograme" }, "resetAccount": { - "message": "Repwograme Kont" + "message": "Repwograme Kont" }, "resetAccountDescription": { - "message": "Repwograme kont a netwaye tranzaksyon ou yo." + "message": "Repwograme kont a netwaye tranzaksyon ou yo." }, "restoreFromSeed": { - "message": "Restore kont?" + "message": "Restore kont?" }, "restoreVault": { - "message": "Retabli kazye" + "message": "Retabli kazye" }, "restoreAccountWithSeed": { - "message": "Retabli kont ou avèk yo Seed Fraz" + "message": "Retabli kont ou avèk yo Seed Fraz" }, "required": { - "message": "Egzije" + "message": "Egzije" }, "retryWithMoreGas": { - "message": "Reseye ak yon pri gaz pi wo isit la" + "message": "Reseye ak yon pri gaz pi wo isit la" + }, + "walletSeed": { + "message": "Wallet Seed" }, "restore": { - "message": "Retabli" + "message": "Retabli" }, "revealSeedWords": { - "message": "Revele Seed Mo Yo" + "message": "Revele Seed Mo Yo" }, "revealSeedWordsTitle": { - "message": "Seed Fraz" + "message": "Seed Fraz" }, "revealSeedWordsDescription": { - "message": "Si ou pa janm chanje navigatè ou deplase òdinatè, ou pral bezwen fraz seed la pou ka gen aksè a kont ou. Sere yo on kote an sekirite e an sekrè." + "message": "Si ou pa janm chanje navigatè ou deplase òdinatè, ou pral bezwen fraz seed la pou ka gen aksè a kont ou. Sere yo on kote an sekirite e an sekrè." }, "revealSeedWordsWarningTitle": { - "message": "PA pataje fraz sa a avèk nenpòt moun!" + "message": "PA pataje fraz sa a avèk nenpòt moun!" }, "revealSeedWordsWarning": { - "message": "Yo ka itilize mo sa pou vòlè kont ou." + "message": "Yo ka itilize mo sa pou vòlè kont ou." }, "revert": { - "message": "Retounen" + "message": "Retounen" }, "remove": { - "message": "retire" + "message": "retire" }, "removeAccount": { - "message": "Retire kont" + "message": "Retire kont" }, "removeAccountDescription": { - "message": "Kont sa a pral retire nan Wallet ou. Tanpri, asire ou ke ou gen orijinal fraz seed la oubyen kle prive pou rantre kont lan avan ou kontinye. Oubyen ou ka rantre kont ou ankò apati kont \"drop-down\" ou an." + "message": "Kont sa a pral retire nan Wallet ou. Tanpri, asire ou ke ou gen orijinal fraz seed la oubyen kle prive pou rantre kont lan avan ou kontinye. Oubyen ou ka rantre kont ou ankò apati kont \"drop-down\" ou an." }, "readyToConnect": { - "message": "Pare pou konekte?" + "message": "Pare pou konekte?" }, "rinkeby": { - "message": "Rinkeby Tès Rezo" + "message": "Rinkeby Tès Rezo" }, "ropsten": { - "message": "Ropsten Tès Rezo" + "message": "Ropsten Tès Rezo" }, "rpc": { - "message": "Koutim RPC" + "message": "Koutim RPC" + }, + "currentRpc": { + "message": "Kounya RPC" + }, + "connectingToMainnet": { + "message": "Konekte ak Main (Prensipal) DEXeum Rezo a" + }, + "connectingToRopsten": { + "message": "Konekte ak Ropsten Tès Rezo a" + }, + "connectingToKovan": { + "message": "Konekte nan Kovan Tès Rezo a" + }, + "connectingToTestnet": { + "message": "Konekte nan Rinkeby Tès Rezo a" + }, + "connectingToUnknown": { + "message": "Konekte nan rezo enkoni" }, "sampleAccountName": { - "message": "Pa egzanp, Nouvo kont mwen an", - "description": "Help user understand concept of adding a human-readable name to their account" + "message": "Pa egzanp, Nouvo kont mwen an", + "description": "Help user understand concept of adding a human-readable name to their account" }, "save": { - "message": "Sove" + "message": "Sove" + }, + "speedUp": { + "message": "pi vit" + }, + "speedUpTitle": { + "message": "Monte vitès tranzaksyon" + }, + "speedUpSubtitle": { + "message": "Ogmante pri gaz ou pou eseye efase tranzaksyon ou pi vit" }, "saveAsCsvFile": { - "message": "Sove kòm dosye CSV" + "message": "Sove kòm dosye CSV" }, "saveAsFile": { - "message": "Sove kòm dosye", - "description": "Account export process" + "message": "Sove kòm dosye", + "description": "Account export process" }, "saveSeedAsFile": { - "message": "Sove pawòl seed kòm dosye" - }, - "scanInstructions": { - "message": "Mete kòd QR la devan kamera ou" - }, - "scanQrCode": { - "message": "Enspeksyon QR Kòd" + "message": "Sove pawòl seed kòm dosye" }, "search": { - "message": "Rechèch" + "message": "Rechèch" }, "searchResults": { - "message": "Rezilta rechèch" + "message": "Rezilta rechèch" }, "secretPhrase": { - "message": "Antre fraz sekrè douz mo ou a pou w restore kòf ou a." + "message": "Antre fraz sekrè douz mo ou a pou w restore kòf ou a." + }, + "showHexData": { + "message": "Montre Hex Data" + }, + "showHexDataDescription": { + "message": "Pran sa pouw ka montre chan entèfas hex data a" + }, + "newPassword8Chars": { + "message": "Nouvo modpas (pou pi pit 8)" }, "seedPhraseReq": { - "message": "Seed fraz yo se 12 long mo" + "message": "Seed fraz yo se 12 long mo" }, "select": { - "message": "Chwazi" + "message": "Chwazi" }, "selectCurrency": { - "message": "Chwazi Lajan" - }, - "selectLocale": { - "message": "Chwazi Lokasyon" + "message": "Chwazi Lajan" }, "selectService": { - "message": "Chwazi Sèvis" + "message": "Chwazi Sèvis" }, "selectType": { - "message": "Chwazi Kalite" + "message": "Chwazi Kalite" }, "send": { - "message": "Voye" + "message": "Voye" }, "sendETH": { - "message": "Voye ETH" + "message": "Voye ETH" }, "sendTokens": { - "message": "Voye Tokens" + "message": "Voye Tokens" }, "sentEther": { - "message": "Voye ether" + "message": "Voye ether" }, "sentTokens": { - "message": "tokens deja voye" + "message": "tokens deja voye" }, "separateEachWord": { - "message": "Separe chak mo ak yon sèl espas" + "message": "Separe chak mo ak yon sèl espas" + }, + "onlySendToEtherAddress": { + "message": "Sèlman voye ETH nan yon adrès DEXeum." + }, + "onlySendTokensToAccountAddress": { + "message": "Sèlman voye $ 1 nan yon adrès kont DEXeum.", + "description": "displays token symbol" + }, + "orderOneHere": { + "message": "Mete nan lòd on Trezor oswa Ledger epi kenbe lajan ou nan yon stòk frèt." + }, + "outgoing": { + "message": "Ap kite" }, "searchTokens": { - "message": "Rechèch Tokens" + "message": "Rechèch Tokens" }, "selectAnAddress": { - "message": "Chwazi yon adrès" + "message": "Chwazi yon adrès" }, "selectAnAccount": { - "message": "Chwazi yon kont" + "message": "Chwazi yon kont" }, "selectAnAccountHelp": { - "message": "Chwazi kont pou wè nan MetaMask" + "message": "Chwazi kont pou wè nan MetaMask" }, "selectHdPath": { - "message": "Chwazi chemen HD" + "message": "Chwazi chemen HD" }, "selectPathHelp": { - "message": "Si ou pa wè kont Ledger ou te genyen an anba a, eseye chanje chemen an \"Eritaj (MEW / MyCrypto)\"" + "message": "Si ou pa wè kont Ledger ou te genyen an anba a, eseye chanje chemen an \"Eritaj (MEW / MyCrypto)\"" }, "sendTokensAnywhere": { - "message": "Voye Tokens pou nenpòt moun ki gen yon kont Ethereum" + "message": "Voye Tokens pou nenpòt moun ki gen yon kont DEXeum" }, "settings": { - "message": "Paramèt" + "message": "Paramèt" + }, + "step1HardwareWallet": { + "message": "1. Konekte Materyèl bous" + }, + "step1HardwareWalletMsg": { + "message": "Konekte materyèl bous ou dirèkteman nan òdinatè ou." + }, + "step2HardwareWallet": { + "message": "2. Chwazi yon kont" + }, + "step2HardwareWalletMsg": { + "message": "Chwazi kont ou vle wè a. Ou ka chwazi youn sèlman nan yon moman." + }, + "step3HardwareWallet": { + "message": "3. Kòmanse itilize dApps ak plis ankò!" + }, + "step3HardwareWalletMsg": { + "message": "Sèvi ak kont materyèl ou menm jan ou t ap fè pou kont DEXum. Ouvri sesyon an nan dApps, voye Eth, achte ak stòke ERC20 tokens ak e ki pake chanje tokens tankou CryptoKitties." + }, + "info": { + "message": "Enfòmasyon" + }, + "scanInstructions": { + "message": "Mete kòd QR la devan kamera ou" + }, + "scanQrCode": { + "message": "Enspeksyon QR Kòd" }, "shapeshiftBuy": { - "message": "Achte avèk Shapeshift" + "message": "Achte avèk Shapeshift" }, "showPrivateKeys": { - "message": "Montre Kle Prive" + "message": "Montre Kle Prive" }, "showQRCode": { - "message": "Montre Kòd QR" - }, - "showHexData": { - "message": "Montre Hex Data" - }, - "showHexDataDescription": { - "message": "Pran sa pouw ka montre chan entèfas hex data a" + "message": "Montre Kòd QR" }, "sign": { - "message": "Siyen" + "message": "Siyen" }, "signatureRequest": { - "message": "Siyati Mande" + "message": "Siyati Mande" }, "signed": { - "message": "Te Siyen" + "message": "Te Siyen" }, "signMessage": { - "message": "Siyen mesaj" + "message": "Siyen mesaj" }, "signNotice": { - "message": "Lè w siyen mesaj sa a ka gen efè segondè ki \ndanjere. Sèlman \nsit mesaj ki soti nan sit ou konplètman fè konfyans ak tout kont ou. \n Metòd danjere sa yo pral retire nan yon vèsyon fiti. " + "message": "Lè w siyen mesaj sa a ka gen efè segondè ki \ndanjere. Sèlman \nsit mesaj ki soti nan sit ou konplètman fè konfyans ak tout kont ou. \n Metòd danjere sa yo pral retire nan yon vèsyon fiti. " }, "sigRequest": { - "message": "Demann Siyati" + "message": "Demann Siyati" }, "sigRequested": { - "message": "Demann Siyati" + "message": "Demann Siyati" }, "spaceBetween": { - "message": "ka gen sèlman yon espas ant mo yo" - }, - "speedUp": { - "message": "pi vit" - }, - "speedUpTitle": { - "message": "Monte vitès tranzaksyon" - }, - "speedUpSubtitle": { - "message": "Ogmante pri gaz ou pou eseye efase tranzaksyon ou pi vit" + "message": "ka gen sèlman yon espas ant mo yo" }, "status": { - "message": "Kondisyon" + "message": "Kondisyon" }, "stateLogs": { - "message": "State Logs" + "message": "State Logs" }, "stateLogsDescription": { - "message": "State logs gen adrès kont piblik ou yo epi tranzaksyon ou te voye yo." + "message": "State logs gen adrès kont piblik ou yo epi tranzaksyon ou te voye yo." }, "stateLogError": { - "message": "Erè nan retwouve State Logs yo." - }, - "step1HardwareWallet": { - "message": "1. Konekte Materyèl bous" - }, - "step1HardwareWalletMsg": { - "message": "Konekte materyèl bous ou dirèkteman nan òdinatè ou." - }, - "step2HardwareWallet": { - "message": "2. Chwazi yon kont" - }, - "step2HardwareWalletMsg": { - "message": "Chwazi kont ou vle wè a. Ou ka chwazi youn sèlman nan yon moman." - }, - "step3HardwareWallet": { - "message": "3. Kòmanse itilize dApps ak plis ankò!" - }, - "step3HardwareWalletMsg": { - "message": "Sèvi ak kont materyèl ou menm jan ou t ap fè pou kont Etherum. Ouvri sesyon an nan dApps, voye Eth, achte ak stòke ERC20 tokens ak e ki pake chanje tokens tankou CryptoKitties." + "message": "Erè nan retwouve State Logs yo." }, "submit": { - "message": "Soumèt" + "message": "Soumèt" }, "submitted": { - "message": "Te Soumèt" + "message": "Te Soumèt" }, "supportCenter": { - "message": "Vizite Sant Sipò Nou" + "message": "Vizite Sant Sipò Nou" }, - "symbolBetweenZeroTwelve": { - "message": "Senbòl yo dwe ant 0 ak 12 karaktè." + "symbolBetweenZeroTen": { + "message": "Senbòl yo dwe ant 0 ak 10 karaktè." }, "takesTooLong": { - "message": "Pran twò lontan?" + "message": "Pran twò lontan?" }, "terms": { - "message": "Tèm pou itilize" + "message": "Tèm pou itilize" }, "testFaucet": { - "message": "Tès Tiyo" + "message": "Tès Tiyo" }, "to": { - "message": "Pou" + "message": "Pou" }, "toETHviaShapeShift": { - "message": "$1 pou ETH pa ShapeShift", - "description": "system will fill in deposit type in start of message" + "message": "$1 pou ETH pa ShapeShift", + "description": "system will fill in deposit type in start of message" }, "token": { - "message": "Token" + "message": "Token" }, "tokenAddress": { - "message": "Adrès Token" + "message": "Adrès Token" }, "tokenAlreadyAdded": { - "message": "Ou te deja ajoute token." + "message": "Ou te deja ajoute token." }, "tokenBalance": { - "message": "Balans Token ou se:" + "message": "Balans Token ou se:" }, "tokenSelection": { - "message": "Chache Tokens oswa chwazi nan lis Tokens popilè nou an." + "message": "Chache Tokens oswa chwazi nan lis Tokens popilè nou an." }, "tokenSymbol": { - "message": "Token Senbòl" + "message": "Token Senbòl" }, "tokenWarning1": { - "message": "Kenbe tras token yo ou te achte ak kont MetaMask ou. Si ou te achte tokens pandan wap itilize yon kont diferan tokens sa yo pa pral parèt la." + "message": "Kenbe tras token yo ou te achte ak kont MetaMask ou. Si ou te achte tokens pandan wap itilize yon kont diferan tokens sa yo pa pral parèt la." }, "total": { - "message": "Total" + "message": "Total" }, - "transaction": { - "message": "tranzaksyon yo" + "transactions": { + "message": "tranzaksyon yo" }, "transactionConfirmed": { - "message": "Tranzaksyon ou te konfime pou $2." + "message": "Tranzaksyon ou te konfime pou $2." }, "transactionCreated": { - "message": "Tranzaksyon ou te kreye avèk on valè de $1 pou $2." - }, - "transactionWithNonce": { - "message": "Tranzaksyon $1" + "message": "Tranzaksyon ou te kreye avèk on valè de $1 pou $2." }, "transactionDropped": { - "message": "Tranzaksyon ou te tonbe a $2." + "message": "Tranzaksyon ou te tonbe a $2." }, "transactionSubmitted": { - "message": "Tranzaksyon ou te soumèt a $2." + "message": "Tranzaksyon ou te soumèt a $2." }, "transactionUpdated": { - "message": "Tranzaksyon ou te aktyalize a $2." + "message": "Tranzaksyon ou te aktyalize a $2." }, "transactionUpdatedGas": { - "message": "Tranzaksyon ou te aktyalize avèk on pri gaz de $1 a $2." - }, - "transactions": { - "message": "transactions" + "message": "Tranzaksyon ou te aktyalize avèk on pri gaz de $1 a $2." }, "transactionError": { - "message": "Erè tranzaksyon. Eksepsyon jete nan kòd kontra." + "message": "Erè tranzaksyon. Eksepsyon jete nan kòd kontra." }, "transactionMemo": { - "message": "Memo tranzaksyon (opsyonèl)" + "message": "Memo tranzaksyon (opsyonèl)" }, "transactionNumber": { - "message": "Nimewo Tranzaksyon" + "message": "Nimewo Tranzaksyon" }, "transfer": { - "message": "Transfè" - }, - "transferFrom": { - "message": "Transfer From" + "message": "Transfè" }, "transfers": { - "message": "Transfè yo" + "message": "Transfè yo" }, "trezorHardwareWallet": { - "message": "TREZOR Materyèl Bous" + "message": "TREZOR Materyèl Bous" }, "troubleTokenBalances": { - "message": "Nou te gen pwoblèm chaje balans token ou. Ou ka wè yo ", - "description": "Followed by a link (here) to view token balances" + "message": "Nou te gen pwoblèm chaje balans token ou. Ou ka wè yo ", + "description": "Followed by a link (here) to view token balances" }, "tryAgain": { - "message": "Eseye anko" + "message": "Eseye anko" }, "twelveWords": { - "message": "12 mo sa yo se sèl fason pou retabli kont MetaMask ou yo. \nKenbe yo yon kote ki an sekirite ak sekrè." + "message": "12 mo sa yo se sèl fason pou retabli kont MetaMask ou yo. \nKenbe yo yon kote ki an sekirite ak sekrè." }, "typePassword": { - "message": "Tape modpas ou" + "message": "Tape modpas ou" }, "uiWelcome": { - "message": "Byenveni nan New itilizatè koòdone (Beta)" + "message": "Byenveni nan New itilizatè koòdone (Beta)" }, "uiWelcomeMessage": { - "message": "Kounya w ap itilize nouvo MetaMask UI (itilizatè koòdone) a." + "message": "Kounya w ap itilize nouvo MetaMask UI (itilizatè koòdone) a." }, "unapproved": { - "message": "Pa apwouve" + "message": "Pa apwouve" }, "unavailable": { - "message": "Pa disponib" + "message": "Pa disponib" }, "units": { - "message": "inite yo" + "message": "inite yo" }, "unknown": { - "message": "Enkoni" + "message": "Enkoni" }, "unknownFunction": { - "message": "Fonksyon enkoni" + "message": "Fonksyon enkoni" }, "unknownNetwork": { - "message": "Rezo Prive Enkoni" + "message": "Rezo Prive Enkoni" }, "unknownNetworkId": { - "message": "Rezo ID Enkoni" + "message": "Rezo ID Enkoni" }, "unknownQrCode": { - "message": "Erè: Nou pa t kapab idantifye QR kòd sa" + "message": "Erè: Nou pa t kapab idantifye QR kòd sa" }, "unknownCameraErrorTitle": { - "message": "Ooops! Yon bagay te ale mal...." + "message": "Ooops! Yon bagay te ale mal...." }, "unknownCameraError": { - "message": "Te gen yon erè pandan y ap eseye jwenn aksè nan kamera ou. Tanpri eseye ankò..." + "message": "Te gen yon erè pandan y ap eseye jwenn aksè nan kamera ou. Tanpri eseye ankò..." }, "unlock": { - "message": "Debloke" + "message": "Debloke" }, "unlockMessage": { - "message": "Entènèt desantralize a ap tann" - }, - "updatedWithDate": { - "message": "Mete ajou $1" + "message": "Entènèt desantralize a ap tann" }, "uriErrorMsg": { - "message": "URIs mande pou apwopriye prefiks HTTP / HTTPS a." + "message": "URIs mande pou apwopriye prefiks HTTP / HTTPS a." }, "usaOnly": { - "message": "USA sèlman", - "description": "Using this exchange is limited to people inside the USA" + "message": "USA sèlman", + "description": "Using this exchange is limited to people inside the USA" }, "usedByClients": { - "message": "Itilize pa yon varyete de kliyan diferan" + "message": "Itilize pa yon varyete de kliyan diferan" }, "useOldUI": { - "message": "Itilizasyon ansyen UI (itilizatè koòdone)" + "message": "Itilizasyon ansyen UI (itilizatè koòdone)" }, "validFileImport": { - "message": "Ou dwe chwazi yon dosye ki valab pou enpòte." + "message": "Ou dwe chwazi yon dosye ki valab pou enpòte." }, "vaultCreated": { - "message": "Kòf Kreye" + "message": "Kòf Kreye" }, "viewAccount": { - "message": "Wè Kont" + "message": "Wè Kont" }, "viewOnEtherscan": { - "message": "Wè sou Etherscan" + "message": "Wè sou DEXscan" }, "visitWebSite": { - "message": "Vizite sit entènèt nou an" - }, - "walletSeed": { - "message": "Bous Seed" + "message": "Vizite sit entènèt nou an" }, "warning": { - "message": "Avètisman" + "message": "Avètisman" }, "welcomeBack": { - "message": "Bon Retou!" + "message": "Bon retou!" }, - "welcome": { - "message": "Byenveni nan MetaMask" + "welcomeBeta": { + "message": "Byenveni nan MetaMask Beta" }, "whatsThis": { - "message": "Kisa sa ye?" - }, - "yesLetsTry": { - "message": "Wi, ann eseye" + "message": "Kisa sa ye?" }, "youNeedToAllowCameraAccess": { - "message": "Ou bezwen bay kamera aksè pou sèvi ak fonksyon sa." + "message": "Ou bezwen bay kamera aksè pou sèvi ak fonksyon sa." }, "yourSigRequested": { - "message": "Yo mande siyati ou" + "message": "Yo mande siyati ou" }, "youSign": { - "message": "Ou ap siyen kounya" + "message": "Ou ap siyen kounya" }, "yourPrivateSeedPhrase": { - "message": "Seed fraz prive ou a" + "message": "Seed fraz prive ou a" } } diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 174b7730..7727e914 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -316,7 +316,7 @@ "message": "Precisione Decimali" }, "defaultNetwork": { - "message": "La rete predefinita per transazioni in Ether è la Rete Dexon Principale." + "message": "La rete predefinita per transazioni in DEX è la Rete Dexon Principale." }, "denExplainer": { "message": "Il DEN è il tuo archivio crittato con password dentro Dex San." @@ -334,8 +334,8 @@ "depositEth": { "message": "Deposita Eth" }, - "depositEther": { - "message": "Deposita Ether" + "depositDex": { + "message": "Deposita DEX" }, "depositFiat": { "message": "Deposita con moneta Fiat" @@ -347,7 +347,7 @@ "message": "Deposita con ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Se possiedi altre criptomonete, puoi scambiare e depositare Ether direttamente nel tuo portafoglio Dex San. Nessun account richiesto." + "message": "Se possiedi altre criptomonete, puoi scambiare e depositare DEX direttamente nel tuo portafoglio Dex San. Nessun account richiesto." }, "details": { "message": "Dettagli" @@ -356,10 +356,10 @@ "message": "Deposito Diretto" }, "directDepositEther": { - "message": "Deposita Direttamente Ether" + "message": "Deposita Direttamente DEX" }, "directDepositEtherExplainer": { - "message": "Se possiedi già degli Ether, questa è la via più veloce per aggiungere Ether al tuo portafoglio con un deposito diretto." + "message": "Se possiedi già degli DEX, questa è la via più veloce per aggiungere DEX al tuo portafoglio con un deposito diretto." }, "done": { "message": "Finito" @@ -404,7 +404,7 @@ "message": "Inserisci la tua password per continuare" }, "etherscanView": { - "message": "Vedi account su Etherscan" + "message": "Vedi account su DEXscan" }, "exchangeRate": { "message": "Tasso di cambio" @@ -482,11 +482,11 @@ "message": "Generando la transazione" }, "getEther": { - "message": "Ottieni Ether" + "message": "Ottieni DEX" }, "getEtherFromFaucet": { - "message": "Ottieni Get Ether da un faucet per $1", - "description": "Visualizza il nome della rete per il faucet Ether" + "message": "Ottieni Get DEX da un faucet per $1", + "description": "Visualizza il nome della rete per il faucet DEX" }, "getHelp": { "message": "Aiuto." @@ -533,7 +533,7 @@ "message": "Storico" }, "howToDeposit": { - "message": "Come vuoi depositare Ether?" + "message": "Come vuoi depositare DEX?" }, "holdEther": { "message": "Ti permette di tenere ether & token, e serve da ponte per le applicazioni decentralizzate." @@ -684,7 +684,7 @@ "message": "Devi selezionare almeno un token." }, "needEtherInWallet": { - "message": "Per interagire con applicazioni decentralizzate con Dex San, devi possedere Ether nel tuo portafoglio." + "message": "Per interagire con applicazioni decentralizzate con Dex San, devi possedere DEX nel tuo portafoglio." }, "needImportFile": { "message": "Devi selezionare un file da importare.", diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index e90080ec..da6f92fb 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -226,7 +226,7 @@ "depositEth": { "message": "ETHを入金" }, - "depositEther": { + "depositDex": { "message": "Etherを振込" }, "depositFiat": { @@ -330,7 +330,7 @@ }, "getEtherFromFaucet": { "message": "フォーセットで $1のEtherを得ることができます。", - "description": "Displays network name for Ether faucet" + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": " $1以上にして下さい。", diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 4c6541d2..8c6a89e5 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -331,7 +331,7 @@ "depositEth": { "message": "이더 입금하기" }, - "depositEther": { + "depositDex": { "message": "이더리움 입금하기" }, "depositFiat": { @@ -935,6 +935,9 @@ "rpc": { "message": "사용자 정의 RPC" }, + "connectingToTestnet": { + "message": "Rinkeby 테스트넷 접속중" + }, "sampleAccountName": { "message": "예) 나의 새 계정", "description": "각 계정에 대해서 구별하기 쉬운 이름을 지정하여 사용자가 쉽게 이해할 수 있게 합니다" diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 507b4efe..341704fb 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -220,7 +220,7 @@ "message": "Decimalen van precisie" }, "defaultNetwork": { - "message": "Het standaardnetwerk voor Ether-transacties is Main Net." + "message": "Het standaardnetwerk voor DEX-transacties is Main Net." }, "denExplainer": { "message": "Uw DEN is uw wachtwoord-gecodeerde opslag binnen Dex San." @@ -238,8 +238,8 @@ "depositEth": { "message": "Aanbetaling Eth" }, - "depositEther": { - "message": "Stort Ether" + "depositDex": { + "message": "Stort DEX" }, "depositFiat": { "message": "Stort met Fiat" @@ -251,7 +251,7 @@ "message": "Stort met ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Als u andere cryptocurrencies bezit, kunt u Ether direct in uw Dex San-portemonnee ruilen en storten. Geen account nodig." + "message": "Als u andere cryptocurrencies bezit, kunt u DEX direct in uw Dex San-portemonnee ruilen en storten. Geen account nodig." }, "details": { "message": "Details" @@ -260,10 +260,10 @@ "message": "Directe storting" }, "directDepositEther": { - "message": "Directe Ether storten" + "message": "Directe DEX storten" }, "directDepositEtherExplainer": { - "message": "Als je al wat Ether hebt, de snelste manier om Ether in je nieuwe portemonnee te krijgen door een directe storting." + "message": "Als je al wat DEX hebt, de snelste manier om DEX in je nieuwe portemonnee te krijgen door een directe storting." }, "done": { "message": "Gedaan" @@ -290,7 +290,7 @@ "message": "Voer uw wachtwoord in om te bevestigen" }, "etherscanView": { - "message": "Bekijk account op Etherscan" + "message": "Bekijk account op DEXscan" }, "exchangeRate": { "message": "Wisselkoers" @@ -356,11 +356,11 @@ "message": "Gasprijs vereist" }, "getEther": { - "message": "Krijg Ether" + "message": "Krijg DEX" }, "getEtherFromFaucet": { - "message": "Haal Ether uit een kraan voor de $1", - "description": "Geeft de netwerknaam voor Ether-kraan weer" + "message": "Haal DEX uit een kraan voor de $1", + "description": "Geeft de netwerknaam voor DEX-kraan weer" }, "greaterThanMin": { "message": "moet groter zijn dan of gelijk zijn aan $1.", @@ -383,7 +383,7 @@ "message": "Token verbergen?" }, "howToDeposit": { - "message": "Hoe zou je Ether willen deponeren?" + "message": "Hoe zou je DEX willen deponeren?" }, "holdEther": { "message": "Hiermee kunt u ether & tokens bewaren en dient u als brug naar gedecentraliseerde applicaties." @@ -498,7 +498,7 @@ "message": "Moet ten minste één token selecteren." }, "needEtherInWallet": { - "message": "Om te communiceren met gedecentraliseerde applicaties met Dex San, heb je Ether nodig in je portemonnee." + "message": "Om te communiceren met gedecentraliseerde applicaties met Dex San, heb je DEX nodig in je portemonnee." }, "needImportFile": { "message": "U moet een bestand selecteren om te importeren.", diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 9dd8b9a7..4d94055d 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -181,7 +181,7 @@ "message": "Custom RPC" }, "defaultNetwork": { - "message": "Ang default network para sa Ether transactions ay ang Main Net." + "message": "Ang default network para sa DEX transactions ay ang Main Net." }, "denExplainer": { "message": "Ang iyong DEN ang nagsisilbing password-encrypted storage mo sa loob ng Dex San." @@ -199,8 +199,8 @@ "depositEth": { "message": "I-deposito ang Eth" }, - "depositEther": { - "message": "I-deposito ang Ether" + "depositDex": { + "message": "I-deposito ang DEX" }, "depositFiat": { "message": "I-deposito ang Fiat" @@ -212,7 +212,7 @@ "message": "I-deposito gamit ang ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Kung ikaw ay nagmamay-ari ng iba pang cryptocurrencies, pwede kang mag-trade at mag-deposito ng Ether diretso sa iyong Dex San wallet. Hindi mo na kailangan ng account." + "message": "Kung ikaw ay nagmamay-ari ng iba pang cryptocurrencies, pwede kang mag-trade at mag-deposito ng DEX diretso sa iyong Dex San wallet. Hindi mo na kailangan ng account." }, "details": { "message": "Detalye" @@ -221,10 +221,10 @@ "message": "Direktang Deposito" }, "directDepositEther": { - "message": "Direktang I-deposito ang Ether" + "message": "Direktang I-deposito ang DEX" }, "directDepositEtherExplainer": { - "message": "Kung ika ay mayroon nang Ether, ang pinakamabilis na paraan upang makuha ang Ether sa iyong bagong wallet ay sa pamamagitan ng direktang deposito." + "message": "Kung ika ay mayroon nang DEX, ang pinakamabilis na paraan upang makuha ang DEX sa iyong bagong wallet ay sa pamamagitan ng direktang deposito." }, "done": { "message": "Tapos na" @@ -242,7 +242,7 @@ "message": "I-enter ang password" }, "etherscanView": { - "message": "Tingnan ang account sa Etherscan" + "message": "Tingnan ang account sa DEXscan" }, "exchangeRate": { "message": "Exchange Rate" @@ -299,11 +299,11 @@ "message": "Kailangan ang Gas Price" }, "getEther": { - "message": "Kumuha ng Ether" + "message": "Kumuha ng DEX" }, "getEtherFromFaucet": { - "message": "Kumuha ng Ether mula sa faucet para sa $1", - "description": "Ipinapakita ang pangalan ng network para sa Ether faucet" + "message": "Kumuha ng DEX mula sa faucet para sa $1", + "description": "Ipinapakita ang pangalan ng network para sa DEX faucet" }, "greaterThanMin": { "message": "dapat mas malaki o katumbas ng $1.", @@ -323,7 +323,7 @@ "message": "Itago ang Token?" }, "howToDeposit": { - "message": "Paano mo gustong mag-deposito ng Ether?" + "message": "Paano mo gustong mag-deposito ng DEX?" }, "import": { "message": "I-import", @@ -399,7 +399,7 @@ "message": "Aking mga Account" }, "needEtherInWallet": { - "message": "Upang makipag-ugnayan sa decentralized applications gamit ang Dex San, kakailanganin mo ng Ether sa iyong wallet." + "message": "Upang makipag-ugnayan sa decentralized applications gamit ang Dex San, kakailanganin mo ng DEX sa iyong wallet." }, "needImportFile": { "message": "Dapat kang pumili ng file para i-import.", diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 8d773e99..334078b7 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -220,7 +220,7 @@ "message": "Precisão em Decimais" }, "defaultNetwork": { - "message": "A rede pré definida para transações em Ether é a Main Net." + "message": "A rede pré definida para transações em DEX é a Main Net." }, "denExplainer": { "message": " DEN é o armazenamento encriptado da sua palavra-passe no Dex San." @@ -238,8 +238,8 @@ "depositEth": { "message": "Depositar Eth" }, - "depositEther": { - "message": "Depositar Ether" + "depositDex": { + "message": "Depositar DEX" }, "depositFiat": { "message": "Depositar moeda fiduciária" @@ -251,7 +251,7 @@ "message": "Depositar com ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Se tem criptomoedas, pode trocar e depositar Ether diretamente na sua carteira Dex San. Não precisa de conta." + "message": "Se tem criptomoedas, pode trocar e depositar DEX diretamente na sua carteira Dex San. Não precisa de conta." }, "details": { "message": "Detalhes" @@ -260,10 +260,10 @@ "message": "Depósito Direto" }, "directDepositEther": { - "message": "Depositar Diretamente Ether" + "message": "Depositar Diretamente DEX" }, "directDepositEtherExplainer": { - "message": "Se já tem Ether, a forma mais rápida de ficar com Ether na sua carteira é através de depósito direto." + "message": "Se já tem DEX, a forma mais rápida de ficar com DEX na sua carteira é através de depósito direto." }, "done": { "message": "Finalizado" @@ -290,7 +290,7 @@ "message": "Introduza a sua palavra-passe para confirmar" }, "etherscanView": { - "message": "Ver conta no Etherscan" + "message": "Ver conta no DEXscan" }, "exchangeRate": { "message": "Taxa de Câmbio" @@ -356,11 +356,11 @@ "message": "Preço Gas Necessário" }, "getEther": { - "message": "Obter Ether" + "message": "Obter DEX" }, "getEtherFromFaucet": { - "message": "Obter Ether de um faucet por $1", - "description": "Mostra nome da rede para faucet de Ether" + "message": "Obter DEX de um faucet por $1", + "description": "Mostra nome da rede para faucet de DEX" }, "greaterThanMin": { "message": "tem de ser maior ou igual a $1.", @@ -383,7 +383,7 @@ "message": "Ocultar Token?" }, "howToDeposit": { - "message": "Como gostaria de depositar Ether?" + "message": "Como gostaria de depositar DEX?" }, "holdEther": { "message": "Permite ter ether & tokens, e serve como uma ponte para aplicações descentralizadas." @@ -498,7 +498,7 @@ "message": "Deve escolher no mínimo 1 token." }, "needEtherInWallet": { - "message": "Para interagir com applicações descentralizadas usando Dex San tem de ter Ether na sua carteira." + "message": "Para interagir com applicações descentralizadas usando Dex San tem de ter DEX na sua carteira." }, "needImportFile": { "message": "Deve selecionar um ficheiro para importar.", diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 52a18735..540986ea 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -232,7 +232,7 @@ "message": "Количество десятичных разрядов" }, "defaultNetwork": { - "message": "Основная сеть Dexon – это сеть по умолчанию для Ether транзакций." + "message": "Основная сеть Dexon – это сеть по умолчанию для DEX транзакций." }, "denExplainer": { "message": "DEN – это зашифрованное паролем хранилище внутри Dex San." @@ -250,8 +250,8 @@ "depositEth": { "message": "Пополнить Eth" }, - "depositEther": { - "message": "Пополнить Ether" + "depositDex": { + "message": "Пополнить DEX" }, "depositFiat": { "message": "Пополнить деньгами" @@ -263,7 +263,7 @@ "message": "Пополнить через ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Если у вас есть другие криптовалюты, вы можете торговать и пополнять Ether напрямую в ваш Dex San кошелек. Нет необходимости в счете." + "message": "Если у вас есть другие криптовалюты, вы можете торговать и пополнять DEX напрямую в ваш Dex San кошелек. Нет необходимости в счете." }, "details": { "message": "Детали" @@ -272,10 +272,10 @@ "message": "Прямое пополнение" }, "directDepositEther": { - "message": "Прямое пополнение Ether" + "message": "Прямое пополнение DEX" }, "directDepositEtherExplainer": { - "message": "Если у вас уже есть Ether, то самый быстрый способ получить Ether в ваш новый кошелек – это прямое пополнение." + "message": "Если у вас уже есть DEX, то самый быстрый способ получить DEX в ваш новый кошелек – это прямое пополнение." }, "done": { "message": "Готово" @@ -305,7 +305,7 @@ "message": "Введите ваш пароль для подтверждения" }, "etherscanView": { - "message": "Просмотреть счет на Etherscan" + "message": "Просмотреть счет на DEXscan" }, "exchangeRate": { "message": "Обменный курс" @@ -371,11 +371,11 @@ "message": "Установите стоимость газа" }, "getEther": { - "message": "Получить Ether" + "message": "Получить DEX" }, "getEtherFromFaucet": { - "message": "Получить Ether из крана для $1", - "description": "Displays network name for Ether faucet" + "message": "Получить DEX из крана для $1", + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": "должно быть больше или равно $1.", @@ -398,7 +398,7 @@ "message": "Скрыть токен?" }, "howToDeposit": { - "message": "Как бы вы хотели пополнить Ether?" + "message": "Как бы вы хотели пополнить DEX?" }, "holdEther": { "message": "Позволяет вам хранить ether и токены и служит в качестве моста в децентрализированные приложения." @@ -525,7 +525,7 @@ "message": "Необходимо выбрать как минимум 1 токен." }, "needEtherInWallet": { - "message": "Для взаимодействия с децентрализованными приложениями с помощью Dex San нужен Ether в вашем кошельке." + "message": "Для взаимодействия с децентрализованными приложениями с помощью Dex San нужен DEX в вашем кошельке." }, "needImportFile": { "message": "Вы должны выбрать файл для импорта.", @@ -697,7 +697,7 @@ "connectingToKovan": { "message": "Соединение с тестовой сетью Kovan" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "Соединение с тестовой сетью Rinkeby" }, "connectingToUnknown": { diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 4853c6e7..86ab25a8 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -334,8 +334,8 @@ "depositEth": { "message": "Vplačilo ETH" }, - "depositEther": { - "message": "Vplačilo ethra" + "depositDex": { + "message": "Vplačilo ethera" }, "depositFiat": { "message": "Vplačilo s klasičnimi valutami" @@ -407,7 +407,7 @@ "message": "ETH" }, "etherscanView": { - "message": "Poglej račun na Etherscan" + "message": "Poglejte račun na DEXscan" }, "exchangeRate": { "message": "Menjalni tečaj" @@ -491,8 +491,8 @@ "message": "Pridobi Ether" }, "getEtherFromFaucet": { - "message": "Pridobite Ether iz fauceta za $1", - "description": "Displays network name for Ether faucet" + "message": "Pridobite ether iz fauceta za $1", + "description": "Displays network name for DEX faucet" }, "getHelp": { "message": "Get Help." diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 4d8f896d..38d39709 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -238,7 +238,7 @@ "depositEth": { "message": "การฝากอีเธอร์" }, - "depositEther": { + "depositDex": { "message": "การฝากอีเธอร์" }, "depositFiat": { @@ -290,7 +290,7 @@ "message": "ใส่รหัสผ่านอีกครั้งเพื่อยืนยัน" }, "etherscanView": { - "message": "ดูบัญชีบน Etherscan" + "message": "ดูบัญชีบน DEXscan" }, "exchangeRate": { "message": "อัตราแลกเปลี่ยน" @@ -360,7 +360,7 @@ }, "getEtherFromFaucet": { "message": "รับอีเธอร์ที่ปล่อยจาก $1", - "description": "Displays network name for Ether faucet" + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": "ต้องมากกว่าหรือเท่ากับ $1.", diff --git a/app/_locales/tml/messages.json b/app/_locales/tml/messages.json index 03ae4b7f..59795a08 100644 --- a/app/_locales/tml/messages.json +++ b/app/_locales/tml/messages.json @@ -250,7 +250,7 @@ "depositEth": { "message": "வைப்புத்தொகை எது " }, - "depositEther": { + "depositDex": { "message": "வைப்புத்தொகை எதிர் " }, "depositFiat": { @@ -703,7 +703,7 @@ "connectingToKovan": { "message": "கோவன் டெஸ்ட் நெட்வொர்க்குடன் இணைத்தல்" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "ரிங்கெப்ய டெஸ்ட் நெட்வொர்க்குடன் இணைக்கிறது" }, "connectingToUnknown": { diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 8cad6711..3b234f64 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -205,7 +205,7 @@ "depositEth": { "message": "Eth yatır" }, - "depositEther": { + "depositDex": { "message": "Ether yatır" }, "depositFiat": { @@ -218,7 +218,7 @@ "message": "ShapeShift ile yatır" }, "depositShapeShiftExplainer": { - "message": "Eğer başka kripto paralara sahipseniz, Dex San cüzdanınıza direk olarak Ether yatırabilirsiniz. Hesaba gerek yoktur." + "message": "Eğer başka kripto paralara sahipseniz, Dex San cüzdanınıza direk olarak DEX yatırabilirsiniz. Hesaba gerek yoktur." }, "details": { "message": "Ayrıntılar" @@ -227,10 +227,10 @@ "message": "Direk Yatırma" }, "directDepositEther": { - "message": "Direk Ether Yatırma" + "message": "Direk DEX Yatırma" }, "directDepositEtherExplainer": { - "message": "Eğer çoktan Etheriniz varsa, yeni hesabınıza Ether aktarmanın en kolay yolu direk yatırmadır." + "message": "Eğer çoktan DEXiniz varsa, yeni hesabınıza DEX aktarmanın en kolay yolu direk yatırmadır." }, "done": { "message": "Bitti" @@ -266,7 +266,7 @@ "message": "Parolalar eşleşmiyor" }, "etherscanView": { - "message": "Hesabı Etherscan üzerinde izle" + "message": "Hesabı DEXscan üzerinde izle" }, "exchangeRate": { "message": "Döviz kuru" @@ -335,7 +335,7 @@ "message": "Ether Al" }, "getEtherFromFaucet": { - "message": "Musluktan $1 karşılığı Ether alın", + "message": "Musluktan $1 karşılığı DEX alın", "description": "Ether musluğunun ağ ismini gösterir" }, "greaterThanMin": { @@ -486,7 +486,7 @@ "message": "En az bir jeton seçilmeli" }, "needEtherInWallet": { - "message": "Dex San kullanarak merkezi olamayan uygulamalarla etkileşmek için cüzdanınızda Ether bulunmalıdır." + "message": "Dex San kullanarak merkezi olamayan uygulamalarla etkileşmek için cüzdanınızda DEX bulunmalıdır." }, "needImportFile": { "message": "Almak için bir dosya seçmelisiniz.", @@ -658,7 +658,7 @@ "connectingToKovan": { "message": "Kovan Test Ağına bağlanıyor" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "Rinkeby Test Ağına bağlanıyor" }, "connectingToUnknown": { diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index b5cb6ee9..a13a0fcc 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -181,7 +181,7 @@ "message": "Tùy chỉnh" }, "defaultNetwork": { - "message": "Mạng lưới mặc định dùng cho các giao dịch Ether là Main Net (tiền ETH thật)." + "message": "Mạng lưới mặc định dùng cho các giao dịch DEX là Main Net (tiền ETH thật)." }, "denExplainer": { "message": "Số DEN của bạn là mật khẩu đã được mã hóa và lưu trữ trong Dex San" @@ -199,8 +199,8 @@ "depositEth": { "message": "Ký gửi Eth" }, - "depositEther": { - "message": "Ký gửi Ether" + "depositDex": { + "message": "Ký gửi DEX" }, "depositFiat": { "message": "Ký gửi bằng tiền Fiat (USD, GBP, ...)" @@ -212,7 +212,7 @@ "message": "Ký gửi với ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Nếu bạn sở hữu các đồng tiền điện tử khác, bạn có thể giao dịch và ký gửi Ether trực tiếp vào ví Dex San của bạn. Không cần tạo thêm tài khoản." + "message": "Nếu bạn sở hữu các đồng tiền điện tử khác, bạn có thể giao dịch và ký gửi DEX trực tiếp vào ví Dex San của bạn. Không cần tạo thêm tài khoản." }, "details": { "message": "Chi tiết" @@ -221,10 +221,10 @@ "message": "Ký gửi trực tiếp" }, "directDepositEther": { - "message": "Ký gửi Ether trực tiếp" + "message": "Ký gửi DEX trực tiếp" }, "directDepositEtherExplainer": { - "message": "Nếu bạn đã có sẵn vài Ether, cách nhanh nhất để thêm Ether vào ví tiền mới của bạn là bằng ký gửi trực tiếp." + "message": "Nếu bạn đã có sẵn vài DEX, cách nhanh nhất để thêm DEX vào ví tiền mới của bạn là bằng ký gửi trực tiếp." }, "done": { "message": "Hoàn tất" @@ -242,7 +242,7 @@ "message": "Nhập mật khẩu" }, "etherscanView": { - "message": "Xem tài khoản trên Etherscan" + "message": "Xem tài khoản trên DEXscan" }, "exchangeRate": { "message": "Tỷ giá" @@ -299,11 +299,11 @@ "message": "Giá ga được yêu cầu" }, "getEther": { - "message": "Lấy Ether" + "message": "Lấy DEX" }, "getEtherFromFaucet": { - "description": "Hiển thị tên mạng cho vòi Ether", - "message": "Lấy Ether từ vòi với giá $1" + "description": "Hiển thị tên mạng cho vòi DEX", + "message": "Lấy DEX từ vòi với giá $1" }, "greaterThanMin": { "description": "trợ giúp để nhập hex dưới dạng số thập phân", @@ -323,7 +323,7 @@ "message": "Ẩn mã token?" }, "howToDeposit": { - "message": "Bạn muốn ký gửi Ether bằng cách nào?" + "message": "Bạn muốn ký gửi DEX bằng cách nào?" }, "import": { "description": "Nút để nhập tài khoản từ một tập tin đã chọn", @@ -399,7 +399,7 @@ "message": "Tài khoản của tôi" }, "needEtherInWallet": { - "message": "Để tương tác với các ứng dụng phân tán bằng Dex San, bạn sẽ phải cần có Ether trong ví của bạn." + "message": "Để tương tác với các ứng dụng phân tán bằng Dex San, bạn sẽ phải cần có DEX trong ví của bạn." }, "needImportFile": { "description": "Người dùng đang nhập một tài khoản và cần thêm tập tin để tiếp tục", diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 8c11c10a..b4462c08 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -259,8 +259,8 @@ "depositEth": { "message": "存入 Eth" }, - "depositEther": { - "message": "存入 Ether" + "depositDex": { + "message": "存入 DEX" }, "depositFiat": { "message": "从 Fiat 存入" @@ -272,7 +272,7 @@ "message": "从 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果你拥有其他加密货币，你可以直接交易并存入 Ether 到你的 Dex San 钱包。 不需要帐户。" + "message": "如果你拥有其他加密货币，你可以直接交易并存入 DEX 到你的 Dex San 钱包。 不需要帐户。" }, "details": { "message": "详情" @@ -281,10 +281,10 @@ "message": "直接存入" }, "directDepositEther": { - "message": "直接存入 Ether" + "message": "直接存入 DEX" }, "directDepositEtherExplainer": { - "message": "如果你已经有了一些 Ether，通过直接转入是你的新钱包获取 Ether 的最快捷方式。" + "message": "如果你已经有了一些 DEX，通过直接转入是你的新钱包获取 DEX 的最快捷方式。" }, "done": { "message": "完成" @@ -323,7 +323,7 @@ "message": "密码不匹配" }, "etherscanView": { - "message": "在 Etherscan 上查看账户" + "message": "在 DEXscan 上查看账户" }, "exchangeRate": { "message": "兑换比率" @@ -392,11 +392,11 @@ "message": "生成 交易" }, "getEther": { - "message": "获取 Ether" + "message": "获取 DEX" }, "getEtherFromFaucet": { - "message": "从水管获取$1网络的 Ether", - "description": "Displays network name for Ether faucet" + "message": "从水管获取$1网络的 DEX", + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": "必须要大于等于 $1。", @@ -419,7 +419,7 @@ "message": "隐藏代币？" }, "howToDeposit": { - "message": "你想怎样转入 Ether？" + "message": "你想怎样转入 DEX？" }, "holdEther": { "message": "它允许你保存ether和代币，并作为你使用Dapp的桥梁." @@ -549,7 +549,7 @@ "message": "至少选择一种代币." }, "needEtherInWallet": { - "message": "使用 Dex San 与 DAPP 交互，需要你的钱包里有 Ether。" + "message": "使用 Dex San 与 DAPP 交互，需要你的钱包里有 DEX。" }, "needImportFile": { "message": "必须选择导入一个文件。", @@ -733,7 +733,7 @@ "connectingToKovan": { "message": "正在连接到Kovan测试网络" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "正在连接到Rinkeby测试网络" }, "connectingToUnknown": { @@ -876,6 +876,9 @@ "testFaucet": { "message": "测试水管" }, + "testnet": { + "message": "DEXON 测试网络" + }, "to": { "message": "至" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index c8bbb18d..c5b16d1a 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -232,7 +232,7 @@ "message": "小數點精度" }, "defaultNetwork": { - "message": "預設 Ether 交易網路為主網路（Main Net）。" + "message": "預設 DEX 交易網路為主網路（Main Net）。" }, "denExplainer": { "message": "你的 DEN 是在你的 Dex San 中的加密密碼儲存庫。" @@ -250,8 +250,8 @@ "depositEth": { "message": "存入 Eth" }, - "depositEther": { - "message": "存入 Ether" + "depositDex": { + "message": "存入 DEX" }, "depositFiat": { "message": "從法定貨幣存入" @@ -263,7 +263,7 @@ "message": "從 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果你擁有其他加密貨幣，你可以直接交易並存入 Ether 到你的 Dex San 錢包。不需要開帳戶。" + "message": "如果你擁有其他加密貨幣，你可以直接交易並存入 DEX 到你的 Dex San 錢包。不需要開帳戶。" }, "details": { "message": "詳情" @@ -272,10 +272,10 @@ "message": "直接存入" }, "directDepositEther": { - "message": "直接存入 Ether" + "message": "直接存入 DEX" }, "directDepositEtherExplainer": { - "message": "如果你已經擁有了一些 Ether，使用直接存入功能是讓你的新錢包最快取得 Ether 的方式。" + "message": "如果你已經擁有了一些 DEX，使用直接存入功能是讓你的新錢包最快取得 DEX 的方式。" }, "done": { "message": "完成" @@ -311,7 +311,7 @@ "message": "您所輸入的密碼不一致" }, "etherscanView": { - "message": "在 Etherscan 上查看帳戶" + "message": "在 DEXscan 上查看帳戶" }, "exchangeRate": { "message": "匯率" @@ -377,11 +377,11 @@ "message": "必需填寫 Gas 價格" }, "getEther": { - "message": "取得 Ether" + "message": "取得 DEX" }, "getEtherFromFaucet": { - "message": "從水管取得$1 Ether", - "description": "Displays network name for Ether faucet" + "message": "從水管取得$1 DEX", + "description": "Displays network name for DEX faucet" }, "greaterThanMin": { "message": "必須要大於等於 $1。", @@ -404,7 +404,7 @@ "message": "隱藏代幣？" }, "howToDeposit": { - "message": "你想怎麼存入 Ether？" + "message": "你想怎麼存入 DEX？" }, "holdEther": { "message": "Dex San 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑." @@ -531,7 +531,7 @@ "message": "必須選擇至少 1 代幣." }, "needEtherInWallet": { - "message": "要使用 Dex San 存取 DAPP 時，您的錢包中需要有 Ether。" + "message": "要使用 Dex San 存取 DAPP 時，您的錢包中需要有 DEX。" }, "needImportFile": { "message": "您必須選擇一個檔案來導入。", @@ -703,7 +703,7 @@ "connectingToKovan": { "message": "連線到 Kovan 測試網路" }, - "connectingToRinkeby": { + "connectingToTestnet": { "message": "連線到 Rinkeby 測試網路" }, "connectingToUnknown": { @@ -834,6 +834,9 @@ "testFaucet": { "message": "測試水管" }, + "testnet": { + "message": "DEXON 測試網路" + }, "to": { "message": "目的帳號" }, diff --git a/app/images/dekusan.svg b/app/images/dekusan.svg new file mode 100644 index 00000000..77d55a3b --- /dev/null +++ b/app/images/dekusan.svg @@ -0,0 +1,24 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="160" height="156" viewBox="0 0 160 156"> + <g fill="none" fill-rule="evenodd"> + <path fill="#954A97" d="M14.882 90.076c-.883 5.106 3.057 7.373 7.588 3.26 3.229-2.932 13.105-5.796 18.515-7.2a4.393 4.393 0 0 0 3.22-5.01C42.179 69.52 33.719 67.315 32.604 67.537c-3.89.774-16.838 17.432-17.721 22.539"/> + <path fill="#F8F8F8" d="M26.345 100.884l-1.78-8.215c-.217-1.006-1.222-1.648-2.243-1.433a1.864 1.864 0 0 0-1.454 2.212l.177.816-8.546-5.681a4.337 4.337 0 0 0-3.46-.608 11.775 11.775 0 0 0-4.096 1.928 11.92 11.92 0 0 0-2.174 2.06 12.193 12.193 0 0 0-2.42 4.882c-.166.69-.276 1.403-.323 2.132a12.78 12.78 0 0 0 3.32 9.424 12.45 12.45 0 0 0 4.5 3.136c.934.379 1.91.641 2.91.78h.001a11.87 11.87 0 0 0 4.53-.248 4.233 4.233 0 0 0 1.597-.79c.467-.37.858-.838 1.142-1.381l4.533-8.648.089.412c.218 1.007 1.223 1.65 2.244 1.434a1.864 1.864 0 0 0 1.453-2.212"/> + <path fill="#712473" d="M123.09 105.552c-.498 5.01-.408 10.657 2.405 15.062 1.626 2.547 4.066 4.216 6.785 5.479 1.64.762 3.276 1.487 4.531 2.838 1.456 1.566 2.044 3.77.643 5.556-1.14 1.453-3.157 2.154-4.978 2.108-2.623-.067-5.217-1.12-7.473-2.374-4.16-2.313-6.699-6.27-7.47-10.891-.715-4.29.07-9.302 2.636-13.68.853-1.452 1.906-2.764 2.922-4.098M48.155 22.572s-8.47-5.796-8.543.653c-.072 6.449 5.702 9.372 5.702 9.372l2.841-10.025zM123.495 20.869s9.392-4.348 8.482 1.932c-.911 6.28-7.157 8.244-7.157 8.244l-1.325-10.176z"/> + <path fill="#954A97" d="M120.397 129.022c-3.467 2.251-1.07 6.155.062 9.018 1.153 2.913 1.186 6.337.238 9.315-1.198 3.764-5.363 9.089-10.019 7.619-1.71-.54-2.726-2.068-3.185-3.717-1.12-4.025-2.444-8.135-4.605-11.748-.938-1.568-2.107-3.226-3.755-4.13-1.74-.957-3.934-.31-5.77-.05-2.277.323-4.65.387-6.948.292-1.271-.052-2.53-.175-3.776-.428-1.218-.249-2.49-.494-3.583.274-1.114.783-1.922 2-2.605 3.148-2.238 3.765-3.57 8.094-4.696 12.292-1.265 4.72-6.07 4.661-9.356 1.925-4.755-3.96-5.455-10.83-3.279-16.304 1.184-2.977 2.736-6.442-1.098-8.395-13.992-7.13-25.412-19.375-29.059-35.22-5.087-22.1 2.665-47.809 13.724-66.888C52.041 9.888 67.421.044 85.68.044c18.01 0 30.292 8.381 39.654 20.685 5.146 6.763 9.409 14.71 13.257 23.102 10.035 21.885 15.828 51.157-.415 71.456-4.542 5.677-10.402 10.023-16.95 13.196l-.83.54"/> + <path fill="#C5809F" d="M128.932 91.194c0 18.646-18.083 33.761-40.388 33.761-22.306 0-40.389-15.115-40.389-33.761s18.083-33.761 40.389-33.761c22.305 0 40.388 15.115 40.388 33.76"/> + <path fill="#954A97" d="M159.883 93.725c-.324 3.006-3.76 3.103-6.624-.086-2.144-2.387-9.2-6.242-12.94-8.187-1.505-.781-2.63-2.48-2.598-3.995.205-9.777 7.706-11.024 8.808-10.597 3.932 1.524 13.727 19.407 13.354 22.865"/> + <path fill="#C5809F" d="M87.767 37.642c0 4.929-4.173 8.925-9.32 8.925-5.148 0-9.32-3.996-9.32-8.925 0-4.93 4.172-8.926 9.32-8.926 5.147 0 9.32 3.996 9.32 8.926"/> + <path fill="#C5809F" d="M104.854 37.642c0 4.929-4.172 8.925-9.32 8.925-5.147 0-9.32-3.996-9.32-8.925 0-4.93 4.173-8.926 9.32-8.926 5.148 0 9.32 3.996 9.32 8.926"/> + <path stroke="#050101" stroke-linecap="round" stroke-width=".777" d="M80.777 31.824s-16.294-.83-20.971 25.609M97.087 33.373s14.134 5.267 15.534 24.836M81.553 34.15S68.74 42.847 68.35 56.656M80.777 33.373s-12.403 5.07-15.534 17.85M94.757 35.701s8.213 5.648 10.874 15.523"/> + <path fill="#712473" d="M97.864 32.209c0 4.5-4.52 8.15-10.097 8.15-5.576 0-10.097-3.65-10.097-8.15 0-4.501 4.52-8.15 10.097-8.15 5.576 0 10.097 3.649 10.097 8.15"/> + <path fill="#050101" d="M86.214 37.254a.776.776 0 1 1-1.553-.001.776.776 0 0 1 1.553.001M90.097 37.254a.776.776 0 1 1-1.553-.001.776.776 0 0 1 1.553.001"/> + <g> + <path fill="#FEFEFE" d="M135.146 33.373a4.658 4.658 0 0 1-4.66 4.657 4.658 4.658 0 0 1-4.66-4.657 4.658 4.658 0 0 1 4.66-4.657 4.658 4.658 0 0 1 4.66 4.657"/> + <path fill="#050101" d="M134.369 33.373a3.882 3.882 0 0 1-3.884 3.88 3.882 3.882 0 0 1 0-7.761 3.882 3.882 0 0 1 3.884 3.881"/> + </g> + <g> + <path fill="#FEFEFE" d="M45.825 34.15a4.658 4.658 0 0 1-4.66 4.656 4.658 4.658 0 0 1-4.66-4.657 4.658 4.658 0 0 1 4.66-4.656 4.658 4.658 0 0 1 4.66 4.656"/> + <path fill="#050101" d="M45.049 34.15a3.882 3.882 0 0 1-3.884 3.88 3.882 3.882 0 0 1-3.883-3.88 3.882 3.882 0 0 1 3.883-3.881 3.882 3.882 0 0 1 3.884 3.88"/> + </g> + <path fill="#954A97" d="M21.744 96.123c-.778.37-1.418-.188-1.168-1.115.186-.695-.158-2.415-.364-3.313-.082-.361.122-.789.491-.998 2.378-1.349 4.024-.276 4.12-.032.341.87-2.184 5.03-3.079 5.458M153.228 95.999c.843.555 1.73.105 1.64-.923-.066-.77.727-2.505 1.173-3.405.18-.362.031-.854-.36-1.152-2.528-1.923-4.726-1.146-4.894-.91-.6.842 1.472 5.75 2.441 6.39"/> + </g> +</svg> diff --git a/app/images/dexon_logo.svg b/app/images/dexon_logo.svg new file mode 100644 index 00000000..8f5d6edb --- /dev/null +++ b/app/images/dexon_logo.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-1 0 44 40"> + <g fill="#000000" fill-rule="evenodd"> + <path d="M21.095 0l-2.553 4.423-2.22-3.846-.223-.385-2.665 4.616-2.22-3.846-.111-.193-1.11 1.923L0 20l9.992 17.308 1.11 1.923.112-.193 2.22-3.846 2.665 4.616.222-.385 2.22-3.846L21.096 40l2.554-4.423 2.443 4.23.444-.769 2.22-3.846 2.22 3.846.112.193 1.11-1.923L42.191 20 32.198 2.692 31.088.77l-.111.193-2.22 3.846-2.22-3.846-.445-.77-2.443 4.23L21.095 0zm-2.22 5l2.22-3.846L23.315 5l-2.22 3.846L18.875 5zm5.218.192l2.22-3.846 2.221 3.846-2.22 3.846-2.22-3.846zm-10.437 0l2.22-3.846 2.222 3.846-2.221 3.846-2.22-3.846zm16.21 28.078L37.528 20 29.866 6.73l2.222-3.845L41.969 20l-9.881 17.115-2.222-3.845zM.222 20l9.881-17.115 2.221 3.845L4.663 20l7.661 13.27-2.22 3.845L.221 20zM21.54 9.615l2.22-3.846 2.22 3.846-2.22 3.847-2.22-3.847zm-5.33 0l2.22-3.846 2.22 3.846-2.22 3.847-2.22-3.847zm11.214 19.423L32.642 20l-5.218-9.038 2.22-3.847L37.084 20l-7.44 12.884-2.22-3.846zM5.107 20l7.44-12.885 2.22 3.847L9.548 20l5.219 9.038-2.22 3.846L5.106 20zm13.768-5.77l2.22-3.846 2.22 3.847-2.22 3.846-2.22-3.846zm5.995 10.385L27.535 20l-2.665-4.615 2.221-3.847L31.976 20l-4.885 8.462-2.22-3.847zM10.214 20l4.886-8.462 2.22 3.847L14.656 20l2.664 4.615-2.22 3.847L10.214 20zm11.992 0l2.22-3.846L26.646 20l-2.22 3.846L22.206 20zm-6.662 0l2.22-3.846L19.984 20l-2.22 3.846L15.544 20zm3.33 5.77l2.221-3.847 2.22 3.846-2.22 3.846-2.22-3.846zm2.666 4.614l2.22-3.846 2.22 3.846-2.22 3.847-2.22-3.847zm-5.33 0l2.22-3.846 2.22 3.846-2.22 3.847-2.22-3.847zm7.883 4.424l2.22-3.846 2.221 3.846-2.22 3.846-2.22-3.846zm-10.437 0l2.22-3.846 2.222 3.846-2.221 3.846-2.22-3.846zm5.219.192l2.22-3.846L23.315 35l-2.22 3.846L18.875 35zM107.008 11.36l-1.475-2.565-4.968 8.64-4.968-8.64-1.475 2.565L99.09 20l-4.968 8.64 1.475 2.565 4.968-8.64 4.968 8.64 1.475-2.565L102.04 20zM86.418 12.16L84.94 9.6H73.192v20.8H84.94l1.478-2.56H75.752v-6.752h8.216v-2.56h-8.216V12.16zM62.22 15.92v8.16a3.764 3.764 0 0 1-3.76 3.76H54.7V12.16h3.76a3.764 3.764 0 0 1 3.76 3.76M58.46 9.6h-6.32v20.8h6.32a6.327 6.327 0 0 0 6.32-6.32v-8.16a6.327 6.327 0 0 0-6.32-6.32M125.378 15.92v8.16a3.764 3.764 0 0 1-3.76 3.76 3.764 3.764 0 0 1-3.76-3.76v-8.16a3.764 3.764 0 0 1 3.76-3.76 3.764 3.764 0 0 1 3.76 3.76m-3.76-6.32a6.327 6.327 0 0 0-6.32 6.32v8.16a6.327 6.327 0 0 0 6.32 6.32 6.327 6.327 0 0 0 6.32-6.32v-8.16a6.327 6.327 0 0 0-6.32-6.32M146.43 9.6v14.352L138.144 9.6h-1.794v20.8h2.56V16.048l8.287 14.352h1.793V9.6z"/> + </g> +</svg> diff --git a/app/images/popout.svg b/app/images/popout.svg index 760fe437..55199b00 100644 --- a/app/images/popout.svg +++ b/app/images/popout.svg @@ -13,9 +13,9 @@ <use xlink:href="#path-1"></use> </mask> <g id="Clip-2"></g> - <path d="M10.9229,0.6177 C10.8209,0.3737 10.6269,0.1787 10.3819,0.0767 C10.2599,0.0267 10.1309,-0.0003 9.9999,-0.0003 L3.9999,-0.0003 C3.4479,-0.0003 2.9999,0.4477 2.9999,0.9997 C2.9999,1.5527 3.4479,1.9997 3.9999,1.9997 L7.5859,1.9997 L0.2929,9.2927 C-0.0981,9.6837 -0.0981,10.3167 0.2929,10.7067 C0.4879,10.9027 0.7439,10.9997 0.9999,10.9997 C1.2559,10.9997 1.5119,10.9027 1.7069,10.7067 L8.9999,3.4137 L8.9999,6.9997 C8.9999,7.5527 9.4479,7.9997 9.9999,7.9997 C10.5519,7.9997 10.9999,7.5527 10.9999,6.9997 L10.9999,0.9997 C10.9999,0.8697 10.9739,0.7407 10.9229,0.6177" id="Fill-1" fill="#4A4A4A" mask="url(#mask-2)"></path> + <path d="M10.9229,0.6177 C10.8209,0.3737 10.6269,0.1787 10.3819,0.0767 C10.2599,0.0267 10.1309,-0.0003 9.9999,-0.0003 L3.9999,-0.0003 C3.4479,-0.0003 2.9999,0.4477 2.9999,0.9997 C2.9999,1.5527 3.4479,1.9997 3.9999,1.9997 L7.5859,1.9997 L0.2929,9.2927 C-0.0981,9.6837 -0.0981,10.3167 0.2929,10.7067 C0.4879,10.9027 0.7439,10.9997 0.9999,10.9997 C1.2559,10.9997 1.5119,10.9027 1.7069,10.7067 L8.9999,3.4137 L8.9999,6.9997 C8.9999,7.5527 9.4479,7.9997 9.9999,7.9997 C10.5519,7.9997 10.9999,7.5527 10.9999,6.9997 L10.9999,0.9997 C10.9999,0.8697 10.9739,0.7407 10.9229,0.6177" id="Fill-1" fill="#aeaeae" mask="url(#mask-2)"></path> </g> - <path d="M19,10 C18.448,10 18,10.448 18,11 L18,19 C18,19.551 17.551,20 17,20 L3,20 C2.449,20 2,19.551 2,19 L2,5 C2,4.449 2.449,4 3,4 L11,4 C11.552,4 12,3.552 12,3 C12,2.448 11.552,2 11,2 L3,2 C1.346,2 0,3.346 0,5 L0,19 C0,20.654 1.346,22 3,22 L17,22 C18.654,22 20,20.654 20,19 L20,11 C20,10.448 19.552,10 19,10" id="Fill-4" fill="#4A4A4A"></path> + <path d="M19,10 C18.448,10 18,10.448 18,11 L18,19 C18,19.551 17.551,20 17,20 L3,20 C2.449,20 2,19.551 2,19 L2,5 C2,4.449 2.449,4 3,4 L11,4 C11.552,4 12,3.552 12,3 C12,2.448 11.552,2 11,2 L3,2 C1.346,2 0,3.346 0,5 L0,19 C0,20.654 1.346,22 3,22 L17,22 C18.654,22 20,20.654 20,19 L20,11 C20,10.448 19.552,10 19,10" id="Fill-4" fill="#aeaeae"></path> </g> </g> </svg>
\ No newline at end of file diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js index 3190eb37..5a419105 100644 --- a/app/scripts/controllers/network/enums.js +++ b/app/scripts/controllers/network/enums.js @@ -2,9 +2,11 @@ const ROPSTEN = 'ropsten' const RINKEBY = 'rinkeby' const KOVAN = 'kovan' const MAINNET = 'mainnet' +const TESTNET = 'testnet' const LOCALHOST = 'localhost' const MAINNET_CODE = 1 +const TESTNET_CODE = 2 const ROPSTEN_CODE = 3 const RINKEYBY_CODE = 4 const KOVAN_CODE = 42 @@ -12,15 +14,18 @@ const KOVAN_CODE = 42 const ROPSTEN_DISPLAY_NAME = 'Ropsten' const RINKEBY_DISPLAY_NAME = 'Rinkeby' const KOVAN_DISPLAY_NAME = 'Kovan' -const MAINNET_DISPLAY_NAME = 'Main Ethereum Network' +const MAINNET_DISPLAY_NAME = 'Main DEXON Network' +const TESTNET_DISPLAY_NAME = 'DEXON Test Network' module.exports = { ROPSTEN, RINKEBY, KOVAN, MAINNET, + TESTNET, LOCALHOST, MAINNET_CODE, + TESTNET_CODE, ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE, @@ -28,4 +33,5 @@ module.exports = { RINKEBY_DISPLAY_NAME, KOVAN_DISPLAY_NAME, MAINNET_DISPLAY_NAME, + TESTNET_DISPLAY_NAME, } diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 1a251bce..3c893201 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -15,20 +15,21 @@ const extend = require('extend') const networks = { networkList: {} } const { - ROPSTEN, - RINKEBY, - KOVAN, + // ROPSTEN, + // RINKEBY, + // KOVAN, MAINNET, + TESTNET, LOCALHOST, } = require('./enums') -const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET] +const INFURA_PROVIDER_TYPES = [MAINNET, TESTNET] const env = process.env.METAMASK_ENV const METAMASK_DEBUG = process.env.METAMASK_DEBUG const testMode = (METAMASK_DEBUG || env === 'test') const defaultProviderConfig = { - type: testMode ? RINKEBY : MAINNET, + type: testMode ? TESTNET : MAINNET, } const defaultNetworkConfig = { diff --git a/app/scripts/controllers/network/util.js b/app/scripts/controllers/network/util.js index 261dae72..b49f13a7 100644 --- a/app/scripts/controllers/network/util.js +++ b/app/scripts/controllers/network/util.js @@ -3,6 +3,7 @@ const { RINKEBY, KOVAN, MAINNET, + TESTNET, ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE, @@ -10,6 +11,7 @@ const { RINKEBY_DISPLAY_NAME, KOVAN_DISPLAY_NAME, MAINNET_DISPLAY_NAME, + TESTNET_DISPLAY_NAME, } = require('./enums') const networkToNameMap = { @@ -17,6 +19,7 @@ const networkToNameMap = { [RINKEBY]: RINKEBY_DISPLAY_NAME, [KOVAN]: KOVAN_DISPLAY_NAME, [MAINNET]: MAINNET_DISPLAY_NAME, + [TESTNET]: TESTNET_DISPLAY_NAME, [ROPSTEN_CODE]: ROPSTEN_DISPLAY_NAME, [RINKEYBY_CODE]: RINKEBY_DISPLAY_NAME, [KOVAN_CODE]: KOVAN_DISPLAY_NAME, diff --git a/development/states/pending-tx.json b/development/states/pending-tx.json index bfa93f7a..00a318e2 100644 --- a/development/states/pending-tx.json +++ b/development/states/pending-tx.json @@ -705,7 +705,7 @@ "mainnet": "ok", "ropsten": "ok", "kovan": "ok", - "rinkeby": "ok" + "testnet": "ok" }, "shapeShiftTxList": [], "lostAccounts": [] diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 2d364ef6..e4642e8c 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -305,13 +305,9 @@ App.prototype.getNetworkName = function () { let name if (providerName === 'mainnet') { - name = 'Main Ethereum Network' - } else if (providerName === 'ropsten') { - name = 'Ropsten Test Network' - } else if (providerName === 'kovan') { - name = 'Kovan Test Network' - } else if (providerName === 'rinkeby') { - name = 'Rinkeby Test Network' + name = 'Main DEXON Network' + } else if (providerName === 'testnet') { + name = 'DEXON Test Network' } else { name = 'Unknown Private Network' } diff --git a/old-ui/app/components/app-bar.js b/old-ui/app/components/app-bar.js index c0da3661..34c7edf2 100644 --- a/old-ui/app/components/app-bar.js +++ b/old-ui/app/components/app-bar.js @@ -240,50 +240,22 @@ module.exports = class AppBar extends Component { }, }, [ h('.menu-icon.diamond'), - 'Main Ethereum Network', + 'Main DEXON Network', providerType === 'mainnet' ? h('.check', '✓') : null, ]), h(DropdownMenuItem, { - key: 'ropsten', + key: 'testnet', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => dispatch(actions.setProviderType('ropsten')), - style: { - fontSize: '18px', - }, - }, [ - h('.menu-icon.red-dot'), - 'Ropsten Test Network', - providerType === 'ropsten' - ? h('.check', '✓') - : null, - ]), - h(DropdownMenuItem, { - key: 'kovan', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => dispatch(actions.setProviderType('kovan')), - style: { - fontSize: '18px', - }, - }, [ - h('.menu-icon.hollow-diamond'), - 'Kovan Test Network', - providerType === 'kovan' - ? h('.check', '✓') - : null, - ]), - h(DropdownMenuItem, { - key: 'rinkeby', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => dispatch(actions.setProviderType('rinkeby')), + onClick: () => dispatch(actions.setProviderType('testnet')), style: { fontSize: '18px', }, }, [ h('.menu-icon.golden-square'), - 'Rinkeby Test Network', - providerType === 'rinkeby' + 'DEXON Test Network', + providerType === 'testnet' ? h('.check', '✓') : null, ]), diff --git a/ui/app/app.js b/ui/app/app.js index 7669a5db..5fe96042 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -203,12 +203,8 @@ class App extends Component { if (providerName === 'mainnet') { name = this.context.t('connectingToMainnet') - } else if (providerName === 'ropsten') { - name = this.context.t('connectingToRopsten') - } else if (providerName === 'kovan') { - name = this.context.t('connectingToKovan') - } else if (providerName === 'rinkeby') { - name = this.context.t('connectingToRinkeby') + } else if (providerName === 'testnet') { + name = this.context.t('connectingToTestnet') } else { name = this.context.t('connectingToUnknown') } @@ -224,12 +220,8 @@ class App extends Component { if (providerName === 'mainnet') { name = this.context.t('mainnet') - } else if (providerName === 'ropsten') { - name = this.context.t('ropsten') - } else if (providerName === 'kovan') { - name = this.context.t('kovan') - } else if (providerName === 'rinkeby') { - name = this.context.t('rinkeby') + } else if (providerName === 'testnet') { + name = this.context.t('testnet') } else { name = this.context.t('unknownNetwork') } diff --git a/ui/app/components/app-header/app-header.component.js b/ui/app/components/app-header/app-header.component.js index b7c01154..b799ba9f 100644 --- a/ui/app/components/app-header/app-header.component.js +++ b/ui/app/components/app-header/app-header.component.js @@ -120,14 +120,14 @@ export default class AppHeader extends PureComponent { > <img className="app-header__metafox-logo app-header__metafox-logo--horizontal" - src="/images/logo/metamask-logo-horizontal.svg" - height={30} + src="/images/dekusan.svg" + height={40} /> <img className="app-header__metafox-logo app-header__metafox-logo--icon" - src="/images/logo/cobinhood.svg" - height={42} - width={42} + src="/images/dekusan.svg" + height={36} + width={36} /> </div> <div className="app-header__account-menu-container"> diff --git a/ui/app/components/currency-display/currency-display.component.js b/ui/app/components/currency-display/currency-display.component.js index 2d7413b5..fc37fd66 100644 --- a/ui/app/components/currency-display/currency-display.component.js +++ b/ui/app/components/currency-display/currency-display.component.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import classnames from 'classnames' -import { GWEI } from '../../constants/common' +import { ETH, DEX, GWEI } from '../../constants/common' export default class CurrencyDisplay extends PureComponent { static propTypes = { @@ -12,7 +12,7 @@ export default class CurrencyDisplay extends PureComponent { style: PropTypes.object, suffix: PropTypes.string, // Used in container - currency: PropTypes.string, + currency: PropTypes.oneOf([ETH, DEX]), denomination: PropTypes.oneOf([GWEI]), value: PropTypes.string, numberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index d4cc695a..28e3a5cf 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -126,7 +126,7 @@ NetworkDropdown.prototype.render = function () { [ providerType === 'mainnet' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#29B6AF', // $java + backgroundColor: '#954A97', // $dexon-purple isSelected: providerType === 'mainnet', }), h('span.network-name-item', { @@ -140,66 +140,22 @@ NetworkDropdown.prototype.render = function () { h( DropdownMenuItem, { - key: 'ropsten', + key: 'testnet', closeMenu: () => this.props.hideNetworkDropdown(), - onClick: () => props.setProviderType('ropsten'), + onClick: () => props.setProviderType('testnet'), style: dropdownMenuItemStyle, }, [ providerType === 'ropsten' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#ff4a8d', // $wild-strawberry - isSelected: providerType === 'ropsten', + backgroundColor: '#aeaeae', // $silver-chalice + isSelected: providerType === 'testnet', }), h('span.network-name-item', { style: { - color: providerType === 'ropsten' ? '#ffffff' : '#9b9b9b', + color: providerType === 'testnet' ? '#ffffff' : '#9b9b9b', }, - }, this.context.t('ropsten')), - ] - ), - - h( - DropdownMenuItem, - { - key: 'kovan', - closeMenu: () => this.props.hideNetworkDropdown(), - onClick: () => props.setProviderType('kovan'), - style: dropdownMenuItemStyle, - }, - [ - providerType === 'kovan' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), - h(NetworkDropdownIcon, { - backgroundColor: '#7057ff', // $cornflower-blue - isSelected: providerType === 'kovan', - }), - h('span.network-name-item', { - style: { - color: providerType === 'kovan' ? '#ffffff' : '#9b9b9b', - }, - }, this.context.t('kovan')), - ] - ), - - h( - DropdownMenuItem, - { - key: 'rinkeby', - closeMenu: () => this.props.hideNetworkDropdown(), - onClick: () => props.setProviderType('rinkeby'), - style: dropdownMenuItemStyle, - }, - [ - providerType === 'rinkeby' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), - h(NetworkDropdownIcon, { - backgroundColor: '#f6c343', // $saffron - isSelected: providerType === 'rinkeby', - }), - h('span.network-name-item', { - style: { - color: providerType === 'rinkeby' ? '#ffffff' : '#9b9b9b', - }, - }, this.context.t('rinkeby')), + }, this.context.t('testnet')), ] ), @@ -261,12 +217,8 @@ NetworkDropdown.prototype.getNetworkName = function () { if (providerName === 'mainnet') { name = this.context.t('mainnet') - } else if (providerName === 'ropsten') { - name = this.context.t('ropsten') - } else if (providerName === 'kovan') { - name = this.context.t('kovan') - } else if (providerName === 'rinkeby') { - name = this.context.t('rinkeby') + } else if (providerName === 'testnet') { + name = this.context.t('testnet') } else { name = provider.nickname || this.context.t('unknownNetwork') } diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js new file mode 100644 index 00000000..48de233a --- /dev/null +++ b/ui/app/components/identicon.js @@ -0,0 +1,124 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const isNode = require('detect-node') +const findDOMNode = require('react-dom').findDOMNode +const jazzicon = require('jazzicon') +const iconFactoryGen = require('../../lib/icon-factory') +const iconFactory = iconFactoryGen(jazzicon) +const { toDataUrl } = require('../../lib/blockies') + +module.exports = connect(mapStateToProps)(IdenticonComponent) + +inherits(IdenticonComponent, Component) +function IdenticonComponent () { + Component.call(this) + + this.defaultDiameter = 46 +} + +function mapStateToProps (state) { + return { + useBlockie: state.metamask.useBlockie, + } +} + +IdenticonComponent.prototype.render = function () { + var props = this.props + const { className = '', address, image } = props + var diameter = props.diameter || this.defaultDiameter + const style = { + height: diameter, + width: diameter, + borderRadius: diameter / 2, + } + if (image) { + return h('img', { + className: `${className} identicon`, + src: image, + style: { + ...style, + }, + }) + } else if (address) { + return h('div', { + className: `${className} identicon`, + key: 'identicon-' + address, + style: { + display: 'flex', + flexShrink: 0, + alignItems: 'center', + justifyContent: 'center', + ...style, + overflow: 'hidden', + }, + }) + } else { + return h('img.balance-icon', { + className, + src: './images/dexon_logo.svg', + style: { + ...style, + }, + }) + } +} + +IdenticonComponent.prototype.componentDidMount = function () { + var props = this.props + const { address, useBlockie } = props + + if (!address) return + + if (!isNode) { + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + + const diameter = props.diameter || this.defaultDiameter + + if (useBlockie) { + _generateBlockie(container, address, diameter) + } else { + _generateJazzicon(container, address, diameter) + } + } +} + +IdenticonComponent.prototype.componentDidUpdate = function () { + var props = this.props + const { address, useBlockie } = props + + if (!address) return + + if (!isNode) { + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + + var children = container.children + for (var i = 0; i < children.length; i++) { + container.removeChild(children[i]) + } + + const diameter = props.diameter || this.defaultDiameter + + if (useBlockie) { + _generateBlockie(container, address, diameter) + } else { + _generateJazzicon(container, address, diameter) + } + } +} + +function _generateBlockie (container, address, diameter) { + const img = new Image() + img.src = toDataUrl(address) + img.height = diameter + img.width = diameter + container.appendChild(img) +} + +function _generateJazzicon (container, address, diameter) { + const img = iconFactory.iconForAddress(address, diameter) + container.appendChild(img) +} diff --git a/ui/app/components/menu-bar/index.scss b/ui/app/components/menu-bar/index.scss index f699f409..13cbbe69 100644 --- a/ui/app/components/menu-bar/index.scss +++ b/ui/app/components/menu-bar/index.scss @@ -6,7 +6,7 @@ flex: 0 0 auto; margin-bottom: 16px; padding: 5px; - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid $geyser; &__sidebar-button { font-size: 1.25rem; diff --git a/ui/app/components/modal/index.scss b/ui/app/components/modal/index.scss index 9d9a127d..873eb9ff 100644 --- a/ui/app/components/modal/index.scss +++ b/ui/app/components/modal/index.scss @@ -1,23 +1,28 @@ -@import './modal-content/index'; +@import "./modal-content/index"; + .modal-container { width: 100%; height: 100%; - background-color: #fff; + background-color: $dark-gray; display: flex; flex-flow: column; border-radius: 8px; + @media screen and (max-width: 575px) { max-height: 450px; } + &__content { overflow-y: auto; flex: 1; padding: 16px 32px; + @media screen and (max-width: 575px) { justify-content: center; padding: 28px 20px; } } + &__header { position: relative; display: flex; @@ -26,6 +31,7 @@ border-bottom: 1px solid $geyser; flex: 0 0 auto; } + &__header-close::after { content: '\00D7'; font-size: 40px; @@ -35,6 +41,7 @@ right: 10px; cursor: pointer; } + &__footer { display: flex; flex-flow: row; @@ -42,12 +49,14 @@ border-top: 1px solid $geyser; padding: 16px; flex: 0 0 auto; + &-button { min-width: 0; margin-right: 16px; + &:last-of-type { margin-right: 0; } } } -}
\ No newline at end of file +} diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index 09137d39..99e79a42 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -133,7 +133,7 @@ DepositEtherModal.prototype.render = function () { h('div.page-container__header', [ - h('div.page-container__title', [this.context.t('depositEther')]), + h('div.page-container__title', [this.context.t('depositDex')]), h('div.page-container__subtitle', [ this.context.t('needEtherInWallet'), @@ -172,41 +172,6 @@ DepositEtherModal.prototype.render = function () { onButtonClick: () => toFaucet(network), hide: !isTestNetwork || buyingWithShapeshift, }), - - this.renderRow({ - logo: h('div.deposit-ether-modal__logo', { - style: { - backgroundImage: 'url(\'./images/coinbase logo.png\')', - height: '40px', - }, - }), - title: COINBASE_ROW_TITLE, - text: COINBASE_ROW_TEXT, - buttonLabel: this.context.t('continueToCoinbase'), - onButtonClick: () => toCoinbase(address), - hide: isTestNetwork || buyingWithShapeshift, - }), - - this.renderRow({ - logo: h('div.deposit-ether-modal__logo', { - style: { - backgroundImage: 'url(\'./images/shapeshift logo.png\')', - }, - }), - title: SHAPESHIFT_ROW_TITLE, - text: SHAPESHIFT_ROW_TEXT, - buttonLabel: this.context.t('shapeshiftBuy'), - onButtonClick: () => this.setState({ buyingWithShapeshift: true }), - hide: isTestNetwork, - hideButton: buyingWithShapeshift, - hideTitle: buyingWithShapeshift, - onBackClick: () => this.setState({ buyingWithShapeshift: false }), - showBackButton: this.state.buyingWithShapeshift, - className: buyingWithShapeshift && 'deposit-ether-modal__buy-row__shapeshift-buy', - }), - - buyingWithShapeshift && h(ShapeshiftForm), - ]), ]), diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js index 071bc706..8227fec3 100644 --- a/ui/app/components/modals/modal.js +++ b/ui/app/components/modals/modal.js @@ -34,7 +34,7 @@ const modalContainerBaseStyle = { transform: 'translate3d(-50%, 0, 0px)', border: '1px solid #CCCFD1', borderRadius: '8px', - backgroundColor: '#FFFFFF', + backgroundColor: '#222222', boxShadow: '0 2px 22px 0 rgba(0,0,0,0.2)', } diff --git a/ui/app/components/modals/qr-scanner/index.scss b/ui/app/components/modals/qr-scanner/index.scss index 6fa81d51..c882d940 100644 --- a/ui/app/components/modals/qr-scanner/index.scss +++ b/ui/app/components/modals/qr-scanner/index.scss @@ -1,7 +1,7 @@ .qr-scanner { width: 100%; height: 100%; - background-color: #fff; + background-color: $dark-gray; display: flex; flex-flow: column; border-radius: 8px; @@ -80,4 +80,3 @@ font-weight: 300; } } - diff --git a/ui/app/components/network-display/index.scss b/ui/app/components/network-display/index.scss index e9f2f205..970fde30 100644 --- a/ui/app/components/network-display/index.scss +++ b/ui/app/components/network-display/index.scss @@ -12,19 +12,11 @@ } &--mainnet { - background-color: lighten($blue-lagoon, 68%); + background-color: lighten($dexon-purple, 68%); } - &--ropsten { - background-color: lighten($crimson, 45%); - } - - &--kovan { - background-color: lighten($purple, 65%); - } - - &--rinkeby { - background-color: lighten($tulip-tree, 35%); + &--testnet { + background-color: lighten($silver-chalice, 68%); } } @@ -39,19 +31,11 @@ border-radius: 10px; &--mainnet { - background-color: $blue-lagoon; - } - - &--ropsten { - background-color: $crimson; - } - - &--kovan { - background-color: $purple; + background-color: $dexon-purple; } - &--rinkeby { - background-color: $tulip-tree; + &--testnet { + background-color: $silver-chalice; } } } diff --git a/ui/app/components/network-display/network-display.component.js b/ui/app/components/network-display/network-display.component.js index 22d61709..c9a9162a 100644 --- a/ui/app/components/network-display/network-display.component.js +++ b/ui/app/components/network-display/network-display.component.js @@ -3,16 +3,12 @@ import PropTypes from 'prop-types' import classnames from 'classnames' import { MAINNET_CODE, - ROPSTEN_CODE, - RINKEYBY_CODE, - KOVAN_CODE, + TESTNET_CODE, } from '../../../../app/scripts/controllers/network/enums' const networkToClassHash = { [MAINNET_CODE]: 'mainnet', - [ROPSTEN_CODE]: 'ropsten', - [RINKEYBY_CODE]: 'rinkeby', - [KOVAN_CODE]: 'kovan', + [TESTNET_CODE]: 'testnet', } export default class NetworkDisplay extends Component { diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 611aadb7..2c73496a 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -51,19 +51,10 @@ Network.prototype.render = function () { ]) } else if (providerName === 'mainnet') { hoverText = context.t('mainnet') - iconName = 'ethereum-network' - } else if (providerName === 'ropsten') { - hoverText = context.t('ropsten') - iconName = 'ropsten-test-network' - } else if (parseInt(networkNumber) === 3) { - hoverText = context.t('ropsten') - iconName = 'ropsten-test-network' - } else if (providerName === 'kovan') { - hoverText = context.t('kovan') - iconName = 'kovan-test-network' - } else if (providerName === 'rinkeby') { - hoverText = context.t('rinkeby') - iconName = 'rinkeby-test-network' + iconName = 'dexon-network' + } else if (providerName === 'testnet') { + hoverText = context.t('testnet') + iconName = 'dexon-test-network' } else { hoverText = context.t('unknownNetwork') iconName = 'unknown-private-network' @@ -73,10 +64,8 @@ Network.prototype.render = function () { h('div.network-component.pointer', { className: classnames({ 'network-component--disabled': this.props.disabled, - 'ethereum-network': providerName === 'mainnet', - 'ropsten-test-network': providerName === 'ropsten' || parseInt(networkNumber) === 3, - 'kovan-test-network': providerName === 'kovan', - 'rinkeby-test-network': providerName === 'rinkeby', + 'dexon-network': providerName === 'mainnet', + 'dexon-test-network': providerName === 'testnet', }), title: hoverText, onClick: (event) => { @@ -87,40 +76,22 @@ Network.prototype.render = function () { }, [ (function () { switch (iconName) { - case 'ethereum-network': + case 'dexon-network': return h('.network-indicator', [ h(NetworkDropdownIcon, { - backgroundColor: '#038789', // $blue-lagoon - nonSelectBackgroundColor: '#15afb2', + backgroundColor: '#954A97', // $blue-lagoon + nonSelectBackgroundColor: '#954A97', }), h('.network-name', context.t('mainnet')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) - case 'ropsten-test-network': + case 'dexon-test-network': return h('.network-indicator', [ h(NetworkDropdownIcon, { - backgroundColor: '#e91550', // $crimson - nonSelectBackgroundColor: '#ec2c50', + backgroundColor: '#aeaeae', // $crimson + nonSelectBackgroundColor: '#aeaeae', }), - h('.network-name', context.t('ropsten')), - h('i.fa.fa-chevron-down.fa-lg.network-caret'), - ]) - case 'kovan-test-network': - return h('.network-indicator', [ - h(NetworkDropdownIcon, { - backgroundColor: '#690496', // $purple - nonSelectBackgroundColor: '#b039f3', - }), - h('.network-name', context.t('kovan')), - h('i.fa.fa-chevron-down.fa-lg.network-caret'), - ]) - case 'rinkeby-test-network': - return h('.network-indicator', [ - h(NetworkDropdownIcon, { - backgroundColor: '#ebb33f', // $tulip-tree - nonSelectBackgroundColor: '#ecb23e', - }), - h('.network-name', context.t('rinkeby')), + h('.network-name', context.t('testnet')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) default: diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss index c929f61f..1a2db5f9 100644 --- a/ui/app/components/page-container/index.scss +++ b/ui/app/components/page-container/index.scss @@ -1,52 +1,57 @@ .page-container { width: 408px; background-color: $dark-gray; - box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); z-index: 25; display: flex; flex-flow: column; border-radius: 8px; - overflow-y: auto; &__header { display: flex; flex-flow: column; border-bottom: 1px solid $geyser; - padding: 16px; + padding: 24px; flex: 0 0 auto; position: relative; + &--no-padding-bottom { padding-bottom: 0; } } + &__header-close { - color: $tundora; + color: $white; position: absolute; top: 16px; right: 16px; cursor: pointer; overflow: hidden; + &::after { content: '\00D7'; font-size: 40px; line-height: 20px; } } + &__header-row { padding-bottom: 10px; display: flex; justify-content: space-between; } + &__footer { display: flex; flex-flow: column; justify-content: center; border-top: 1px solid $geyser; flex: 0 0 auto; + .btn-default, .btn-confirm { font-size: 1rem; } + header { display: flex; flex-flow: row; @@ -54,12 +59,14 @@ padding: 16px; flex: 0 0 auto; } + footer { display: flex; flex-flow: row; justify-content: space-around; padding: 0 16px 16px; flex: 0 0 auto; + a, a:hover { text-decoration: none; @@ -70,38 +77,44 @@ } } } + &__footer-button { height: 55px; font-size: 1rem; text-transform: uppercase; margin-right: 16px; + &:last-of-type { margin-right: 0; } } + &__back-button { color: #2f9ae0; font-size: 1rem; cursor: pointer; font-weight: 400; } + &__title { - color: $black; - font-size: 2rem; - font-weight: 500; - line-height: 2rem; - margin-right: 1.5rem; + color: $dexon-purple; + font-size: 1.5rem; + font-weight: 800; + line-height: 1.5rem; } + &__subtitle { padding-top: .5rem; line-height: initial; font-size: .9rem; - color: $gray; + color: $gallery; } + &__tabs { display: flex; margin-top: 16px; } + &__tab { min-width: 5rem; padding: 8px; @@ -112,38 +125,47 @@ cursor: pointer; border-bottom: none; margin-right: 16px; + &:last-of-type { margin-right: 0; } + &--selected { color: $curious-blue; border-bottom: 2px solid $curious-blue; } } + &--full-width { width: 100% !important; } + &--full-height { height: 100% !important; max-height: initial !important; min-height: initial !important; } + &__content { overflow-y: auto; flex: 1; } + &__warning-container { background: $linen; padding: 20px; display: flex; align-items: start; } + &__warning-message { padding-left: 15px; } + &__warning-title { font-weight: 500; } + &__warning-icon { padding-top: 5px; } @@ -154,10 +176,12 @@ &__footer { flex-flow: column-reverse; } + &__footer-button { width: 100%; margin-bottom: 1rem; margin-right: 0; + &:first-of-type { margin-bottom: 0; } @@ -184,4 +208,4 @@ margin-right: auto; margin-left: auto; } -}
\ No newline at end of file +} diff --git a/ui/app/components/transaction-list/index.scss b/ui/app/components/transaction-list/index.scss index ab36b5b8..846f68ab 100644 --- a/ui/app/components/transaction-list/index.scss +++ b/ui/app/components/transaction-list/index.scss @@ -1,50 +1,50 @@ .transaction-list { + display: flex; + flex-direction: column; + flex: 1; + overflow-y: hidden; + margin-top: 8px; + border-top: 1px solid $geyser; + + &__completed-transactions { display: flex; flex-direction: column; flex: 1; - overflow-y: hidden; - margin-top: 8px; - border-top: 1px solid $geyser; - - &__completed-transactions { - display: flex; - flex-direction: column; - flex: 1; - } + } - &__header { - flex: 0 0 auto; - font-size: .875rem; - text-align: center; - color: $white; - border-bottom: 1px solid $geyser; - padding: 8px 0 8px 20px; + &__header { + flex: 0 0 auto; + font-size: .875rem; + text-align: center; + color: $white; + border-bottom: 1px solid $geyser; + padding: 8px 0 8px 20px; - @media screen and (max-width: $break-small) { - padding: 8px 0 8px 16px; - } + @media screen and (max-width: $break-small) { + padding: 8px 0 8px 16px; } + } - &__transactions { - flex: 1; - overflow-y: auto; - } + &__transactions { + flex: 1; + overflow-y: auto; + } - &__pending-transactions { - margin-bottom: 16px; - } + &__pending-transactions { + margin-bottom: 16px; + } - &__empty { - flex: 1; - display: grid; - grid-template-rows: 35% 1fr; - padding-top: 8px; - } + &__empty { + flex: 1; + display: grid; + grid-template-rows: 35% 1fr; + padding-top: 8px; + } - &__empty-text { - grid-row-start: 2; - display: flex; - justify-content: center; - color: $geyser; - } + &__empty-text { + grid-row-start: 2; + display: flex; + justify-content: center; + color: $geyser; + } } diff --git a/ui/app/constants/common.js b/ui/app/constants/common.js index 4ff4dc83..3472ae0a 100644 --- a/ui/app/constants/common.js +++ b/ui/app/constants/common.js @@ -1,4 +1,5 @@ export const ETH = 'ETH' +export const DEX = 'DEX' export const GWEI = 'GWEI' export const WEI = 'WEI' diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index 3e016a5b..0fe46752 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -1,4 +1,4 @@ -.modal>div:focus { +.modal > div:focus { outline: none !important; } @@ -31,19 +31,23 @@ width: 100%; height: 100px; } + .buy-modal-content-title { font-size: 26px; margin-top: 15px; } + .buy-modal-content-options { flex-direction: column; padding: 5% 33%; } + .buy-modal-content-footer { text-transform: uppercase; width: 100%; height: 50px; } + div.buy-modal-content-option { display: flex; flex-direction: column; @@ -55,9 +59,11 @@ border: 1px solid $black; padding: 0% 7%; justify-content: center; + div.buy-modal-content-option-title { font-size: 20px; } + div.buy-modal-content-option-subtitle { font-size: 16px; } @@ -70,19 +76,23 @@ width: 100%; height: 110px; } + .buy-modal-content-title { font-size: 26px; margin-top: 15px; } + .buy-modal-content-footer { text-transform: uppercase; width: 100%; height: 50px; } + .buy-modal-content-options { flex-direction: row; margin: 20px 0 60px; } + div.buy-modal-content-option { display: flex; flex-direction: column; @@ -93,36 +103,44 @@ border: 1px solid $black; margin: 0 8px; padding: 18px 0; + div.buy-modal-content-option-title { font-size: 20px; margin-bottom: 12px; + @media screen and (max-width: 679px) { font-size: 14px; } + @media screen and (min-width: 1281px) { font-size: 20px; } } + div.buy-modal-content-option-subtitle { font-size: 16px; padding: 0 10px; height: 25%; + @media screen and (max-width: 679px) { font-size: 10px; padding: 0 10px; margin-bottom: 5px; line-height: 15px; } + @media screen and (min-width: 680px) { font-size: 14px; padding: 0 4px; margin-bottom: 2px; } + @media screen and (min-width: 1281px) { font-size: 16px; padding: 0; } } + div.buy-modal-content-footer { margin-top: 8vh; } @@ -177,6 +195,7 @@ border: 1px solid $silver; border-radius: 4px; font-family: Roboto; + button { cursor: pointer; } @@ -188,6 +207,7 @@ top: 13px; left: 17px; cursor: pointer; + &__text { margin-top: 2px; font-family: Roboto; @@ -221,9 +241,11 @@ margin-top: 9px; font-size: 20px; } + .qr-wrapper { margin-top: 5px; } + .ellip-address-wrapper { display: flex; justify-content: center; @@ -233,6 +255,7 @@ margin-top: 7px; width: 286px; } + .account-modal__button { margin-top: 17px; padding: 10px 22px; @@ -459,16 +482,19 @@ min-height: 250.72px; border-radius: 4px; background-color: $dark-gray; - box-shadow: 0 1px 7px 0 rgba(0, 0, 0, .5); + box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.5); + &__container { padding: 24px 27px 21px; display: flex; flex-direction: column; align-items: center; } + &__identicon { margin-bottom: 10px; } + &__symbol { color: $tundora; font-family: Roboto; @@ -477,6 +503,7 @@ text-align: center; margin-bottom: 7.5px; } + &__title { height: 30px; width: 271.28px; @@ -487,6 +514,7 @@ text-align: center; margin-bottom: 10.5px; } + &__copy { height: 41px; width: 318px; @@ -496,6 +524,7 @@ line-height: 18px; text-align: center; } + &__buttons { display: flex; flex-direction: row; @@ -503,6 +532,7 @@ margin-top: 15px; width: 100%; } + &__button { width: 141px; margin: 0 5px; @@ -521,6 +551,7 @@ box-shadow: 0 0 2px 2px $alto; font-family: Roboto; } + &__header { background: $wild-sand; width: 100%; @@ -530,6 +561,7 @@ font-size: 22px; color: $nile-blue; } + &__message { padding: 20px; width: 100%; @@ -538,16 +570,19 @@ font-size: 17px; color: $nile-blue; } + &__buttons { display: flex; justify-content: space-evenly; width: 100%; margin-bottom: 24px; padding: 0px 42px; + &__btn { cursor: pointer; } } + &__link { color: $curious-blue; } @@ -560,6 +595,7 @@ display: flex; flex-flow: column; height: 100%; + &__header { width: 100%; border-radius: 8px 8px 0 0; @@ -569,17 +605,20 @@ padding: 25px; flex-flow: column; align-items: flex-start; + &__title { color: $white; font-size: 24px; line-height: 32px; } + &__description { color: $white; font-size: 16px; line-height: 22px; margin-top: 10px; } + &__close::after { content: '\00D7'; font-size: 2em; @@ -590,6 +629,7 @@ cursor: pointer; } } + &__buy-rows { width: 100%; padding: 0 30px; @@ -597,21 +637,25 @@ flex-flow: column nowrap; flex: 1; align-items: center; + @media screen and (max-width: 575px) { height: 0; } + .shapeshift-form-wrapper { display: flex; flex-flow: column; justify-content: center; align-items: center; flex: 1 0 auto; + .shapeshift-form, .modal-shapeshift-form { border-radius: 8px; - background-color: rgba(0, 0, 0, .05); + background-color: rgba(0, 0, 0, 0.05); padding: 17px 15px; margin-bottom: 10px; + &__caret { width: auto; flex: 1; @@ -619,6 +663,7 @@ } } } + &__logo { height: 60px; background-repeat: no-repeat; @@ -629,27 +674,32 @@ justify-content: center; align-items: center; } + &__buy-row { - border-bottom: 1px solid $alto; + border-bottom: 1px solid $geyser; display: flex; justify-content: space-between; align-items: center; flex: 1 0 auto; padding: 30px 0 20px; min-height: 170px; + @media screen and (max-width: 575px) { min-height: 270px; flex-flow: column; justify-content: flex-start; } + &__back { position: absolute; top: 10px; left: 0px; } + &__shapeshift-buy { padding-top: 25px; position: relative; + @media screen and (max-width: 575px) { display: flex; justify-content: space-between; @@ -663,61 +713,76 @@ border: none; } } + &__logo-container { display: flex; justify-content: center; flex: 0 0 auto; padding: 0 20px; + @media screen and (min-width: 576px) { width: 12rem; } + @media screen and (max-width: 575px) { width: 100%; max-height: 6rem; padding-bottom: 20px; } } + &__coinbase-logo { height: 40px; } + &__shapeshift-logo { height: 60px; } + &__right { display: flex; } + &__description { - color: $cape-cod; + color: $white; padding-bottom: 20px; align-self: flex-start; + @media screen and (min-width: 575px) { width: 15rem; } + &__title { font-size: 20px; line-height: 30px; } + &__text { font-size: 14px; line-height: 22px; margin-top: 7px; } } + &__button { display: flex; justify-content: flex-end; + @media screen and (min-width: 575px) { min-width: 300px; } } } + &__buy-row:last-of-type { border-bottom: 0px; } + &__deposit-button, .shapeshift-form__shapeshift-buy-btn { width: 257px; } + .shapeshift-form-wrapper { display: flex; flex-flow: column; @@ -725,20 +790,24 @@ align-items: center; margin-top: 28px; flex: 1 0 auto; + .shapeshift-form, .modal-shapeshift-form { border-radius: 8px; - background-color: rgba(0, 0, 0, .05); + background-color: rgba(0, 0, 0, 0.05); padding: 17px 15px; + &__caret { width: auto; flex: 1; } } } + .shapeshift-form__shapeshift-buy-btn { margin-top: 10px; } + .simple-dropdown { color: #5B5D67; font-size: 16px; @@ -751,6 +820,7 @@ line-height: 44px; font-family: Montserrat Light; } + .simple-dropdown__selected { text-align: center; } @@ -789,4 +859,4 @@ justify-content: center; font-size: 17px; color: $nile-blue; -}
\ No newline at end of file +} diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index 1b3db8d0..8ae2fba9 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -1,6 +1,6 @@ .network-component--disabled { // border-color: transparent !important; - cursor: not-allowed; + cursor: default; .fa-caret-down { opacity: 0; @@ -13,17 +13,13 @@ padding: 7px 3px; flex: 0 0 auto; display: flex; - &.ethereum-network .menu-icon-circle div { - background-color: rgba(3, 135, 137, .7) !important; - } - &.ropsten-test-network .menu-icon-circle div { - background-color: rgba(233, 21, 80, .7) !important; - } - &.kovan-test-network .menu-icon-circle div { - background-color: rgba(105, 4, 150, .7) !important; + + &.dexon-network .menu-icon-circle div { + background-color: rgba(149, 74, 151, 0.7) !important; } - &.rinkeby-test-network .menu-icon-circle div { - background-color: rgba(235, 179, 63, .7) !important; + + &.dexon-test-network .menu-icon-circle div { + background-color: rgba(174, 174, 174, 0.7) !important; } } @@ -38,6 +34,7 @@ display: flex; align-items: center; font-size: .6em; + .fa-caret-down { line-height: 15px; font-size: 12px; @@ -65,12 +62,15 @@ .network-droppo { right: 2px; + @media screen and (min-width: 576px) { right: calc(((100% - 85vw) / 2) + 2px); } + @media screen and (min-width: 769px) { right: calc(((100% - 80vw) / 2) + 2px); } + @media screen and (min-width: 1281px) { right: calc(((100% - 65vw) / 2) + 2px); } @@ -109,7 +109,7 @@ .menu-icon-circle--active { border: 1px solid $white; - background: rgba(100, 100, 100, .4); + background: rgba(100, 100, 100, 0.4); } .menu-icon-circle div, @@ -158,4 +158,5 @@ .network-caret { margin: 0 8px 2px; -}
\ No newline at end of file + color: $dexon-purple; +} diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 688fbdf2..9dc11042 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -1,11 +1,13 @@ $sub-mid-size-breakpoint: 667px; $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (max-width: #{$sub-mid-size-breakpoint})"; + /* NewUI Container Elements */ // Component Colors $wallet-view-bg: $muddy-gray; + // Main container .main-container { // position: absolute; @@ -42,21 +44,26 @@ $wallet-view-bg: $muddy-gray; background: $wallet-view-bg; z-index: 200; position: relative; + @media screen and (min-width: 576px) { overflow-y: scroll; overflow-x: hidden; } + @media #{$sub-mid-size-breakpoint-range} { min-width: 160px; } + .wallet-view-account-details { flex: 0 0 auto; } + &__name-container { flex: 0 0 auto; cursor: pointer; width: 100%; } + &__keyring-label { height: 50px; color: $dusty-gray; @@ -66,6 +73,7 @@ $wallet-view-bg: $muddy-gray; padding: 17px 20px 0; box-sizing: border-box; } + &__details-button { font-size: 10px; border-radius: 17px; @@ -74,12 +82,14 @@ $wallet-view-bg: $muddy-gray; padding: 4px 12px; flex: 0 0 auto; } + &__tooltip { display: flex; justify-content: center; align-items: center; padding: 24px; } + &__address { border-radius: 3px; background-color: $alto; @@ -89,10 +99,12 @@ $wallet-view-bg: $muddy-gray; padding: 4px 12px; cursor: pointer; flex: 0 0 auto; + &__pressed { - background-color: $manatee, + background-color: ($manatee,); } } + &__sidebar-close { @media screen and (max-width: 575px) { &::after { @@ -106,12 +118,14 @@ $wallet-view-bg: $muddy-gray; } } } + &__add-token-button { flex: 0 0 auto; margin: 36px auto; background: none; transition: border-color .3s ease; width: 150px; + &:hover { border-color: $white; } @@ -138,7 +152,7 @@ $wallet-view-bg: $muddy-gray; .wallet-view.sidebar-right { flex: 1 0 230px; - background: rgb(250, 250, 250); + background: $muddy-gray; z-index: $sidebar-z-index; position: fixed; top: 66px; @@ -149,7 +163,7 @@ $wallet-view-bg: $muddy-gray; visibility: visible; will-change: transform; overflow-y: auto; - box-shadow: rgba(0, 0, 0, .15) 2px 2px 4px; + box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 4px; width: 85%; height: calc(100% - 56px); } @@ -159,9 +173,11 @@ $wallet-view-bg: $muddy-gray; .lap-visible { display: flex; } + .phone-visible { display: none; } + .main-container { // margin-top: 6.9vh; width: 85vw; @@ -191,9 +207,11 @@ $wallet-view-bg: $muddy-gray; .lap-visible { display: none; } + .phone-visible { display: flex; } + .main-container { // margin-top: 41px; height: 100%; @@ -201,6 +219,7 @@ $wallet-view-bg: $muddy-gray; overflow-y: auto; background-color: $dark-gray; } + .main-container-wrapper { flex: 1; min-height: 0; @@ -242,15 +261,19 @@ $wallet-view-bg: $muddy-gray; display: flex; flex-direction: row-reverse; justify-content: space-between; + @media screen and (max-width: 575px) { height: 100%; } + @media screen and (min-width: 576px) { width: 85vw; } + @media screen and (min-width: 769px) { width: 80vw; } + @media screen and (min-width: 1281px) { width: 62vw; } @@ -263,7 +286,7 @@ $wallet-view-bg: $muddy-gray; justify-content: center; align-items: center; flex: 1 0 auto; - background: #f7f7f7; + background: $dark-gray; width: 100%; } @@ -282,4 +305,4 @@ $wallet-view-bg: $muddy-gray; justify-content: center; padding: 0 10px; background: white; -}
\ No newline at end of file +} diff --git a/ui/app/css/itcss/components/token-list.scss b/ui/app/css/itcss/components/token-list.scss index 9737e717..235f551b 100644 --- a/ui/app/css/itcss/components/token-list.scss +++ b/ui/app/css/itcss/components/token-list.scss @@ -1,5 +1,6 @@ $wallet-balance-breakpoint: 890px; $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (max-width: #{$wallet-balance-breakpoint})"; + .token-list-item { display: flex; flex-flow: row nowrap; @@ -11,6 +12,7 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and ( position: relative; flex: 1; min-width: 0; + &__token-balance { margin-right: 4px; white-space: nowrap; @@ -19,48 +21,59 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and ( min-width: 0; max-width: 100%; } + &__token-balance, &__token-symbol { font-size: 1.5rem; flex: 0 0 auto; + @media #{$wallet-balance-breakpoint-range} { font-size: 95%; } } + &__fiat-amount { margin-top: .25%; font-size: 105%; width: 100%; text-transform: uppercase; + @media #{$wallet-balance-breakpoint-range} { font-size: 95%; } } + @media #{$wallet-balance-breakpoint-range} { padding: 10% 4%; } + &--active { background-color: $geyser; color: $white; } + &__identicon { margin-right: 15px; border: '1px solid #dedede'; min-width: 50px; + @media #{$wallet-balance-breakpoint-range} { margin-right: 4%; } } + &__balance-ellipsis { display: flex; align-items: center; min-width: 0; flex: 1; } + &__ellipsis { line-height: 45px; margin-left: 5px; } + &__balance-wrapper { flex: 1; flex-flow: row wrap; @@ -75,9 +88,11 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and ( top: 52px; right: 25px; z-index: 2000; + @media #{$wallet-balance-breakpoint-range} { right: 18px; } + &__close-area { position: fixed; top: 0; @@ -87,16 +102,19 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and ( height: 100%; cursor: default; } + &__container { padding: 16px; z-index: 2200; position: relative; } + &__options { display: flex; flex-direction: column; justify-content: center; } + &__option { color: $white; font-family: Roboto; @@ -104,4 +122,4 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and ( line-height: 21px; text-align: center; } -}
\ No newline at end of file +} diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index 3ff5979c..3b5e2411 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -4,11 +4,12 @@ // Base Colors $white: #fff; -$white-transparent: unquote('#ffffff88'); +$white-transparent: unquote("#ffffff88"); $black: #000; $orange: #ffa500; $red: #f00; $gray: #808080; + /* Colors http://chir.ag/projects/name-that-color @@ -63,6 +64,7 @@ $mischka: #dddee9; $dexon-purple: #954A97; $dark-gray: #222222; $muddy-gray: #303030; + /* Z-Indicies */ @@ -76,6 +78,7 @@ $main-container-z-index: 18; $send-card-z-index: 20; $sidebar-z-index: 26; $sidebar-overlay-z-index: 25; + /* Z Indicies - Current app - 11 @@ -92,4 +95,4 @@ $sidebar-overlay-z-index: 25; $break-small: 575px; $break-midpoint: 780px; $break-large: 576px; -$primary-font-type: Roboto;
\ No newline at end of file +$primary-font-type: Roboto; diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index 037d990f..93697b13 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -5,18 +5,9 @@ module.exports = function (address, network) { case 1: // main net link = `https://etherscan.io/address/${address}` break - case 2: // morden test net + case 2: // test net link = `https://morden.etherscan.io/address/${address}` break - case 3: // ropsten test net - link = `https://ropsten.etherscan.io/address/${address}` - break - case 4: // rinkeby test net - link = `https://rinkeby.etherscan.io/address/${address}` - break - case 42: // kovan test net - link = `https://kovan.etherscan.io/address/${address}` - break default: link = '' break |
