Merge remote-tracking branch 'origin/master' into check-updates

parity/account.rs

@@ -102,7 +102,7 @@ fn import(i: ImportAccounts) -> Result<String, String> {
 		let from = DiskDirectory::at(path);
 		imported += try!(import_accounts(&from, &to).map_err(|_| "Importing accounts failed.")).len();
 	}
-	Ok(format!("{}", imported))
+	Ok(format!("{} account(s) imported", imported))
 }
 
 fn import_geth(i: ImportFromGethAccounts) -> Result<String, String> {

parity/cli/usage.txt

@@ -40,7 +40,7 @@ Operating Options:
                            (default: {flag_mode_alarm}).
   --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                            JSON chain specification file or olympic, frontier,
-                           homestead, mainnet, morden, classic, expanse,
+                           homestead, mainnet, morden, ropsten, classic, expanse,
                            testnet or dev (default: {flag_chain}).
   -d --db-path PATH        Specify the database & configuration directory path
                            (default: {flag_db_path}).

parity/configuration.rs

@@ -313,7 +313,7 @@ impl Configuration {
 
 	fn chain(&self) -> String {
 		if self.args.flag_testnet {
-			"morden".to_owned()
+			"ropsten".to_owned()
 		} else {
 			self.args.flag_chain.clone()
 		}
@@ -905,7 +905,7 @@ mod tests {
 		// then
 		assert_eq!(conf.network_settings(), NetworkSettings {
 			name: "testname".to_owned(),
-			chain: "morden".to_owned(),
+			chain: "ropsten".to_owned(),
 			network_port: 30303,
 			rpc_enabled: true,
 			rpc_interface: "local".to_owned(),