Merge branch 'master' into i18n-translator-redux

8 files changed, 2558 insertions, 3 deletions

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 9fac9c248..3e469cf44 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -171,6 +171,9 @@
   "customGas": {
     "message": "Customize Gas"
   },
+  "customToken": {
+    "message": "Custom Token"
+  },
   "customize": {
     "message": "Customize"
   },
@@ -415,6 +418,9 @@
     "message": "JSON File",
     "description": "format for importing an account"
   },
+  "keepTrackTokens": {
+    "message": "Keep track of the tokens you’ve bought with your MetaMask account."
+  },
   "kovan": {
     "message": "Kovan Test Network"
   },
@@ -424,6 +430,9 @@
   "max": {
     "message": "Max"
   },
+  "learnMore": {
+    "message": "Learn more."
+  },
   "lessThanMax": {
     "message": "must be less than or equal to $1.",
     "description": "helper for inputting hex as decimal input"
@@ -564,6 +573,9 @@
   "pleaseReviewTransaction": {
     "message": "Please review your transaction."
   },
+  "popularTokens": {
+    "message": "Popular Tokens"
+  },
   "privacyMsg": {
     "message": "Privacy Policy"
   },
@@ -708,6 +720,9 @@
   "onlySendToEtherAddress": {
     "message": "Only send ETH to an Ethereum address."
   },
+  "searchTokens": {
+    "message": "Search Tokens"
+  },
   "sendTokensAnywhere": {
     "message": "Send Tokens to anyone with an Ethereum account"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
new file mode 100644
index 000000000..0532f11b2
--- /dev/null
+++ b/app/_locales/sl/messages.json
@@ -0,0 +1,819 @@
+{
+  "accept": {
+    "message": "Sprejmi"
+  },
+  "account": {
+    "message": "Račun"
+  },
+  "accountDetails": {
+    "message": "Podrobnosti računa"
+  },
+  "accountName": {
+    "message": "Ime računa"
+  },
+  "address": {
+    "message": "Naslov"
+  },
+  "addCustomToken": {
+    "message": "Dodaj žeton po meri"
+  },
+  "addToken": {
+    "message": "Dodaj žeton"
+  },
+  "addTokens": {
+    "message": "Dodaj žetone"
+  },
+  "amount": {
+    "message": "Znesek"
+  },
+  "amountPlusGas": {
+    "message": "Znesek + Gas"
+  },
+  "appDescription": {
+    "message": "Denarnica za Ethereum v brskalniku",
+    "description": "The description of the application"
+  },
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "attemptingConnect": {
+    "message": "Povezovanje z verigo blokov ..."
+  },
+  "attributions": {
+    "message": "Dodelitve"
+  },
+  "available": {
+    "message": "Na voljo"
+  },
+  "back": {
+    "message": "Nazaj"
+  },
+  "balance": {
+    "message": "Znesek:"
+  },
+  "balances": {
+    "message": "Vaš znesek"
+  },
+  "balanceIsInsufficientGas": {
+    "message": "Napačen znesek za skupno gas vrednost"
+  },
+  "beta": {
+    "message": "BETA"
+  },
+  "betweenMinAndMax": {
+    "message": "mora biti večji ali enak $1 in manjši ali enak $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "blockiesIdenticon": {
+    "message": "Uporabite Blockies Identicon"
+  },
+  "borrowDharma": {
+    "message": "Izposoja z Dharma (Beta)"
+  },
+  "builtInCalifornia": {
+    "message": "MetaMask je ustvarjen v Kaliforniji."
+  },
+  "buy": {
+    "message": "Kupi"
+  },
+  "buyCoinbase": {
+    "message": "Kupi na Coinbase"
+  },
+  "buyCoinbaseExplainer": {
+    "message": "Coinbase je najpopularnejši načun za kupovanje in prodajo bitcoinov, ethereuma, in litecoina."
+  },
+  "cancel": {
+    "message": "Prekliči"
+  },
+  "classicInterface": {
+    "message": "Uporabi navaden način"
+  },
+  "clickCopy": {
+    "message": "Kliknite za kopiranje"
+  },
+  "confirm": {
+    "message": "Potrdi"
+  },
+  "confirmContract": {
+    "message": "Potrdi pogodbo"
+  },
+  "confirmPassword": {
+    "message": "Potrdi geslo"
+  },
+  "confirmTransaction": {
+    "message": "Potrdi transakcijo"
+  },
+  "continue": {
+    "message": "Nadaljuj"
+  },
+  "continueToCoinbase": {
+    "message": "Nadaljuj na Coinbase"
+  },
+  "contractDeployment": {
+    "message": "Ustvarjanje pogodbe"
+  },
+  "conversionProgress": {
+    "message": "Poteka pretvorba"
+  },
+  "copiedButton": {
+    "message": "Kopirano"
+  },
+  "copiedClipboard": {
+    "message": "Kopirano v odložišče"
+  },
+  "copiedExclamation": {
+    "message": "Kopirano!"
+  },
+  "copiedSafe": {
+    "message": "Prilepil sem ga na varno!"
+  },
+  "copy": {
+    "message": "Kopiraj"
+  },
+  "copyToClipboard": {
+    "message": "Kopiraj v odložišče"
+  },
+  "copyButton": {
+    "message": " Kopiraj "
+  },
+  "copyPrivateKey": {
+    "message": "To je vaš zesebni ključ (kliknite za kopiranje)"
+  },
+  "create": {
+    "message": "Ustvari"
+  },
+  "createAccount": {
+    "message": "Ustvari račun"
+  },
+  "createDen": {
+    "message": "Ustvari"
+  },
+  "crypto": {
+    "message": "Kripto",
+    "description": "Exchange type (cryptocurrencies)"
+  },
+  "currentConversion": {
+    "message": "Trenutna cena"
+  },
+  "currentNetwork": {
+    "message": "Trenutno omrežje"
+  },
+  "customGas": {
+    "message": "Prilagodi gas"
+  },
+  "customize": {
+    "message": "Prilagodi"
+  },
+  "customRPC": {
+    "message": "Poljuben RPC"
+  },
+  "decimalsMustZerotoTen": {
+    "message": "Decimalk mora biti vsaj 0, in ne več kot 36."
+  },
+  "decimal": {
+    "message": "Decimalke natančnosti"
+  }, 
+  "defaultNetwork": {
+    "message": "Privzeto omrežje za transakcije je Main Net."
+  },
+  "denExplainer": {
+    "message": "DEN je vaša šifrirana shramba v MetaMasku."
+  },
+  "deposit": {
+    "message": "Vplačilo"
+  },
+  "depositBTC": {
+    "message": "Vplačajte vaš BTC na spodnji naslov:"
+  },
+  "depositCoin": {
+    "message": "Vplačajte $1 na spodnji naslov",
+    "description": "Tells the user what coin they have selected to deposit with shapeshift"
+  },
+  "depositEth": {
+    "message": "Vplačilo ETH"
+  },
+  "depositEther": {
+    "message": "Vplačilo ethera"
+  },
+  "depositFiat": {
+    "message": "Vplačilo s klasičnimi valutami"
+  },
+  "depositFromAccount": {
+    "message": "Vplačilo iz drugega računa"
+  },
+  "depositShapeShift": {
+    "message": "Vplačilo z ShapeShift"
+  },
+  "depositShapeShiftExplainer": {
+    "message": "Če imate druge kriptovalute, lahko vpačate ether neposredno v MetaMask. Brez računov."
+  },
+  "details": {
+    "message": "Podrobnosti"
+  },
+  "directDeposit": {
+    "message": "Direktno vplačilo"
+  },
+  "directDepositEther": {
+    "message": "Direktno vplačilo ehera"
+  },
+  "directDepositEtherExplainer": {
+    "message": "Če že imate ether, ga lahko najhitreje dobite v MetaMask z direktnim vplačilom."
+  },
+  "done": {
+    "message": "Končano"
+  },
+  "downloadStatelogs": {
+    "message": "Prenesi state dnevnike"
+  },
+  "edit": {
+    "message": "Uredi"
+  },
+  "editAccountName": {
+    "message": "Uredi ime računa"
+  },
+  "emailUs": {
+    "message": "Pišite nam!"
+  },
+  "encryptNewDen": {
+    "message": "Šifrirajte DEN"
+  },
+  "enterPassword": {
+    "message": "Vpišite geslo"
+  },
+  "enterPasswordConfirm": {
+    "message": "Potrdite geslo"
+  },
+  "etherscanView": {
+    "message": "Poglejte račun na Etherscan"
+  },
+  "exchangeRate": {
+    "message": "Menjalni tečaj"
+  },
+  "exportPrivateKey": {
+    "message": "Izvozi zasebni ključ"
+  },
+  "exportPrivateKeyWarning": {
+    "message": "Izvažanje zasebnih ključev je na lastno odgovornost."
+  },
+  "failed": {
+    "message": "Ni uspelo"
+  },
+  "fiat": {
+    "message": "FIAT",
+    "description": "Exchange type"
+  },
+  "fileImportFail": {
+    "message": "Uvoz z datoteko ni uspel? Kliknite tukaj!",
+    "description": "Helps user import their account from a JSON file"
+  },
+  "followTwitter": {
+    "message": "Sledite nam na Twitterju"
+  },
+  "from": {
+    "message": "Od"
+  },
+  "fromToSame": {
+    "message": "From and To address cannot be the same"
+  },
+  "fromShapeShift": {
+    "message": "Od ShapeShift"
+  },
+  "gas": {
+    "message": "Gas",
+    "description": "Short indication of gas cost"
+  },
+  "gasFee": {
+    "message": "Gas fee"
+  },
+  "gasLimit": {
+    "message": "Gas limit"
+  },
+  "gasLimitCalculation": {
+    "message": "Priporočen gas limit je izračunan glede na omrežje."
+  },
+  "gasLimitRequired": {
+    "message": "Gas limit je zahtevan"
+  },
+  "gasLimitTooLow": {
+    "message": "Gas limit mora biti najmanj 21000"
+  },
+  "generatingSeed": {
+    "message": "Ustvarjenje seed ..."
+  },
+  "gasPrice": {
+    "message": "Gas price (GWEI)"
+  },
+  "gasPriceCalculation": {
+    "message": "Priporočen gas price je izračunan glede na omrežje"
+  },
+  "gasPriceRequired": {
+    "message": "Gas price je zahtevan"
+  },
+  "getEther": {
+    "message": "Pridobite ether"
+  },
+  "getEtherFromFaucet": {
+    "message": "Pridobite ether iz fauceta za $1",
+    "description": "Displays network name for Ether faucet"
+  },
+  "greaterThanMin": {
+    "message": "mora biti višji ali enak $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "here": {
+    "message": "tukaj",
+    "description": "as in -click here- for more information (goes with troubleTokenBalances)"
+  },
+  "hereList": {
+    "message": "Tukaj je seznam!!!"
+  },
+  "hide": {
+    "message": "Skrij"
+  },
+  "hideToken": {
+    "message": "Skrij žeton"
+  },
+  "hideTokenPrompt": {
+    "message": "Skrijem žeton?"
+  },
+  "howToDeposit": {
+    "message": "Kako želite vplačati ether?"
+  },
+  "holdEther": {
+    "message": "Omogoča vam, da imate eter in žetone in služi kot most za decentralizirane aplikacije."
+  },
+  "import": {
+    "message": "Uvozi",
+    "description": "Button to import an account from a selected file"
+  },
+  "importAccount": {
+    "message": "Uvozi račun"
+  },
+  "importAccountMsg": {
+    "message":" Uvoženi računi ne bodo povezani s prvotnim seedphaseom. Preberite več o uvoženih računih "
+  },
+  "importAnAccount": {
+    "message": "Uvozi račun"
+  },
+  "importDen": {
+    "message": "Uvozi DEN"
+  },
+  "imported": {
+    "message": "Uvoženo",
+    "description": "status showing that an account has been fully loaded into the keyring"
+  },
+  "infoHelp": {
+    "message": "Info & Pomoč"
+  },
+  "insufficientFunds": {
+    "message": "Nezadostna sredstva."
+  },
+  "insufficientTokens": {
+    "message": "Nezadostni žetoni."
+  },
+  "invalidAddress": {
+    "message": "Nepravilen naslov"
+  },
+  "invalidAddressRecipient": {
+    "message": "Prejemnikov naslov je neveljaven"
+  },
+  "invalidGasParams": {
+    "message": "Nepravilno nastavljen gas"
+  },
+  "invalidInput": {
+    "message": "Napačen vnos."
+  },
+  "invalidRequest": {
+    "message": "Napačna zahteva"
+  },
+  "invalidRPC": {
+    "message": "Napačen RPC URI"
+  },
+  "jsonFail": {
+    "message": "Nekaj je bilo narobe. Prepričajte se, da je JSON datoteka pravilno oblikovana."
+  },
+  "jsonFile": {
+    "message": "JSON datoteka",
+    "description": "format for importing an account"
+  },
+  "kovan": {
+    "message": "Testno omrežje Kovan"
+  },
+  "knowledgeDataBase": {
+    "message": "Obiščite našo pomoč"
+  },
+  "lessThanMax": {
+    "message": "mora biti večji ali enak $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "likeToAddTokens": {
+    "message": "Želite dodati te žetone?"
+  },
+  "limit": {
+    "message": "Omejitev"
+  },
+  "loading": {
+    "message": "Nalaganje ..."
+  },
+  "loadingTokens": {
+    "message": "Nalaganje žetonov ..."
+  },
+  "localhost": {
+    "message": "Localhost 8545"
+  },
+  "login": {
+    "message": "Prijava"
+  },
+  "logout": {
+    "message": "Odjava"
+  },
+  "loose": {
+    "message": "Loose"
+  },
+  "loweCaseWords": {
+    "message": "seed words imajo lahko le male črke"
+  },
+  "mainnet": {
+    "message": "Glavno omrežje"
+  },
+  "message": {
+    "message": "Sporočilo"
+  },
+  "metamaskDescription": {
+    "message": "MetaMask je varen identitetni sklad za Ethereum."
+  },
+  "min": {
+    "message": "Najmanj"
+  },
+  "myAccounts": {
+    "message": "Moji računi"
+  },
+  "mustSelectOne": {
+    "message": "Izbran mora biti vsaj 1 žeton."
+  },
+  "needEtherInWallet": {
+    "message": "Za interakcijo z decentraliziranimi aplikacijami, ki uporabljajo MetaMask, boste v svoji denarnici potrebovali eter."
+  },
+  "needImportFile": {
+    "message": "Za uvoz morate izbrati datoteko.",
+    "description": "User is important an account and needs to add a file to continue"
+  },
+  "needImportPassword": {
+    "message": "Za izbrano datoteko morate vnesti geslo.",
+    "description": "Password and file needed to import an account"
+  },
+  "negativeETH": {
+    "message": "Ni mogoče poslati negativne vsote ETH."
+  },
+  "networks": {
+    "message": "Omrežja"
+  },
+  "newAccount": {
+    "message": "Nov račun"
+  },
+  "newAccountNumberName": {
+    "message": "Račun $1",
+    "description": "Default name of next account to be created on create account screen"
+  },
+  "newContract": {
+    "message": "Nova pogodba"
+  },
+  "newPassword": {
+    "message": "Novo geslo (min. 8. črk)"
+  },
+  "newRecipient": {
+    "message": "Nov prejemnik"
+  },
+  "newRPC": {
+    "message": "Nov RPC URL"
+  },
+  "next": {
+    "message": "Naprej"
+  },
+  "noAddressForName": {
+    "message": "Za to ime ni bil nastavljen noben naslov."
+  },
+  "noDeposits": {
+    "message": "Ni prejetih vplačil"
+  },
+  "noTransactionHistory": {
+    "message": "Ni zgodovine transakcij."
+  },
+  "noTransactions": {
+    "message": "Ni transakcij"
+  },
+  "notStarted": {
+    "message": "Ni se začelo"
+  },
+  "oldUI": {
+    "message": "Starejši uporabniški vmesnik"
+  },
+  "oldUIMessage": {
+    "message": "Vrnili ste se v starejši uporabniški vmesnik. V novega se lahko vrnete z možnostjo v spustnem meniju v zgornjem desnem kotu."
+  },
+  "or": {
+    "message": "ali",
+    "description": "choice between creating or importing a new account"
+  },
+  "passwordCorrect": {
+    "message": "Prepričajte se, da je geslo pravilno."
+  },
+  "passwordMismatch": {
+    "message": "gesli se ne ujemata",
+    "description": "in password creation process, the two new password fields did not match"
+  },
+  "passwordShort": {
+    "message": "geslo ni dovolj dolgo",
+    "description": "in password creation process, the password is not long enough to be secure"
+  },
+  "pastePrivateKey": {
+    "message": "Tukaj prilepite zasebni ključ:",
+    "description": "For importing an account from a private key"
+  },
+  "pasteSeed": {
+    "message": "Tukaj prilepite seed phrase!"
+  },
+  "personalAddressDetected": {
+    "message": "Osebni naslov je zaznan. Vnesite naslov žetona."
+  },
+  "pleaseReviewTransaction": {
+    "message": "Preglejte transakcijo."
+  },
+  "privacyMsg": {
+    "message": "Politika zasebnosti"
+  },
+  "privateKey": {
+    "message": "Zasebni ključ",
+    "description": "select this type of file to use to import an account"
+  },
+  "privateKeyWarning": {
+    "message": "Opozorilo: Nikoli ne razkrijte tega ključa. Vsakdo s svojimi zasebnimi ključi lahko ukrade vse premoženje v računu."
+  },
+  "privateNetwork": {
+    "message": "Zasebno omrežje"
+  },
+  "qrCode": {
+    "message": "Prikaži QR kodo"
+  },
+  "readdToken": {
+    "message": "Ta žeton lahko dodate tudi v prihodnosti, tako da odprete možnost »Dodaj žeton« v meniju z računi."
+  },
+  "readMore": {
+    "message": "Preberite več."
+  },
+  "readMore2": {
+    "message": "Preberite več."
+  },
+  "receive": {
+    "message": "Prejmite"
+  },
+  "recipientAddress": {
+    "message": "Prejemnikov naslov"
+  },
+  "refundAddress": {
+    "message": "Vaš naslov za vračilo"
+  },
+  "rejected": {
+    "message": "Zavrnjeno"
+  },
+  "resetAccount": {
+    "message": "Ponastavi račun"
+  },
+  "restoreFromSeed": {
+    "message": "Obnovi iz seed phrase"
+  },
+  "required": {
+    "message": "Zahtevano"
+  },
+  "retryWithMoreGas": {
+    "message": "Poskusi z višjim gas price"
+  },
+  "revealSeedWords": {
+    "message": "Prikaži seed words"
+  },
+  "revealSeedWordsWarning": {
+    "message": "Ne obnovite seed words na javnem mestu! Te besede se lahko uporabijo za krajo vseh vaših računov."
+  },
+  "revert": {
+    "message": "Povrni"
+  },
+  "rinkeby": {
+    "message": "Testno omrežje Rinkeby"
+  },
+  "ropsten": {
+    "message": "Testno omrežje Ropsten"
+  },
+  "sampleAccountName": {
+    "message": "npr. Moj nov račun",
+    "description": "Help user understand concept of adding a human-readable name to their account"
+  },
+  "save": {
+    "message": "Shrani"
+  },
+  "saveAsFile": {
+    "message": "Shrani kot datoteko",
+    "description": "Account export process"
+  },
+  "saveSeedAsFile": {
+    "message": "Shrani seed words kot datoteko"
+  },
+  "search": {
+    "message": "Iskanje"
+  },
+  "secretPhrase": {
+    "message": "Tukaj vnesite svoje seed words, da obnovite svoje račune."
+  },
+  "seedPhraseReq": {
+    "message": "seed phrases so dolgi 12 besed"
+  },
+  "select": {
+    "message": "Izberi"
+  },
+  "selectCurrency": {
+    "message": "Izberi valuto"
+  },
+  "selectService": {
+    "message": "Izberi storitev"
+  },
+  "selectType": {
+    "message": "Izberi vrsto"
+  },
+  "send": {
+    "message": "Pošlji"
+  },
+  "sendETH": {
+    "message": "Pošlji ETH"
+  },
+  "sendTokens": {
+    "message": "Pošlji žetone"
+  },
+  "sendTokensAnywhere": {
+    "message": "Pošljite žetone vsem, ki imajo Ethereum račun"
+  },
+  "settings": {
+    "message": "Nastavitve"
+  },
+  "shapeshiftBuy": {
+    "message": "Kupite z Shapeshift"
+  },
+  "showPrivateKeys": {
+    "message": "Prikaži zasebne ključe"
+  },
+  "showQRCode": {
+    "message": "Prikaži QR kodo"
+  },
+  "sign": {
+    "message": "Podpiši"
+  },
+  "signMessage": {
+    "message": "Podpiši sporočilo"
+  },
+  "signNotice": {
+    "message": "To podpisovanje lahko povzroči \nnevarne stranske učinke. Podpisujte samo sporočila \nstrani, ki jim zaupate s svojim celotnim računom.\n Ta nevarna funkcija bo odstranjena v prihodnji različici. "
+  },
+  "sigRequest": {
+    "message": "Zahteva za podpis"
+  },
+  "sigRequested": {
+    "message": "Podpis je zahtevan"
+  },
+  "spaceBetween": {
+    "message": "med besedami je lahko samo presledek"
+  },
+  "status": {
+    "message": "Status"
+  },
+  "stateLogs": {
+    "message": "State dnevniki"
+  },
+  "stateLogsDescription": {
+    "message": "State dnevniki vsebujejo naslove vašega računa in poslane transakcije.."
+  },
+  "submit": {
+    "message": "Potrdi"
+  },
+  "supportCenter": {
+    "message": "Obiščite našo podporo"
+  },
+  "symbolBetweenZeroTen": {
+    "message": "Simbol mora biti dolg od 0 do 10 znakov."
+  },
+  "takesTooLong": {
+    "message": "Traja predolgo?"
+  },
+  "terms": {
+    "message": "Pogoji uporabe"
+  },
+  "testFaucet": {
+    "message": "Testni faucet"
+  },
+  "to": {
+    "message": "Za"
+  },
+  "toETHviaShapeShift": {
+    "message": "$1 v ETH prek ShapeShift",
+    "description": "system will fill in deposit type in start of message"
+  },
+  "tokenAddress": {
+    "message": "Naslov žetona"
+  },
+  "tokenAlreadyAdded": {
+    "message": "Žeton je že bil dodan."
+  },
+  "tokenBalance": {
+    "message": "Vaš znesek žetona:"
+  },
+  "tokenSelection": {
+    "message": "Poiščite žetone ali jih izberite z našega seznama priljubljenih žetonov."
+  },
+  "tokenSymbol": {
+    "message": "Simbol žetona"
+  },
+  "tokenWarning1": {
+    "message": "Spremljajte žetone, ki ste jih kupili s svojim MetaMask računom. Če ste kupili žetone z drugačnim računom, ti žetoni ne bodo prikazani tukaj."
+  },
+  "total": {
+    "message": "Skupno"
+  },
+  "transactions": {
+    "message": "transakcije"
+  },
+  "transactionMemo": {
+    "message": "Opis transakcije (ni zahtevano)"
+  },
+  "transactionNumber": {
+    "message": "Številka transakcije"
+  },
+  "transfers": {
+    "message": "Prenosi"
+  },
+  "troubleTokenBalances": {
+    "message": "Imeli smo težave pri nalaganju vaših žetonov. Ogledate si jih lahko ",
+    "description": "Followed by a link (here) to view token balances"
+  },
+  "twelveWords": {
+    "message": "Edini način za obnovitev MetaMask računa, je teh 12 besed.\nShranite jih na varno in skrivno mesto."
+  },
+  "typePassword": {
+    "message": "Vpišite vaše geslo"
+  },
+  "uiWelcome": {
+    "message": "Dobrodošli v novem uporabniškem vmesniku (Beta)"
+  },
+  "uiWelcomeMessage": {
+    "message": "Zdaj uporabljate novi MetaMask uporabniški vmesnik. Razglejte se, preizkusite nove funkcije, kot so pošiljanje žetonov, in nas obvestite, če imate kakšne težave."
+  },
+  "unavailable": {
+    "message": "Ni na voljo"
+  },
+  "unknown": {
+    "message": "Neznano"
+  },
+  "unknownNetwork": {
+    "message": "Neznano zasebno omrežje"
+  },
+  "unknownNetworkId": {
+    "message": "Neznan ID omrežja"
+  },
+  "uriErrorMsg": {
+    "message": "URI-ji zahtevajo ustrezno HTTP/HTTPS predpono."
+  },
+  "usaOnly": {
+    "message": "Samo za ZDA",
+    "description": "Using this exchange is limited to people inside the USA"
+  },
+  "usedByClients": {
+    "message": "Uporablja jih več različnih odjemalcev"
+  },
+  "useOldUI": {
+    "message": "Uporabi star uporabniški vmesnik"
+  },
+  "validFileImport": {
+    "message": "Za uvoz morate izbrati pravilno datoteko."
+  },
+  "vaultCreated": {
+    "message": "Račun je ustvarjen"
+  },
+  "viewAccount": {
+    "message": "Poglej račun"
+  },
+  "visitWebSite": {
+    "message": "Obiščite našo spletno stran"
+  }, 
+  "warning": {
+    "message": "Opozorilo"
+  },
+  "welcomeBeta": {
+    "message": "Dobrodošli v MetaMask Beta"
+  },
+  "whatsThis": {
+    "message": "Kaj je to?"
+  },
+  "yourSigRequested": {
+    "message": "Vaš podpis je bil zahtevan"
+  },
+  "youSign": {
+    "message": "Podpisani ste"
+  }
+}
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
new file mode 100644
index 000000000..887714f3f
--- /dev/null
+++ b/app/_locales/th/messages.json
@@ -0,0 +1,819 @@
+{
+  "accept": {
+    "message": "ยอมรับ"
+  },
+  "account": {
+    "message": "บัญชี"
+  },
+  "accountDetails": {
+    "message": "รายละเอียดบัญชี"
+  },
+  "accountName": {
+    "message": "ชื่อบัญชี"
+  },
+  "address": {
+    "message": "แอดเดรส"
+  },
+  "addCustomToken": {
+    "message": "เพิ่มโทเค็นด้วยตัวเอง"
+  },
+  "addToken": {
+    "message": "เพิ่มโทเค็น"
+  },
+  "addTokens": {
+    "message": "เพิ่มหลายโทเค็น"
+  },
+  "amount": {
+    "message": "จำนวน"
+  },
+  "amountPlusGas": {
+    "message": "จำนวน + แก๊ส"
+  },
+  "appDescription": {
+    "message": "ส่วนขยายเบราว์เซอร์สำหรับอีเธอเรียม",
+    "description": "The description of the application"
+  },
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "attemptingConnect": {
+    "message": "กำลังเชื่อมต่อกับบล็อกเชน"
+  },
+  "attributions": {
+    "message": "อ้างถึง"
+  },
+  "available": {
+    "message": "ว่าง"
+  },
+  "back": {
+    "message": "กลับ"
+  },
+  "balance": {
+    "message": "ยอดคงเหลือ:"
+  },
+  "balances": {
+    "message": "ยอดคงเหลือของคุณ"
+  },
+  "balanceIsInsufficientGas": {
+    "message": "ยอดคงเหลือไม่พอสำหรับจ่ายค่าแก๊สทั้งหมด"
+  },
+  "beta": {
+    "message": "เบต้า"
+  },
+  "betweenMinAndMax": {
+    "message": "ต้องมากกว่าหรือเท่ากับ $1 และน้อยกว่าหรือเท่ากับ $2",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "blockiesIdenticon": {
+    "message": "ใช้งาน Blockies Identicon"
+  },
+  "borrowDharma": {
+    "message": "ยืมด้วย Dharma (เบต้า)"
+  },
+  "builtInCalifornia": {
+    "message": "MetaMask ออกแบบและพัฒนาที่แคลิฟอร์เนีย"
+  },
+  "buy": {
+    "message": "ซื้อ"
+  },
+  "buyCoinbase": {
+    "message": "ซื้อด้วย Coinbase"
+  },
+  "buyCoinbaseExplainer": {
+    "message": "Coinbase เป็นแหล่งซื้อขายบิตคอยน์ไลท์คอยน์และอีเธอเรียมที่ได้รับความนิยมสูงสุดในโลก"
+  },
+  "cancel": {
+    "message": "ยกเลิก"
+  },
+  "classicInterface": {
+    "message": "ใช้หน้าตาแบบเก่า"
+  },
+  "clickCopy": {
+    "message": "กดเพื่อคัดลอก"
+  },
+  "confirm": {
+    "message": "ยืนยัน"
+  },
+  "confirmContract": {
+    "message": "ยืนยันสัญญา"
+  },
+  "confirmPassword": {
+    "message": "ยืนยันรหัสผ่าน"
+  },
+  "confirmTransaction": {
+    "message": "ยืนยันการทำรายการธุรกรรม"
+  },
+  "continue": {
+    "message": "ทำต่อไป"
+  },
+  "continueToCoinbase": {
+    "message": "ไปที่ Coinbase"
+  },
+  "contractDeployment": {
+    "message": "การติดตั้งสัญญา"
+  },
+  "conversionProgress": {
+    "message": "กำลังดำเนินการแปลงหน่วย"
+  },
+  "copiedButton": {
+    "message": "คัดลอกแล้ว"
+  },
+  "copiedClipboard": {
+    "message": "คัดลอกไปที่คลิบบอร์ดแล้ว"
+  },
+  "copiedExclamation": {
+    "message": "คัดลอกแล้ว!"
+  },
+  "copiedSafe": {
+    "message": "ฉันได้คัดลอกเก็บไว้ในที่ปลอดภัยเรียบร้อยแล้ว"
+  },
+  "copy": {
+    "message": "คัดลอก"
+  },
+  "copyToClipboard": {
+    "message": "คัดลอกไปคลิปบอร์ด"
+  },
+  "copyButton": {
+    "message": " คัดลอก "
+  },
+  "copyPrivateKey": {
+    "message": "นี่คือคีย์ส่วนตัวของคุณ(กดเพื่อคัดลอก)"
+  },
+  "create": {
+    "message": "สร้าง"
+  },
+  "createAccount": {
+    "message": "สร้างบัญชี"
+  },
+  "createDen": {
+    "message": "สร้าง"
+  },
+  "crypto": {
+    "message": "คริปโต",
+    "description": "Exchange type (cryptocurrencies)"
+  },
+  "currentConversion": {
+    "message": "อัตราแลกเปลี่ยนปัจจุบัน"
+  },
+  "currentNetwork": {
+    "message": "เครือข่ายปัจจุบัน"
+  },
+  "customGas": {
+    "message": "กำหนดค่าแก็สเอง"
+  },
+  "customize": {
+    "message": "กำหนดค่าเอง"
+  },
+  "customRPC": {
+    "message": "กำหนดค่า RPC เอง"
+  },
+  "decimalsMustZerotoTen": {
+    "message": "จำนวนต้องมากกว่า 0 และไม่เกิน 36"
+  },
+  "decimal": {
+    "message": "ตำแหน่งของทศนิยม"
+  },
+  "defaultNetwork": {
+    "message": "ค่าเริ่มต้นของเครือข่ายสำหรับทำรายการธุรกรรมอีเธอร์คือ Main Net"
+  },
+  "denExplainer": {
+    "message": "DEN ของคุณคือตัวเก็บข้อมูลที่เข้ารหัสไว้ด้วยรหัสผ่านของคุณภายใน MetaMask "
+  },
+  "deposit": {
+    "message": "ฝาก"
+  },
+  "depositBTC": {
+    "message": "ฝากบิตคอยน์ของคุณไปที่แอดเดรสด้านล่างนี้:"
+  },
+  "depositCoin": {
+    "message": "ฝาก $1 ของคุณไปที่แอดเดรสด้านล่างนี้:",
+    "description": "Tells the user what coin they have selected to deposit with shapeshift"
+  },
+  "depositEth": {
+    "message": "การฝากอีเธอร์"
+  },
+  "depositEther": {
+    "message": "การฝากอีเธอร์"
+  },
+  "depositFiat": {
+    "message": "ฝากด้วยเงินตรา"
+  },
+  "depositFromAccount": {
+    "message": "ฝากจากบัญชีอื่น"
+  },
+  "depositShapeShift": {
+    "message": "ฝากด้วย ShapeShift"
+  },
+  "depositShapeShiftExplainer": {
+    "message": "ถ้ามีเงินสกุลอื่นอยู่ก็สามารถแลกเงินและฝากเป็นอีเธอร์ได้โดยตรงเข้ากระเป๋า MetaMask ได้เลยไม่ต้องสมัครบัญชี"
+  },
+  "details": {
+    "message": "รายละเอียด"
+  },
+  "directDeposit": {
+    "message": "ฝากตรง"
+  },
+  "directDepositEther": {
+    "message": "ฝากอีเธอร์โดยตรง"
+  },
+  "directDepositEtherExplainer": {
+    "message": "ถ้าคุณมีอีเธอร์อยู่แล้ววิธีการที่เร็วที่สุดในการเอาเงินเข้ากระเป๋าใหม่ก็คือการโอนตรงๆ"
+  },
+  "done": {
+    "message": "เสร็จสิ้น"
+  },
+  "downloadStatelogs": {
+    "message": "ดาวน์โหลดล็อกสถานะ"
+  },
+  "edit": {
+    "message": "แก้ไข"
+  },
+  "editAccountName": {
+    "message": "แก้ไขชื่อบัญชี"
+  },
+  "emailUs": {
+    "message": "อีเมลหาเรา!"
+  },
+  "encryptNewDen": {
+    "message": "เข้ารหัส DEN ของคุณ"
+  },
+  "enterPassword": {
+    "message": "ใส่รหัสผ่าน"
+  },
+  "enterPasswordConfirm": {
+    "message": "ใส่รหัสผ่านอีกครั้งเพื่อยืนยัน"
+  },
+  "etherscanView": {
+    "message": "ดูบัญชีบน Etherscan"
+  },
+  "exchangeRate": {
+    "message": "อัตราแลกเปลี่ยน"
+  },
+  "exportPrivateKey": {
+    "message": "ส่งออกคีย์ส่วนตัว"
+  },
+  "exportPrivateKeyWarning": {
+    "message": "ส่งออกคีย์ส่วนตัวโดยคุณรับความเสี่ยงเอง"
+  },
+  "failed": {
+    "message": "ล้มเหลว"
+  },
+  "fiat": {
+    "message": "เงินตรา",
+    "description": "Exchange type"
+  },
+  "fileImportFail": {
+    "message": "นำเข้าไฟล์ไม่สำเหร็จ กดที่นี่!",
+    "description": "Helps user import their account from a JSON file"
+  },
+  "followTwitter": {
+    "message": "ติดตามเราบนทวิตเตอร์"
+  },
+  "from": {
+    "message": "จาก"
+  },
+  "fromToSame": {
+    "message": "แอดเดรสที่ส่งกับที่รับจะต้องไม่ไช่อันเดียวกัน"
+  },
+  "fromShapeShift": {
+    "message": "จาก ShapeShift"
+  },
+  "gas": {
+    "message": "แก็ส",
+    "description": "Short indication of gas cost"
+  },
+  "gasFee": {
+    "message": "ค่าแก๊ส"
+  },
+  "gasLimit": {
+    "message": "วงเงินแก็ส"
+  },
+  "gasLimitCalculation": {
+    "message": "เราแนะนำวงเงินแก็สตามความสำเร็จบนเครือข่าย"
+  },
+  "gasLimitRequired": {
+    "message": "ต้องกำหนดวงเงินแก็ส"
+  },
+  "gasLimitTooLow": {
+    "message": "วงเงินแก็สต้องอย่างน้อย 21000"
+  },
+  "generatingSeed": {
+    "message": "กำลังสร้างชีด..."
+  },
+  "gasPrice": {
+    "message": "ราคาแก๊ส (GWEI)"
+  },
+  "gasPriceCalculation": {
+    "message": "เราแนะนำราคาแก็สตามความสำเร็จบนเครือข่าย"
+  },
+  "gasPriceRequired": {
+    "message": "ต้องมีราคาแก๊ส"
+  },
+  "getEther": {
+    "message": "รับอีเธอร์"
+  },
+  "getEtherFromFaucet": {
+    "message": "รับอีเธอร์ที่ปล่อยจาก $1",
+    "description": "Displays network name for Ether faucet"
+  },
+  "greaterThanMin": {
+    "message": "ต้องมากกว่าหรือเท่ากับ $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "here": {
+    "message": "ที่นี่",
+    "description": "as in -click here- for more information (goes with troubleTokenBalances)"
+  },
+  "hereList": {
+    "message": "รายการอยู่ที่นี่!!!!"
+  },
+  "hide": {
+    "message": "ซ่อน"
+  },
+  "hideToken": {
+    "message": "ซ่อนโทเค็น"
+  },
+  "hideTokenPrompt": {
+    "message": "ซ่อนโทเค็นหรือไม่?"
+  },
+  "howToDeposit": {
+    "message": "คุณต้องการฝากอีเธอร์อย่างไร?"
+  },
+  "holdEther": {
+    "message": "ช่วยคุณถืออีเทอร์และโทเค็นและทำหน้าที่เป็นสะพานเชื่อมต่อกับแอพพลิเคชันแบบกระจาย"
+  },
+  "import": {
+    "message": "นำเข้า",
+    "description": "Button to import an account from a selected file"
+  },
+  "importAccount": {
+    "message": "นำเข้าบัญชี"
+  },
+  "importAccountMsg": {
+    "message":"บัญชีที่นำเข้าจะไม่ถูกรวมกับบัญชีที่สร้างด้วยคำเเริ่มต้นบนเมต้ามาร์สในตอนแรก เรียนรู้เพิ่มเติมเกี่ยวกับบัญชีที่นำเข้า"
+  },
+  "importAnAccount": {
+    "message": "นำเข้าบัญชี"
+  },
+  "importDen": {
+    "message": "นำเข้า DEN ที่มีอยู่แล้ว"
+  },
+  "imported": {
+    "message": "นำเข้าเรียบร้อย",
+    "description": "status showing that an account has been fully loaded into the keyring"
+  },
+  "infoHelp": {
+    "message": "ข้อมูลและความช่วยเหลือ"
+  },
+  "insufficientFunds": {
+    "message": "เงินทุนไม่เพียงพอ"
+  },
+  "insufficientTokens": {
+    "message": "โทเค็นไม่เพียงพอ"
+  },
+  "invalidAddress": {
+    "message": "แอดแดรสไม่ถูกต้อง"
+  },
+  "invalidAddressRecipient": {
+    "message": "แอดแดรสผู้รับไม่ถูกต้อง"
+  },
+  "invalidGasParams": {
+    "message": "ตั้งค่าแก๊สไม่ถูกต้อง"
+  },
+  "invalidInput": {
+    "message": "อินพุทไม่ถูกต้อง"
+  },
+  "invalidRequest": {
+    "message": "คำร้องขอไม่ถูกต้อง"
+  },
+  "invalidRPC": {
+    "message": "RPC URI ไม่ถูกต้อง"
+  },
+  "jsonFail": {
+    "message": "เกิดบางอย่างผิดพลาด โปรดตรวจสอบว่าไฟล์ JSON ของคุณมีรูปแบบที่ถูกต้อง."
+  },
+  "jsonFile": {
+    "message": "ไฟล์ JSON",
+    "description": "format for importing an account"
+  },
+  "kovan": {
+    "message": "เครือข่ายทดสอบ Kovan"
+  },
+  "knowledgeDataBase": {
+    "message": "ไปที่คลังความรู้ของเรา"
+  },
+  "lessThanMax": {
+    "message": "ต้องน้อยกว่าหรือเท่ากับ $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "likeToAddTokens": {
+    "message": "คุณต้องการเพิ่มโทเค็นเหล่านี้หรือไม่?"
+  },
+  "limit": {
+    "message": "ข้อจำกัด"
+  },
+  "loading": {
+    "message": "กำลังโหลด..."
+  },
+  "loadingTokens": {
+    "message": "กำลังโหลดโทเค็น..."
+  },
+  "localhost": {
+    "message": "Localhost 8545"
+  },
+  "login": {
+    "message": "เข้าสู่ระบบ"
+  },
+  "logout": {
+    "message": "ออกจากระบบ"
+  },
+  "loose": {
+    "message": "อิสระ"
+  },
+  "loweCaseWords": {
+    "message": "กลุ่มคำชีดมีเพียงตัวพิมพ์เล็กเท่านั้น"
+  },
+  "mainnet": {
+    "message": "เครือข่าย Main Net"
+  },
+  "message": {
+    "message": "ข้อความ"
+  },
+  "metamaskDescription": {
+    "message": "MetaMask คือที่เก็บตัวตนนิรภัยสำหรับอีเธอเรียม"
+  },
+  "min": {
+    "message": "ขั้นต่ำ"
+  },
+  "myAccounts": {
+    "message": "บัญชีของฉัน"
+  },
+  "mustSelectOne": {
+    "message": "ต้องเลือกอย่างน้อย 1 โทเค็น"
+  },
+  "needEtherInWallet": {
+    "message": "คุณจะต้องมีอีเธอร์ในกระเป๋าเงินของคุณในการใช้งานกับแอพพลิเคชันแบบกระจายด้วย MetaMask"
+  },
+  "needImportFile": {
+    "message": "คุณต้องเลือกไฟล์ที่จะนำเข้า",
+    "description": "User is important an account and needs to add a file to continue"
+  },
+  "needImportPassword": {
+    "message": "คุณต้องป้อนรหัสผ่านสำหรับไฟล์ที่เลือก",
+    "description": "Password and file needed to import an account"
+  },
+  "negativeETH": {
+    "message": "ไม่สามารถส่งอีเธอร์เป็นจำนวนติดลบได้"
+  },
+  "networks": {
+    "message": "เครือข่าย"
+  },
+  "newAccount": {
+    "message": "บัญชีใหม่"
+  },
+  "newAccountNumberName": {
+    "message": "บัญชี $1",
+    "description": "Default name of next account to be created on create account screen"
+  },
+  "newContract": {
+    "message": "สร้างสัญญาใหม่"
+  },
+  "newPassword": {
+    "message": "รหัสผ่านใหม่(ขั้นต่ำ 8 ตัวอักษร)"
+  },
+  "newRecipient": {
+    "message": "ผู้รับใหม่"
+  },
+  "newRPC": {
+    "message": "RPC URL ใหม่"
+  },
+  "next": {
+    "message": "ถัดไป"
+  },
+  "noAddressForName": {
+    "message": "ยังไม่มีแอดแดรสไหนตั้งในชื่อนี้"
+  },
+  "noDeposits": {
+    "message": "ไม่มีเงินฝากเข้ามา"
+  },
+  "noTransactionHistory": {
+    "message": "ไม่มีรายการธุรกรรมในอดีต"
+  },
+  "noTransactions": {
+    "message": "ยังไม่มีรายการธุรกรรม"
+  },
+  "notStarted": {
+    "message": "ยังไม่เริ่ม"
+  },
+  "oldUI": {
+    "message": "หน้าตาแบบเก่า"
+  },
+  "oldUIMessage": {
+    "message": "คุณได้เปลี่ยนเป็นหน้าตาแบบเก่าแล้ว คุณสามารถเปลี่ยนเป็นหน้าตาแบบใหม่ได้โดยไปที่ตัวเลือกตรงเมนูมุมขวาบน"
+  },
+  "or": {
+    "message": "หรือ",
+    "description": "choice between creating or importing a new account"
+  },
+  "passwordCorrect": {
+    "message": "โปรดตรวจสอบว่ารหัสผ่านของคุณถูกต้อง"
+  },
+  "passwordMismatch": {
+    "message": "รหัสผ่านไม่ตรงกัน",
+    "description": "in password creation process, the two new password fields did not match"
+  },
+  "passwordShort": {
+    "message": "รหัสผ่านไม่ยาวพอ",
+    "description": "in password creation process, the password is not long enough to be secure"
+  },
+  "pastePrivateKey": {
+    "message": "วางคีย์ส่วนตัวของคุณที่นี่:",
+    "description": "For importing an account from a private key"
+  },
+  "pasteSeed": {
+    "message": "วางคำชีดของคุณที่นี่!"
+  },
+  "personalAddressDetected": {
+    "message": "ตรวจพบแอดแดรสส่วนตัวแล้ว ใส่แอดแดรสสัญญาโทเค็น"
+  },
+  "pleaseReviewTransaction": {
+    "message": "โปรดตรวจสอบธุรกรรมของคุณ"
+  },
+  "privacyMsg": {
+    "message": "นโยบายสความเป็นส่วนตัว"
+  },
+  "privateKey": {
+    "message": "คีย์ส่วนตัว",
+    "description": "select this type of file to use to import an account"
+  },
+  "privateKeyWarning": {
+    "message": "คำเตือน: ห้ามเปิดเผยคีย์นี้ ทุกคนที่มีคีย์ส่วนตัวสามารถขโมยข้อมูลใด ๆ ที่เก็บไว้ในบัญชีของคุณได้"
+  },
+  "privateNetwork": {
+    "message": "เครือข่ายส่วนตัว"
+  },
+  "qrCode": {
+    "message": "แสดง QR Code"
+  },
+  "readdToken": {
+    "message": "คุณสามารถเพิ่มโทเค็นนี้ในอนาคตได้โดยไปที่ “เพิ่มโทเค็น” ในเมนูตัวเลือกบัญชีของคุณ"
+  },
+  "readMore": {
+    "message": "อ่านเพิ่มเติมที่นี่"
+  },
+  "readMore2": {
+    "message": "อ่านเพิ่มเติม"
+  },
+  "receive": {
+    "message": "รับ"
+  },
+  "recipientAddress": {
+    "message": "แอดแดรสผู้รับ"
+  },
+  "refundAddress": {
+    "message": "แอดแดรสสำหรับการคืนเงินของคุณ"
+  },
+  "rejected": {
+    "message": "ถูกปฏิเสธ"
+  },
+  "resetAccount": {
+    "message": "รีเซ็ตบัญชี"
+  },
+  "restoreFromSeed": {
+    "message": "กู้คืนจากกลุ่มคำชีด"
+  },
+  "required": {
+    "message": "จำเป็น"
+  },
+  "retryWithMoreGas": {
+    "message": "ลองใหม่ด้วยราคาแก๊สที่สูงกว่านี้ที่นี่"
+  },
+  "revealSeedWords": {
+    "message": "เปิดเผยกลุ่มคำชีด"
+  },
+  "revealSeedWordsWarning": {
+    "message": "อย่าเปิดเผยคำกลุ่มคำชีดของคุณในที่สาธารณะ! คำเหล่านี้สามารถใช้เพื่อขโมยบัญชีทั้งหมดของคุณ"
+  },
+  "revert": {
+    "message": "ย้อนกลับ"
+  },
+  "rinkeby": {
+    "message": "เครือข่ายทดสอบ Rinkeby"
+  },
+  "ropsten": {
+    "message": "เครือข่ายทดสอบ Ropsten"
+  },
+  "sampleAccountName": {
+    "message": "เช่น บัญชีเฮงเฮงของฉัน",
+    "description": "Help user understand concept of adding a human-readable name to their account"
+  },
+  "save": {
+    "message": "บันทึก"
+  },
+  "saveAsFile": {
+    "message": "บันทึกเป็นไฟล์",
+    "description": "Account export process"
+  },
+  "saveSeedAsFile": {
+    "message": "บันทึกกลุ่มคำชีดเป็นไฟล์"
+  },
+  "search": {
+    "message": "ค้นหา"
+  },
+  "secretPhrase": {
+    "message": "ป้อนกลุ่มคำสิบสองคำเพื่อกู้คืนตู้เซฟของคุณ"
+  },
+  "seedPhraseReq": {
+    "message": "กลุ่มคำชีดมีความยาว 12 คำ"
+  },
+  "select": {
+    "message": "เลือก"
+  },
+  "selectCurrency": {
+    "message": "เลือกสกุลเงิน"
+  },
+  "selectService": {
+    "message": "เลือกบริการ"
+  },
+  "selectType": {
+    "message": "เลือกประเภท"
+  },
+  "send": {
+    "message": "ส่ง"
+  },
+  "sendETH": {
+    "message": "ส่งอีเธอร์"
+  },
+  "sendTokens": {
+    "message": "ส่งโทเค็น"
+  },
+  "sendTokensAnywhere": {
+    "message": "ส่งโทเค็นไปให้ทุกคนที่มีบัญชีอีเธอเรียม"
+  },
+  "settings": {
+    "message": "การตั้งค่า"
+  },
+  "shapeshiftBuy": {
+    "message": "ซื้อด้วย Shapeshift"
+  },
+  "showPrivateKeys": {
+    "message": "แสดงคีย์ส่วนตัว"
+  },
+  "showQRCode": {
+    "message": "แสดง QR Code"
+  },
+  "sign": {
+    "message": "เซ็นชื่อ"
+  },
+  "signMessage": {
+    "message": "เซ็นชื่อในข้อความ"
+  },
+  "signNotice": {
+    "message": "การเซ็นชื่อในข้อความนี้อาจจะเป็นอันตรายได้ \nเซ็นชื่อเฉพาะข้อความจากแหล่งที่คุณไว้วางใจได้จริง ๆ เท่านั้น \nวิธีที่อันตรายนี้จะถูกลบออกในอนาคต"
+  },
+  "sigRequest": {
+    "message": "ขอลายเซ็น"
+  },
+  "sigRequested": {
+    "message": "ขอลายเซ็นแล้ว"
+  },
+  "spaceBetween": {
+    "message": "มีช่องว่างได้เพียงตัวเดียวระหว่างคำเท่านั้น"
+  },
+  "status": {
+    "message": "สถานะ"
+  },
+  "stateLogs": {
+    "message": "บันทึกของสถานะ"
+  },
+  "stateLogsDescription": {
+    "message": "บันทึกของสถานะประกอบด้วยแอดแดรสสาธารณะและธุรกรรมที่ส่ง"
+  },
+  "submit": {
+    "message": "ตกลง"
+  },
+  "supportCenter": {
+    "message": "ไปที่ศูนย์สนับสนุนของเรา"
+  },
+  "symbolBetweenZeroTen": {
+    "message": "สัญลักษณ์ต้องมีความยาวตั้งแต่ 0 ถึง 10 อักขระ"
+  },
+  "takesTooLong": {
+    "message": "ใช้เวลานานเกินไปใช่หรือไม่?"
+  },
+  "terms": {
+    "message": "ข้อตกลงในการใช้งาน"
+  },
+  "testFaucet": {
+    "message": "ตัวแจกจ่ายเพื่อการทดสอบ"
+  },
+  "to": {
+    "message": "ถึง"
+  },
+  "toETHviaShapeShift": {
+    "message": "$1 เป็นอีเธอร์โดย ShapeShift",
+    "description": "system will fill in deposit type in start of message"
+  },
+  "tokenAddress": {
+    "message": "แอดแดรสโทเค็น"
+  },
+  "tokenAlreadyAdded": {
+    "message": "โทเคนได้ถูกเพิ่มไปแล้ว"
+  },
+  "tokenBalance": {
+    "message": "ยอดโทเค็นคงเหลือของคุณคือ:"
+  },
+  "tokenSelection": {
+    "message": "ค้นหาโทเค็นหรือเลือกจากรายการโทเค็นยอดนิยมของเรา"
+  },
+  "tokenSymbol": {
+    "message": "สัญลักษณ์ประจำตัว"
+  },
+  "tokenWarning1": {
+    "message": "ติดตามโทเค็นที่คุณซื้อด้วยบัญชี MetaMask ของคุณ หากคุณซื้อโทเค็นโดยใช้บัญชีอื่นโทเค็นเหล่านั้นจะไม่ปรากฏที่นี่"
+  },
+  "total": {
+    "message": "รวม"
+  },
+  "transactions": {
+    "message": "ธุรกรรม"
+  },
+  "transactionMemo": {
+    "message": "บันทึกช่วยจำของการทำธุรกรรม (ไม่บังคับ)"
+  },
+  "transactionNumber": {
+    "message": "หมายเลขธุรกรรม"
+  },
+  "transfers": {
+    "message": "โอน"
+  },
+  "troubleTokenBalances": {
+    "message": "เรามีปัญหาในการโหลดยอดโทเค็นคงเหลือของคุณ คุณสามารถดูได้ที่นี่",
+    "description": "Followed by a link (here) to view token balances"
+  },
+  "twelveWords": {
+    "message": "กลุ่มคำ 12 คำเหล่านี้เป็นวิธีเดียวที่จะกู้คืนบัญชี MetaMask ของคุณ \n กรุณาเก็บไว้ในที่ปลอดภัยและเก็บเป็นความลับ"
+  },
+  "typePassword": {
+    "message": "พิมพ์รหัสผ่านของคุณ"
+  },
+  "uiWelcome": {
+    "message": "ยินดีต้อนรับสู่หน้าตาใหม่ (เบต้า)"
+  },
+  "uiWelcomeMessage": {
+    "message": "ขณะนี้คุณใช้งาน Metamask หน้าตาใหม่แล้ว ลองใช้ความสามรถใหม่ ๆ เช่นการส่งโทเค็นและหากพบปัญหากรุณาแจ้งให้เราทราบ"
+  },
+  "unavailable": {
+    "message": "ใช้งานไม่ได้"
+  },
+  "unknown": {
+    "message": "ไม่รู้จัก"
+  },
+  "unknownNetwork": {
+    "message": "ไม่รู้จักเครือข่ายส่วนตัว"
+  },
+  "unknownNetworkId": {
+    "message": "ไม่รู้จักหมายเลขเครือข่าย"
+  },
+  "uriErrorMsg": {
+    "message": "URI ต้องมีคำนำหน้าเป็น HTTP หรือ HTTPS"
+  },
+  "usaOnly": {
+    "message": "ในสหรัฐอเมริกาเท่านั้น",
+    "description": "Using this exchange is limited to people inside the USA"
+  },
+  "usedByClients": {
+    "message": "ถูกใช้งานโดยหลายไคลเอนท์"
+  },
+  "useOldUI": {
+    "message": "ใช้หน้าตาเก่า"
+  },
+  "validFileImport": {
+    "message": "คุณต้องเลือกไฟล์ที่ถูกต้องเพื่อนำเข้า"
+  },
+  "vaultCreated": {
+    "message": "สร้างตู้เซฟแล้ว"
+  },
+  "viewAccount": {
+    "message": "ดูบัญชี"
+  },
+  "visitWebSite": {
+    "message": "เยี่ยมชมเว็บไซต์ของเรา"
+  },
+  "warning": {
+    "message": "คำเตือน"
+  },
+  "welcomeBeta": {
+    "message": "ยินดีต้อนรับสู่ MetaMask เบต้า"
+  },
+  "whatsThis": {
+    "message": "นี่คืออะไร?"
+  },
+  "yourSigRequested": {
+    "message": "ลายเซ็นของคุณกำลังได้รับการร้องขอ"
+  },
+  "youSign": {
+    "message": "คุณกำลังเซ็นชื่อ"
+  }
+}
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
new file mode 100644
index 000000000..90f63c6a6
--- /dev/null
+++ b/app/_locales/zh_TW/messages.json
@@ -0,0 +1,864 @@
+{
+  "accept": {
+    "message": "接受"
+  },
+  "account": {
+    "message": "帳戶"
+  },
+  "accountDetails": {
+    "message": "帳戶詳情"
+  },
+  "accountName": {
+    "message": "帳戶名稱"
+  },
+  "address": {
+    "message": "帳戶地址"
+  },
+  "addCustomToken": {
+    "message": "加入自訂代幣"
+  },
+  "addToken": {
+    "message": "加入代幣"
+  },
+  "addTokens": {
+    "message": "加入多筆代幣"
+  },
+  "amount": {
+    "message": "數額"
+  },
+  "amountPlusGas": {
+    "message": "數額 + Gas"
+  },
+  "appDescription": {
+    "message": "乙太坊瀏覽器擴充插件",
+    "description": "The description of the application"
+  },
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "approved": {
+    "message": "已同意"
+  },
+  "attemptingConnect": {
+    "message": "正在嘗試連接區塊鏈。"
+  },
+  "attributions": {
+    "message": "來源"
+  },
+  "available": {
+    "message": "可使用"
+  },
+  "back": {
+    "message": "上一頁"
+  },
+  "balance": {
+    "message": "餘額："
+  },
+  "balances": {
+    "message": "你的餘額："
+  },
+  "balanceIsInsufficientGas": {
+    "message": "當前餘額不足以支付 Gas"
+  },
+  "beta": {
+    "message": "BETA"
+  },
+  "betweenMinAndMax": {
+    "message": "必須大於等於 $1 並且小於等於 $2 。",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "blockiesIdenticon": {
+    "message": "使用 Blockies Identicon"
+  },
+  "borrowDharma": {
+    "message": "透過 Dharma (Beta) 借用"
+  },
+  "builtInCalifornia": {
+    "message": "MetaMask 是在加州設計製造."
+  },
+  "buy": {
+    "message": "購買"
+  },
+  "buyCoinbase": {
+    "message": "在 Coinbase 上購買"
+  },
+  "buyCoinbaseExplainer": {
+    "message": "Coinbase 是世界上最流行的買賣比特幣，以太幣和萊特幣的交易所。"
+  },
+  "ok": {
+    "message": "Ok"
+  },
+  "cancel": {
+    "message": "取消"
+  },
+  "classicInterface": {
+    "message": "使用舊版界面"
+  },
+  "clickCopy": {
+    "message": "點擊複製"
+  },
+  "confirm": {
+    "message": "確認"
+  },
+  "confirmed": {
+    "message": "已確認"
+  },
+  "confirmContract": {
+    "message": "確認合約"
+  },
+  "confirmPassword": {
+    "message": "確認密碼"
+  },
+  "confirmTransaction": {
+    "message": "確認交易"
+  },
+  "continue": {
+    "message": "繼續"
+  },
+  "continueToCoinbase": {
+    "message": "繼續前往 Coinbase"
+  },
+  "contractDeployment": {
+    "message": "合約部署"
+  },
+  "conversionProgress": {
+    "message": "正在取得匯率"
+  },
+  "copiedButton": {
+    "message": "已複製"
+  },
+  "copiedClipboard": {
+    "message": "已複製到剪貼簿"
+  },
+  "copiedExclamation": {
+    "message": "已複製！"
+  },
+  "copiedSafe": {
+    "message": "我已經複製到某個安全的地方了"
+  },
+  "copy": {
+    "message": "複製"
+  },
+  "copyToClipboard": {
+    "message": "複製到剪貼簿"
+  },
+  "copyButton": {
+    "message": " 複製 "
+  },
+  "copyPrivateKey": {
+    "message": "這是你的私鑰（點擊複製）"
+  },
+  "create": {
+    "message": "建立"
+  },
+  "createAccount": {
+    "message": "建立帳戶"
+  },
+  "createDen": {
+    "message": "建立"
+  },
+  "crypto": {
+    "message": "加密",
+    "description": "Exchange type (cryptocurrencies)"
+  },
+  "currentConversion": {
+    "message": "當前匯率"
+  },
+  "currentNetwork": {
+    "message": "當前網路"
+  },
+  "customGas": {
+    "message": "自訂 Gas"
+  },
+  "customize": {
+    "message": "自訂"
+  },
+  "customRPC": {
+    "message": "自訂 RPC"
+  },
+  "decimalsMustZerotoTen": {
+    "message": "小數點後位數至少為0, 最多為36."
+  },
+  "decimal": {
+    "message": "小數點精度"
+  },
+  "defaultNetwork": {
+    "message": "預設Ether交易網路為主網（Main Net）。"
+  },
+  "denExplainer": {
+    "message": "你的 DEN 是在你的 MetaMask 中的加密密碼儲存庫。"
+  },
+  "deposit": {
+    "message": "存入"
+  },
+  "depositBTC": {
+    "message": "將你的 BTC 存入到下面的地址："
+  },
+  "depositCoin": {
+    "message": "將你的 $1 存入到下面的地址",
+    "description": "Tells the user what coin they have selected to deposit with shapeshift"
+  },
+  "depositEth": {
+    "message": "存入 Eth"
+  },
+  "depositEther": {
+    "message": "存入 Ether"
+  },
+  "depositFiat": {
+    "message": "從法定貨幣存入"
+  },
+  "depositFromAccount": {
+    "message": "從其他帳戶存入"
+  },
+  "depositShapeShift": {
+    "message": "從 ShapeShift 存入"
+  },
+  "depositShapeShiftExplainer": {
+    "message": "如果你擁有其他加密貨幣，你可以直接交易並存入 Ether 到你的MetaMask錢包。不需要開帳戶。"
+  },
+  "details": {
+    "message": "詳情"
+  },
+  "directDeposit": {
+    "message": "直接存入"
+  },
+  "directDepositEther": {
+    "message": "直接存入 Ether"
+  },
+  "directDepositEtherExplainer": {
+    "message": "如果你已經擁有了一些Ether，使用直接存入功能是讓你的新錢包最快取得Ether的方式。"
+  },
+  "done": {
+    "message": "完成"
+  },
+  "downloadStatelogs": {
+    "message": "下載狀態紀錄"
+  },
+  "dropped": {
+    "message": "丟棄"
+  },
+  "edit": {
+    "message": "編輯"
+  },
+  "editAccountName": {
+    "message": "編輯帳戶名稱"
+  },
+  "emailUs": {
+    "message": "寄 Email 給我們!"
+  },
+  "encryptNewDen": {
+    "message": "加密你的新 DEN"
+  },
+  "enterPassword": {
+    "message": "請輸入密碼"
+  },
+  "enterPasswordConfirm": {
+    "message": "請再次輸入密碼確認"
+  },
+  "passwordNotLongEnough": {
+    "message": "您所輸入的密碼長度不足"
+  },
+  "passwordsDontMatch": {
+    "message": "您所輸入的密碼不一致"
+  },
+  "etherscanView": {
+    "message": "在 Etherscan 上查看帳戶"
+  },
+  "exchangeRate": {
+    "message": "匯率"
+  },
+  "exportPrivateKey": {
+    "message": "導出私鑰"
+  },
+  "exportPrivateKeyWarning": {
+    "message": "您需要自行負擔導出私鑰產生的風險"
+  },
+  "failed": {
+    "message": "失败"
+  },
+  "fiat": {
+    "message": "FIAT",
+    "description": "Exchange type"
+  },
+  "fileImportFail": {
+    "message": "檔案導入失敗？點擊這裡！",
+    "description": "Helps user import their account from a JSON file"
+  },
+  "from": {
+    "message": "來源地址"
+  },
+  "fromToSame": {
+    "message": "來源和目的地址不能一樣"
+  },
+  "fromShapeShift": {
+    "message": "來自 ShapeShift"
+  },
+  "gas": {
+    "message": "Gas",
+    "description": "Short indication of gas cost"
+  },
+  "gasFee": {
+    "message": "Gas 費用"
+  },
+  "gasLimit": {
+    "message": "Gas 上限"
+  },
+  "gasLimitCalculation": {
+    "message": "我們根據網路成功率算出建議的 Gas 上限。"
+  },
+  "gasLimitRequired": {
+    "message": "必需填寫 Gas 上限"
+  },
+  "gasLimitTooLow": {
+    "message": "Gas 上限至少為 21000"
+  },
+  "gasPrice": {
+    "message": "Gas 價格 (GWEI)"
+  },
+  "gasPriceCalculation": {
+    "message": "我們根據網路成功率算出建議的 Gas 價格"
+  },
+  "gasPriceRequired": {
+    "message": "必需填寫 Gas 價格"
+  },
+  "getEther": {
+    "message": "取得 Ether"
+  },
+  "getEtherFromFaucet": {
+    "message": "從水管取得$1 Ether",
+    "description": "Displays network name for Ether faucet"
+  },
+  "greaterThanMin": {
+    "message": "必須要大於等於 $1。",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "here": {
+    "message": "這裡",
+    "description": "as in -click here- for more information (goes with troubleTokenBalances)"
+  },
+  "hereList": {
+    "message": "Here's a list!!!!"
+  },
+  "hide": {
+    "message": "隱藏"
+  },
+  "hideToken": {
+    "message": "隱藏代幣"
+  },
+  "hideTokenPrompt": {
+    "message": "隱藏代幣？"
+  },
+  "howToDeposit": {
+    "message": "你想怎麼存入 Ether？"
+  },
+  "holdEther": {
+    "message": "Metamask 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑."
+  },
+  "import": {
+    "message": "導入",
+    "description": "Button to import an account from a selected file"
+  },
+  "importAccount": {
+    "message": "導入帳戶"
+  },
+  "importAnAccount": {
+    "message": "導入一個帳戶"
+  },
+  "importDen": {
+    "message": "導入現成的 DEN"
+  },
+  "imported": {
+    "message": "已導入私鑰",
+    "description": "status showing that an account has been fully loaded into the keyring"
+  },
+  "infoHelp": {
+    "message": "說明 & 資訊"
+  },
+  "insufficientFunds": {
+    "message": "資金不足."
+  },
+  "insufficientTokens": {
+    "message": "代幣不足."
+  },
+  "invalidAddress": {
+    "message": "錯誤的地址"
+  },
+  "invalidAddressRecipient": {
+    "message": "接收地址錯誤"
+  },
+  "invalidGasParams": {
+    "message": "Gas 參數錯誤"
+  },
+  "invalidInput": {
+    "message": "輸入錯誤。"
+  },
+  "invalidRequest": {
+    "message": "無效的請求"
+  },
+  "invalidRPC": {
+    "message": "無效的 RPC URI"
+  },
+  "jsonFail": {
+    "message": "有東西出錯了. 請確認你的 JSON 檔案格式正確."
+  },
+  "jsonFile": {
+    "message": "JSON 檔案",
+    "description": "format for importing an account"
+  },
+  "kovan": {
+    "message": "Kovan 測試網路"
+  },
+  "knowledgeDataBase": {
+    "message": "查看我們的知識庫"
+  },
+  "max": {
+    "message": "最大值"
+  },
+  "lessThanMax": {
+    "message": "必須小於等於 $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "likeToAddTokens": {
+    "message": "您確定要加入這些代幣嗎？"
+  },
+  "links": {
+    "message": "連結"
+  },
+  "limit": {
+    "message": "上限"
+  },
+  "loading": {
+    "message": "載入..."
+  },
+  "loadingTokens": {
+    "message": "載入代幣..."
+  },
+  "localhost": {
+    "message": "Localhost 8545"
+  },
+  "logout": {
+    "message": "登出"
+  },
+  "loose": {
+    "message": "非Metamask帳號"
+  },
+  "loweCaseWords": {
+    "message": "助憶詞僅包含小寫字元"
+  },
+  "mainnet": {
+    "message": "主乙太坊網路"
+  },
+  "message": {
+    "message": "訊息"
+  },
+  "metamaskDescription": {
+    "message": "MetaMask 是Ethereum的安全身份識別金庫."
+  },
+  "min": {
+    "message": "最小"
+  },
+  "myAccounts": {
+    "message": "我的帳戶"
+  },
+  "mustSelectOne": {
+    "message": "必須選擇至少 1 代幣."
+  },
+  "needEtherInWallet": {
+    "message": "要使用 MetaMask 存取 DAPP時，您的錢包中需要有 Ether。"
+  },
+  "needImportFile": {
+    "message": "您必須選擇一個檔案來導入。",
+    "description": "User is important an account and needs to add a file to continue"
+  },
+  "needImportPassword": {
+    "message": "您必須為選擇好的檔案輸入密碼。",
+    "description": "Password and file needed to import an account"
+  },
+  "networks": {
+    "message": "網路"
+  },
+  "newAccount": {
+    "message": "新帳戶"
+  },
+  "newAccountNumberName": {
+    "message": "帳戶 $1",
+    "description": "Default name of next account to be created on create account screen"
+  },
+  "newContract": {
+    "message": "新合約"
+  },
+  "newPassword": {
+    "message": "新密碼（至少8個字）"
+  },
+  "newRecipient": {
+    "message": "新收款人"
+  },
+  "newRPC": {
+    "message": "New RPC URL"
+  },
+  "next": {
+    "message": "下一頁"
+  },
+  "noAddressForName": {
+    "message": "此 ENS 尚未指定地址。"
+  },
+  "noDeposits": {
+    "message": "尚未有存款"
+  },
+  "noTransactionHistory": {
+    "message": "尚未有交易紀錄。"
+  },
+  "noTransactions": {
+    "message": "尚未有交易"
+  },
+  "notStarted": {
+    "message": "尚未開始"
+  },
+  "oldUI": {
+    "message": "舊版界面"
+  },
+  "oldUIMessage": {
+    "message": "你已經切換到舊版界面。可以通過右上方下拉選單中的選項切換回新的使用者界面。"
+  },
+  "or": {
+    "message": "或",
+    "description": "choice between creating or importing a new account"
+  },
+  "passwordMismatch": {
+    "message": "密碼不一致",
+    "description": "in password creation process, the two new password fields did not match"
+  },
+  "passwordShort": {
+    "message": "密碼不夠長",
+    "description": "in password creation process, the password is not long enough to be secure"
+  },
+  "pastePrivateKey": {
+    "message": "請貼上你的私鑰串:",
+    "description": "For importing an account from a private key"
+  },
+  "pasteSeed": {
+    "message": "請貼上你的助憶詞！"
+  },
+  "personalAddressDetected": {
+    "message": "已偵測到個人地址. 請輸入代幣合約地址."
+  },
+  "pleaseReviewTransaction": {
+    "message": "請檢查你的交易。"
+  },
+  "privateKey": {
+    "message": "私鑰",
+    "description": "select this type of file to use to import an account"
+  },
+  "privateKeyWarning": {
+    "message": "注意：永遠不要公開這個私鑰。任何取得這把私鑰的人都可以竊取這個帳號中的任何資產。"
+  },
+  "privateNetwork": {
+    "message": "私有網路"
+  },
+  "qrCode": {
+    "message": "顯示 QR Code"
+  },
+  "readdToken": {
+    "message": "之後還可以透過帳戶選單中的“加入代幣”來加入此代幣。"
+  },
+  "readMore": {
+    "message": "了解更多。"
+  },
+  "readMore2": {
+    "message": "了解更多。"
+  },
+  "receive": {
+    "message": "接收"
+  },
+  "recipientAddress": {
+    "message": "接收地址"
+  },
+  "refundAddress": {
+    "message": "你的退款地址"
+  },
+  "rejected": {
+    "message": "拒絕"
+  },
+  "resetAccount": {
+    "message": "重置帳戶"
+  },
+  "restoreFromSeed": {
+    "message": "透過助憶詞重置"
+  },
+  "restoreVault": {
+    "message": "重置金庫"
+  },
+  "required": {
+    "message": "必填"
+  },
+  "retryWithMoreGas": {
+    "message": "改用更高的 Gas 價格重試"
+  },
+  "walletSeed": {
+    "message": "錢包助憶詞"
+  },
+  "revealSeedWords": {
+    "message": "顯示助憶詞"
+  },
+  "revealSeedWordsWarning": {
+    "message": "別在公共場合回復你的助憶詞！這些詞可被用來竊取你的帳戶."
+  },
+  "revert": {
+    "message": "還原"
+  },
+  "rinkeby": {
+    "message": "Rinkeby 測試網路"
+  },
+  "ropsten": {
+    "message": "Ropsten 測試網路"
+  },
+  "currentRpc": {
+    "message": "當前的 RPC"
+  },
+  "connectingToMainnet": {
+    "message": "連線到主 Ethereum 網路"
+  },
+  "connectingToRopsten": {
+    "message": "連線到 Ropsten 測試網路"
+  },
+  "connectingToKovan": {
+    "message": "連線到 Kovan 測試網路"
+  },
+  "connectingToRinkeby": {
+    "message": "連線到 Rinkeby 測試網路"
+  },
+  "connectingToUnknown": {
+    "message": "連線到未知網路"
+  },
+  "sampleAccountName": {
+    "message": "例如：我的新帳戶",
+    "description": "Help user understand concept of adding a human-readable name to their account"
+  },
+  "save": {
+    "message": "儲存"
+  },
+  "saveAsFile": {
+    "message": "儲存檔案",
+    "description": "Account export process"
+  },
+  "saveSeedAsFile": {
+    "message": "將助憶詞儲存成檔案"
+  },
+  "search": {
+    "message": "搜尋"
+  },
+  "secretPhrase": {
+    "message": "在此輸入你的12個祕密助憶詞以回復金庫."
+  },
+  "newPassword8Chars": {
+    "message": "新密碼 (至少 8 個字元)"
+  },
+  "seedPhraseReq": {
+    "message": "助憶詞為 12 個詞語"
+  },
+  "select": {
+    "message": "選擇"
+  },
+  "selectCurrency": {
+    "message": "選擇幣別"
+  },
+  "selectService": {
+    "message": "選擇服務"
+  },
+  "selectType": {
+    "message": "選擇類型"
+  },
+  "send": {
+    "message": "發送"
+  },
+  "sendETH": {
+    "message": "發送 ETH"
+  },
+  "sendTokens": {
+    "message": "發送代幣"
+  },
+  "onlySendToEtherAddress": {
+    "message": "只發送 ETH 到乙太坊地址."
+  },
+  "sendTokensAnywhere": {
+    "message": "發送代幣給擁有乙太坊帳戶的任何人"
+  },
+  "settings": {
+    "message": "設定"
+  },
+  "info": {
+    "message": "資訊"
+  },
+  "shapeshiftBuy": {
+    "message": "從 Shapeshift 購買"
+  },
+  "showPrivateKeys": {
+    "message": "顯示私鑰"
+  },
+  "showQRCode": {
+    "message": "顯示 QR Code"
+  },
+  "sign": {
+    "message": "簽名"
+  },
+  "signMessage": {
+    "message": "簽署訊息"
+  },
+  "signNotice": {
+    "message": "簽署此訊息可能會產生危險的副作用。 \n只從你完全信任的網站上簽名。這種危險的方法;將在未來的版本中被移除。"
+  },
+  "sigRequest": {
+    "message": "請求簽署"
+  },
+  "sigRequested": {
+    "message": "已請求簽署"
+  },
+  "spaceBetween": {
+    "message": "there can only be a space between words"
+  },
+  "status": {
+    "message": "狀態"
+  },
+  "stateLogs": {
+    "message": "狀態紀錄"
+  },
+  "stateLogsDescription": {
+    "message": "狀態紀錄包含你的公開帳戶地址和已傳送的交易資訊."
+  },
+  "stateLogError": {
+    "message": "在取得狀態紀錄時發生錯誤."
+  },
+  "submit": {
+    "message": "送出"
+  },
+  "submitted": {
+    "message": "已送出"
+  },
+  "supportCenter": {
+    "message": "造訪我們的協助中心"
+  },
+  "symbolBetweenZeroTen": {
+    "message": "代號必須介於 0 到 10 字元間."
+  },
+  "takesTooLong": {
+    "message": "花費太長時間？"
+  },
+  "terms": {
+    "message": "使用條款"
+  },
+  "testFaucet": {
+    "message": "測試水管"
+  },
+  "to": {
+    "message": "目的帳號"
+  },
+  "toETHviaShapeShift": {
+    "message": "$1 ETH 透過 ShapeShift",
+    "description": "system will fill in deposit type in start of message"
+  },
+  "tokenAddress": {
+    "message": "代幣地址"
+  },
+  "tokenAlreadyAdded": {
+    "message": "已加入過此代幣。"
+  },
+  "tokenBalance": {
+    "message": "代幣餘額："
+  },
+  "tokenSelection": {
+    "message": "搜尋代幣或是從熱門代幣列表中選擇。"
+  },
+  "tokenSymbol": {
+    "message": "代幣代號"
+  },
+  "tokenWarning1": {
+    "message": "使用 MetaMask 帳戶追蹤你已購得的代幣。如果你使用不同的帳戶保存購得的代幣，那些代幣就不會出現在這裡。"
+  },
+  "total": {
+    "message": "總量"
+  },
+  "transactions": {
+    "message": "交易紀錄"
+  },
+  "transactionMemo": {
+    "message": "交易備註（選填）"
+  },
+  "transactionNumber": {
+    "message": "交易號碼"
+  },
+  "transfers": {
+    "message": "交易"
+  },
+  "troubleTokenBalances": {
+    "message": "無法取得代幣餘額。您k可以到這裡查看 ",
+    "description": "Followed by a link (here) to view token balances"
+  },
+  "twelveWords": {
+    "message": "這 12 個單詞是唯一回復你的 MetaMask 帳號的方法。\n將它們儲存到那些安全且隱密的地方吧。"
+  },
+  "typePassword": {
+    "message": "請輸入密碼"
+  },
+  "uiWelcome": {
+    "message": "歡迎使用新版界面 （Beta）"
+  },
+  "uiWelcomeMessage": {
+    "message": "你現在正在使用新的 Metamask 界面。試試諸如發送代幣等新功能，有任何問題請告知我們。"
+  },
+  "unapproved": {
+    "message": "未同意"
+  },
+  "unavailable": {
+    "message": "不可用"
+  },
+  "unknown": {
+    "message": "未知"
+  },
+  "unknownNetwork": {
+    "message": "未知私有網路"
+  },
+  "unknownNetworkId": {
+    "message": "未知網路 ID"
+  },
+  "uriErrorMsg": {
+    "message": "URIs 需要加入適當的 HTTP/HTTPS 前綴."
+  },
+  "usaOnly": {
+    "message": "僅限美國",
+    "description": "Using this exchange is limited to people inside the USA"
+  },
+  "usedByClients": {
+    "message": "可用於各種不同的客戶端"
+  },
+  "useOldUI": {
+    "message": "使用舊版界面"
+  },
+  "validFileImport": {
+    "message": "您必須選擇一個合法的檔案來導入."
+  },
+  "vaultCreated": {
+    "message": "已建立金庫"
+  },
+  "viewAccount": {
+    "message": "查看帳戶"
+  },
+  "visitWebSite": {
+    "message": "造訪我們的網站"
+  },
+  "warning": {
+    "message": "警告"
+  },
+  "welcomeBeta": {
+    "message": "歡迎到 MetaMask Beta"
+  },
+  "whatsThis": {
+    "message": "這是什麼？"
+  },
+  "yourSigRequested": {
+    "message": "正在請求你的簽署"
+  },
+  "youSign": {
+    "message": "正在簽署"
+  }
+}
diff --git a/app/manifest.json b/app/manifest.json
index 0aac1c8df..a20f9b976 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
diff --git a/app/scripts/background.js b/app/scripts/background.js
index c8fe1cd63..98de1d278 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -85,7 +85,6 @@ async function loadStateFromPersistence () {
 
   // write to disk
   if (localStore.isSupported) localStore.set(versionedData)
-  diskStore.putState(versionedData)
 
   // return just the data
   return versionedData.data
@@ -123,7 +122,6 @@ function setupController (initState, initLangCode) {
     debounce(1000),
     storeTransform(versionifyData),
     storeTransform(syncDataWithExtension),
-    asStream(diskStore),
     (error) => {
       log.error('pump hit error', error)
     }
diff --git a/app/scripts/migrations/022.js b/app/scripts/migrations/022.js
new file mode 100644
index 000000000..c3c0d53ef
--- /dev/null
+++ b/app/scripts/migrations/022.js
@@ -0,0 +1,39 @@
+
+const version = 22
+
+/*
+
+This migration adds submittedTime to the txMeta if it is not their
+
+*/
+
+const clone = require('clone')
+
+module.exports = {
+  version,
+
+  migrate: function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    try {
+      const state = versionedData.data
+      const newState = transformState(state)
+      versionedData.data = newState
+    } catch (err) {
+      console.warn(`MetaMask Migration #${version}` + err.stack)
+    }
+    return Promise.resolve(versionedData)
+  },
+}
+
+function transformState (state) {
+  const newState = state
+  const transactions = newState.TransactionController.transactions
+
+  newState.TransactionController.transactions = transactions.map((txMeta) => {
+    if (txMeta.status !== 'submitted' || txMeta.submittedTime) return txMeta
+    txMeta.submittedTime = (new Date()).getTime()
+    return txMeta
+  })
+  return newState
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index a0cf5f4d4..b49a40c65 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -32,4 +32,5 @@ module.exports = [
   require('./019'),
   require('./020'),
   require('./021'),
+  require('./022'),
 ]