diff --git a/lib/i18n/locales/es.json b/lib/i18n/locales/es.json
index 988c3a2e..dd0143d8 100644
--- a/lib/i18n/locales/es.json
+++ b/lib/i18n/locales/es.json
@@ -1,103 +1,188 @@
 {
-	"new_application": "new_application",
-	"Contract Name": "Contract Name",
-	"New Application": "New Application",
-	"create a barebones project meant only for contract development": "create a barebones project meant only for contract development",
-	"create a working dapp with a SimpleStorage contract": "create a working dapp with a SimpleStorage contract",
-	"filename to output logs (default: none)": "filename to output logs (default: none)",
-	"level of logging to display": "level of logging to display",
-	"deploy and build dapp at ": "deploy and build dapp at ",
-	"port to run the dev webserver (default: %s)": "port to run the dev webserver (default: %s)",
-	"host to run the dev webserver (default: %s)": "host to run the dev webserver (default: %s)",
-	"disable the development webserver": "disable the development webserver",
-	"simple mode, disables the dashboard": "simple mode, disables the dashboard",
-	"no colors in case it's needed for compatbility purposes": "no colors in case it's needed for compatbility purposes",
-	"filename to output logs (default: %s)": "filename to output logs (default: %s)",
-	"run dapp (default: %s)": "run dapp (default: %s)",
-	"Use a specific ethereum client or simulator (supported: %s)": "Use a specific ethereum client or simulator (supported: %s)",
-	"run blockchain server (default: %s)": "run blockchain server (default: %s)",
-	"run a fast ethereum rpc simulator": "run a fast ethereum rpc simulator",
-	"use testrpc as the rpc simulator [%s]": "use testrpc as the rpc simulator [%s]",
-	"port to run the rpc simulator (default: %s)": "port to run the rpc simulator (default: %s)",
-	"host to run the rpc simulator (default: %s)": "host to run the rpc simulator (default: %s)",
-	"number of accounts (default: %s)": "number of accounts (default: %s)",
-	"Amount of ether to assign each test account (default: %s)": "Amount of ether to assign each test account (default: %s)",
-	"custom gas limit (default: %s)": "custom gas limit (default: %s)",
-	"run tests": "run tests",
-	"resets embarks state on this dapp including clearing cache": "resets embarks state on this dapp including clearing cache",
-	"generates documentation based on the smart contracts configured": "generates documentation based on the smart contracts configured",
-	"Upload your dapp to a decentralized storage": "Upload your dapp to a decentralized storage",
-	"output the version number": "output the version number",
+	"New Application": "Nova Aplicacao",
+	"Contract Name": "Contracto",
+	"Address": "Endereço",
+	"Status": "Estado",
+  "Embark Blockchain Using: %s": "Embark Blockchain esta usando o commando: %s",
+	"running: %s": "executando: %s",
+	"already initialized": "ja esta inicializado",
+	"create a barebones project meant only for contract development": "criar um projeto vazio destinado apenas ao desenvolvimento de contratos",
+	"loading solc compiler": "carregando o compilador solc",
+	"Welcome to Embark": "Bem-vindo ao Embark",
+	"possible commands are:": "comandos possíveis são:",
+	"display versions in use for libraries and tools like web3 and solc": "lista versões em uso para bibliotecas e ferramentas como web3 e solc",
+	"instantiated web3.js object configured to the current environment": "objeto web3.js instanciado configurado para o ambiente atual",
+	"to immediatly exit (alias: exit)": "para sair imediatamente (alias: exit)",
+	"The web3 object and the interfaces for the deployed contracts and their methods are also available": "O objeto web3 e as interfaces para os contratos implantados e seus métodos também estão disponíveis",
+	"create a working dapp with a SimpleStorage contract": "Cria uma dapp funcional com o contrato SimpleStorage",
+	"filename to output logs (default: none)": "ficheiro/arquivo para saída dos logs (predefinido: none)",
+	"level of logging to display": "nivel do log",
+	"deploy and build dapp at ": "Publica os contractos e constroi a applicacao em ",
+	"port to run the dev webserver (default: %s)": "porta para correr o servidor web para desenvolvimento (default: %s)",
+	"host to run the dev webserver (default: %s)": "host para correr o servidor web para desenvolvimento (default: %s)",
+	"disable the development webserver": "disativa o servidor web para desenvolvimento",
+	"simple mode, disables the dashboard": "modo simples, disativa o dashboard",
+	"no colors in case it's needed for compatbility purposes": "sem cores, em caso seja necessario para compabitilidade com a terminal",
+	"filename to output logs (default: %s)": "ficheiro/arquivo para os logs (predefinido: %s)",
+	"run dapp (default: %s)": "executa a dapp (applicacao decentralizada) (predefinido: %s)",
+	"Use a specific ethereum client or simulator (supported: %s)": "Usa um cliente ou simulador de ethereum específico (supportado: %s)",
+	"run blockchain server (default: %s)": "executa un node de blockchain (predefinido: %s)",
+	"run a fast ethereum rpc simulator": "executa um simulador RPC de ethereum",
+	"use testrpc as the rpc simulator [%s]": "usa testrpc como simulator de rpc [%s]",
+	"port to run the rpc simulator (default: %s)": "porta para executar simulador de rpc (predefinido: %s)",
+	"host to run the rpc simulator (default: %s)": "host para executar servidor de rpc (predefinido: %s)",
+	"number of accounts (default: %s)": "numero de contas (predefinido: %s)",
+	"Amount of ether to assign each test account (default: %s)": "Quantidade de éter para atribuir cada conta de teste (predefinido: %s)",
+	"custom gas limit (default: %s)": "limite de gás (predefinido: %s)",
+	"run tests": "executar os testes",
+	"resets embarks state on this dapp including clearing cache": "recomenca o estado do Embark nesta appliacao, incluindo a cache",
+	"generates documentation based on the smart contracts configured": "gera documentação baseada nos contratos configurados",
+	"Upload your dapp to a decentralized storage": "Carrega a appliacao para armazenamento descentralizado",
+	"output the version number": "produz a versão actual",
 	"Logs": "Logs",
-	"Environment": "Environment",
-	"Status": "Status",
-	"Available Services": "Available Services",
-	"Contracts": "Contracts",
-	"Console": "Console",
-	"Welcome to Embark": "Welcome to Embark",
-	"dashboard start": "dashboard start",
-	"loaded plugins": "loaded plugins",
-	"loading solc compiler": "loading solc compiler",
-	"compiling solidity contracts": "compiling solidity contracts",
-	"%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.": "%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.",
-	"assuming %s to be an interface": "assuming %s to be an interface",
-	"{{className}}: couldn't find instanceOf contract {{parentContractName}}": "{{className}}: couldn't find instanceOf contract {{parentContractName}}",
-	"did you mean \"%s\"?": "did you mean \"%s\"?",
-	"%s has no code associated": "%s has no code associated",
-	"deploying contracts": "deploying contracts",
-	" already deployed at ": " already deployed at ",
-	"Pending": "Pending",
-	"Interface or set to not deploy": "Interface or set to not deploy",
-	"Deployed": "Deployed",
-	"Address": "Address",
-	"running beforeDeploy plugin %s .": "running beforeDeploy plugin %s .",
-	"deploying": "deploying",
-	"with": "with",
+	"Environment": "Ambiente",
+	"Available Services": "Serviços Disponíveis",
+	"Contracts": "Contratos",
+	"Console": "Consola",
+	"dashboard start": "inicia o painel de controle",
+	"loaded plugins": "plugins carregados",
+	"compiling solidity contracts": "Compilando contratos Solidity",
+	"%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.": "%s não tem um compilador de contrato compatível. Talvez exista um plugin para isso.",
+	"assuming %s to be an interface": "assumindo que %s é uma interface",
+	"{{className}}: couldn't find instanceOf contract {{parentContractName}}": "{{className}}: não foi possível encontrar instancia de (instanceOf) do contrato {{parentContractName}}",
+	"did you mean \"%s\"?": "você quis dizer \"%s\"?",
+	"%s has no code associated": "%s não tem código associado",
+	"deploying contracts": "publicando contratos",
+	"running beforeDeploy plugin %s .": "executando plugin beforeDeploy %s .",
+	"deploying": "publicando",
+	"with": "com",
 	"gas": "gas",
-	"error deploying": "error deploying",
-	"due to error": "due to error",
-	"error deploying contracts": "error deploying contracts",
-	"finished deploying contracts": "finished deploying contracts",
-	"error running afterDeploy: ": "error running afterDeploy: ",
-	"ready to watch file changes": "ready to watch file changes",
-	"Starting Server": "Starting Server",
-	"webserver available at": "webserver available at",
-	"Webserver": "Webserver",
-	"versions": "versions",
-	"possible commands are:": "possible commands are:",
-	"display versions in use for libraries and tools like web3 and solc": "display versions in use for libraries and tools like web3 and solc",
-	"instantiated web3.js object configured to the current environment": "instantiated web3.js object configured to the current environment",
-	"to immediatly exit (alias: exit)": "to immediatly exit (alias: exit)",
-	"The web3 object and the interfaces for the deployed contracts and their methods are also available": "The web3 object and the interfaces for the deployed contracts and their methods are also available",
-	"versions in use": "versions in use",
-	"language to use (default: en)": "language to use (default: en)",
-	"executing": "executing",
-	"writing file": "writing file",
-	"errors found while generating": "errors found while generating",
-	"Looking for documentation? You can find it at": "Looking for documentation? You can find it at",
-	"Ready": "Ready",
-	"Graph will not include undeployed contracts": "Graph will not include undeployed contracts",
-	"Graph will not include functions": "Graph will not include functions",
-	"Graph will not include events": "Graph will not include events",
-	"Embark Blockchain Using: %s": "Embark Blockchain Using: %s",
-	"running: %s": "running: %s",
-	"Initializing Embark Template....": "Initializing Embark Template....",
-	"Init complete": "Init complete",
-	"App ready at ": "App ready at ",
-	"already initialized": "already initialized",
-	"deployed at": "deployed at",
-	"executing onDeploy commands": "executing onDeploy commands",
-	"executing: ": "executing: ",
-	"no config file found at %s using default config": "no config file found at %s using default config",
-	"Development blockchain has changed to use the --dev option.": "Development blockchain has changed to use the --dev option.",
-	"You can reset your workspace to fix the problem with": "You can reset your workspace to fix the problem with",
-	"Otherwise, you can change your data directory in blockchain.json (datadir)": "Otherwise, you can change your data directory in blockchain.json (datadir)",
-	"tip: you can resize the terminal or disable the dashboard with": "tip: you can resize the terminal or disable the dashboard with",
-	"help": "help",
-	"quit": "quit",
-	"Error Compiling/Building contracts: ": "Error Compiling/Building contracts: ",
-	"{{className}} has code associated to it but it's configured as an instanceOf {{parentContractName}}": "{{className}} has code associated to it but it's configured as an instanceOf {{parentContractName}}",
-	"downloading {{packageName}} {{version}}....": "downloading {{packageName}} {{version}}....",
-	"Swarm node is offline...": "Swarm node is offline...",
-	"Swarm node detected...": "Swarm node detected..."
-}
\ No newline at end of file
+	"Pending": "Pendente",
+	"Interface or set to not deploy": "Interface ou configurado para não ser publicado",
+	"error deploying": "erro de publicação",
+	"due to error": "devido a erro",
+	"error deploying contracts": "erro publicando contratos",
+	"finished deploying contracts": "publicação de contratos concluida",
+	"error running afterDeploy: ": "erro executado afterDeploy: ",
+	"ready to watch file changes": "pronto para monitorar alterações em ficheiros/arquivos",
+	"Starting Server": "iniciando o servidor",
+	"webserver available at": "servidor web disponivel em",
+	"Webserver": "Servidor Web",
+	" already deployed at ": " já publicado em ",
+	"Deployed": "Publicado",
+  "Name must be only letters, spaces, or dashes": "O nome deve ser apenas letras, espaços ou traços",
+  "Name your app (default is %s)": "Nome da aplicacao (predefinido is %s)",
+  "Invalid name": "Nome inválido",
+  "unknown command": "comando desconhecido",
+  "did you mean": "você quis dizer",
+  "warning: running default config on a non-development environment": "aviso: executando a configuração padrão em um ambiente de não desenvolvimento",
+  "could not find {{geth_bin}} command; is {{client_name}} installed or in the PATH?": "não foi possível encontrar o comando {{geth_bin}}; o {{client_name}} instalado ou no PATH?",
+  "no accounts found": "nenhuma conta encontrada",
+  "initializing genesis block": "inicializando o bloco de gênese",
+  "rpcCorsDomain set to *": "rpcCorsDomain definido como *",
+  "make sure you know what you are doing": "certifique-se de saber o que está fazendo",
+  "warning: cors is not set": "aviso: cors não está definido",
+  "wsOrigins set to *": "wsOrigins definido como *",
+  "warning: wsOrigins is not set": "aviso: wsOrigins não está definido",
+  "reset done!": "reset feito!",
+  "%s is not installed on your machine": "%s não está instalado na sua máquina",
+  "You can install it by running: %s": "Você pode instalá-lo executando: %s",
+  "Initializing Embark Template....": "Inicializando Embark Template....",
+  "Installing packages...": "Instalando pacotes...",
+  "Init complete": "Init complete",
+  "App ready at ": "App ready at ",
+  "Next steps:": "Next steps:",
+  "open another console in the same directory and run": "open another console in the same directory and run",
+  "For more info go to http://embark.status.im": "For more info go to http://embark.status.im",
+  "%s : instanceOf is set to itself": "%s : instanceOf is set to itself",
+  "{{className}} has code associated to it but it's configured as an instanceOf {{parentContractName}}": "{{className}} has code associated to it but it's configured as an instanceOf {{parentContractName}}",
+  "Error Compiling/Building contracts: ": "Error Compiling/Building contracts: ",
+  "Error: ": "Error: ",
+  "there are two or more contracts that depend on each other in a cyclic manner": "there are two or more contracts that depend on each other in a cyclic manner",
+  "Embark couldn't determine which one to deploy first": "Embark couldn't determine which one to deploy first",
+  "{{inputName}} has not been defined for {{className}} constructor": "{{inputName}} has not been defined for {{className}} constructor",
+  "error deploying %s": "error deploying %s",
+  "executing onDeploy commands": "executing onDeploy commands",
+  "error executing onDeploy for ": "error executing onDeploy for ",
+  " does not exist": " does not exist",
+  "error running onDeploy: ": "error running onDeploy: ",
+  " exists but has been set to not deploy": " exists but has been set to not deploy",
+  "couldn't find a valid address for %s has it been deployed?": "couldn't find a valid address for %s has it been deployed?",
+  "executing: ": "executing: ",
+  "the transaction was rejected; this usually happens due to a throw or a require": "the transaction was rejected; this usually happens due to a throw or a require",
+  "no account found at index": "no account found at index",
+  " check the config": " check the config",
+  "Both \"from\" and \"fromIndex\" are defined for contract": "Both \"from\" and \"fromIndex\" are defined for contract",
+  "Using \"from\" as deployer account.": "Using \"from\" as deployer account.",
+  "{{linkReference}} is too long": "{{linkReference}} is too long",
+  "{{contractName}} needs {{libraryName}} but an address was not found, did you deploy it or configured an address?": "{{contractName}} needs {{libraryName}} but an address was not found, did you deploy it or configured an address?",
+  "attempted to deploy %s without specifying parameters": "attempted to deploy %s without specifying parameters",
+  "deployed at": "deployed at",
+  "no contracts found": "no contracts found",
+  "Blockchain component is disabled in the config": "Blockchain component is disabled in the config",
+  "Couldn't connect to an Ethereum node are you sure it's on?": "Couldn't connect to an Ethereum node are you sure it's on?",
+  "make sure you have an Ethereum node or simulator running. e.g '%s'": "make sure you have an Ethereum node or simulator running. e.g '%s'",
+  "executing": "executing",
+  "the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation": "the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation",
+  "Cannot find file %s Please ensure you are running this command inside the Dapp folder": "Cannot find file %s Please ensure you are running this command inside the Dapp folder",
+  "no config file found at %s using default config": "no config file found at %s using default config",
+  "HTTP contract file not found": "HTTP contract file not found",
+  "contract file not found": "contract file not found",
+  "file not found, creating it...": "file not found, creating it...",
+  "No Blockchain node found": "No Blockchain node found",
+  "Ethereum node (version unknown)": "Ethereum node (version unknown)",
+  "this event is deprecated and will be removed in future versions %s": "this event is deprecated and will be removed in future versions %s",
+  "Error while downloading the file": "Error while downloading the file",
+  "Plugin {{name}} can only be loaded in the context of \"{{contextes}}\"": "Plugin {{name}} can only be loaded in the context of \"{{contextes}}\"",
+  "error running service check": "error running service check",
+  "help": "ajuda",
+  "quit": "sair",
+  "Type": "Type",
+  "to see the list of available commands": "to see the list of available commands",
+  "Asset Pipeline": "Asset Pipeline",
+  "Ethereum node detected": "Ethereum node detected",
+  "Deployment Done": "Deployment Done",
+  "Looking for documentation? You can find it at": "A procura de Documentacao? pode encontra-la em",
+  "Ready": "Ready",
+  "tip: you can resize the terminal or disable the dashboard with": "tip: you can resize the terminal or disable the dashboard with",
+  "finished building": "finished building",
+  "Done": "Done",
+  "Cannot upload: {{platform}} node is not running on {{url}}.": "Cannot upload: {{platform}} node is not running on {{url}}.",
+  "try \"{{ipfs}}\" or \"{{swarm}}\"": "try \"{{ipfs}}\" or \"{{swarm}}\"",
+  "finished deploying": "finished deploying",
+  "finished building DApp and deploying to": "finished building DApp and deploying to",
+  "IPFS node detected": "IPFS node detected",
+  "IPFS node is offline": "IPFS node is offline",
+  "not found or not in the path. Guessing %s for path": "not found or not in the path. Guessing %s for path",
+  "adding %s to ipfs": "adding %s to ipfs",
+  "DApp available at": "DApp available at",
+  "error uploading to ipfs": "error uploading to ipfs",
+  "successfully uploaded to ipfs": "successfully uploaded to ipfs",
+  "Error while loading the content of ": "Error while loading the content of ",
+  "error compiling for unknown reasons": "error compiling for unknown reasons",
+  "error compiling. There are sources available but no code could be compiled, likely due to fatal errors in the solidity code": "error compiling. There are sources available but no code could be compiled, likely due to fatal errors in the solidity code",
+  "Swarm node detected...": "Swarm node detected...",
+  "Swarm node is offline...": "Swarm node is offline...",
+  "deploying to swarm!": "deploying to swarm!",
+  "adding %s to swarm": "adding %s to swarm",
+  "error uploading to swarm": "error uploading to swarm",
+  "successfully uploaded to swarm": "successfully uploaded to swarm",
+  "Vyper exited with error code ": "Vyper exited with error code ",
+  "Execution returned no result": "Execution returned no result",
+  "compiling Vyper contracts": "compiling Vyper contracts",
+  "Webserver is offline": "Webserver is offline",
+  "stopping webserver": "stopping webserver",
+  "a webserver is already running at": "a webserver is already running at",
+  "no webserver is currently running": "no webserver is currently running",
+  "couldn't find file": "couldn't find file",
+  "errors found while generating": "errors found while generating",
+  "writing file": "escrevendo ficheiro",
+  "Simulator not found; Please install it with \"%s\"": "Simulator not found; Please install it with \"%s\"",
+  "Tried to load testrpc but an error occurred. This is a problem with testrpc": "Tried to load testrpc but an error occurred. This is a problem with testrpc",
+  "IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\". Alternatively install node 6.9.1 and the testrpc 3.0": "IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\". Alternatively install node 6.9.1 and the testrpc 3.0",
+  "terminating due to error": "terminating due to error",
+  "There a a space in the version of {{versionKey}}. We corrected it for you ({{correction})": "There a a space in the version of {{versionKey}}. We corrected it for you ({{correction})",
+  "versions": "versions",
+  "versions in use": "versions in use",
+  "downloading {{packageName}} {{version}}....": "downloading {{packageName}} {{version}}...."
+}