conflict in en.json

lib/i18n/locales/en.json

@@ -137,6 +137,7 @@
 	"error uploading to swarm": "error uploading to swarm",
 	"Starting ipfs process": "Starting ipfs process",
 	"Storage process for ipfs ended before the end of this process. Code: 0": "Storage process for ipfs ended before the end of this process. Code: 0",
+	"successfully uploaded to swarm": "successfully uploaded to swarm",
 	"WARNING! DApp path length is too long: ": "WARNING! DApp path length is too long: ",
 	"This is known to cause issues with starting geth, please consider reducing your DApp path's length to 66 characters or less.": "This is known to cause issues with starting geth, please consider reducing your DApp path's length to 66 characters or less.",
 	"Installing packages...": "Installing packages...",

lib/processes/storageProcesses/storageProcessesLauncher.js

@@ -30,7 +30,7 @@ class StorageProcessesLauncher {
         modulePath: filePath,
         logger: self.logger,
         events: self.events,
-        silent: false,
+        silent: true,
         exitCallback: self.processExited.bind(this, storageName)
       });
       self.processes[storageName].send({action: constants.blockchain.init, options: {storageConfig: self.storageConfig}});

lib/processes/storageProcesses/swarm.js

@@ -11,7 +11,7 @@ class SwarmProcess extends ProcessWrapper {
   }
 
   startSwarmDaemon() {
-    console.log(this.storageConfig);
+    const self = this;
     if (!this.storageConfig.account || !this.storageConfig.account.address || !this.storageConfig.account.password) {
       return 'Account address and password are needed in the storage config to start the Swarm process';
     }
@@ -26,7 +26,7 @@ class SwarmProcess extends ProcessWrapper {
       process.exit();
     });
     let lastMessage;
-    child.stdout.on('data', (data) => {
+    child.stderr.on('data', (data) => {
       if (!self.readyCalled && data.indexOf('Swarm http proxy started') > -1) {
         self.readyCalled = true;
         self.send({result: constants.storage.initiated});