status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in en.json

This commit is contained in:
Jonathan Rainville 2018-06-01 13:35:52 -04:00
parent d647ea791e
commit 491ff47cf8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/i18n/locales/en.json
View File

@ -152,6 +152,9 @@
"Starting ipfs process": "Starting ipfs process",
"ipfs process started": "ipfs process started",
"Starting swarm process": "Starting swarm process",
"unknown command": "unknown command",
"Simulator not found; Please install it with \"%s\"": "Simulator not found; Please install it with \"%s\"",
"IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\"": "IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\"",
"swarm process started": "swarm process started",
"Storage process for swarm ended before the end of this process. Code: 12": "Storage process for swarm ended before the end of this process. Code: 12",
"Storage process for swarm ended before the end of this process. Code: 1": "Storage process for swarm ended before the end of this process. Code: 1",