Merge branch 'stable9' into sync-stable9

7 files changed, 10 insertions, 10 deletions

diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 78f4390e70a..84dbb94998e 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -132,11 +132,11 @@ class CheckCode extends Command {
 			});
 
 			$infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) {
-				$output->writeln("<comment>ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)</comment>");
+				$output->writeln("<comment>Nextcloud $minMax version requirement missing (will be an error in the future)</comment>");
 			});
 
 			$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
-				$output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>");
+				$output->writeln("<error>Duplicate $minMax Nextcloud version requirement found</error>");
 			});
 
 			$infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 864499dcce0..bbefbe17585 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -60,7 +60,7 @@ class ConvertType extends Command {
 	protected function configure() {
 		$this
 			->setName('db:convert-type')
-			->setDescription('Convert the ownCloud database to the newly configured one')
+			->setDescription('Convert the database to the newly configured one')
 			->addArgument(
 				'type',
 				InputArgument::REQUIRED,
diff --git a/core/command/encryption/changekeystorageroot.php b/core/command/encryption/changekeystorageroot.php
index 801a08b42a8..3213665fc81 100644
--- a/core/command/encryption/changekeystorageroot.php
+++ b/core/command/encryption/changekeystorageroot.php
@@ -142,7 +142,7 @@ class ChangeKeyStorageRoot extends Command {
 
 		$result = $this->rootView->file_put_contents(
 			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
-			'ownCloud will detect this folder as key storage root only if this file exists'
+			'Nextcloud will detect this folder as key storage root only if this file exists'
 		);
 
 		if ($result === false) {
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index 83c6c1dc168..913bc29368d 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -130,7 +130,7 @@ class DecryptAll extends Command {
 
 			$uid = $input->getArgument('user');
 			if ($uid === '') {
-				$message = 'your ownCloud';
+				$message = 'your Nextcloud';
 			} else {
 				$message = "$uid's account";
 			}
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 02f74a9dea4..1336f3c2b9f 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -108,7 +108,7 @@ class EncryptAll extends Command {
 		}
 
 		$output->writeln("\n");
-		$output->writeln('You are about to start to encrypt all files stored in your ownCloud.');
+		$output->writeln('You are about to start to encrypt all files stored in your Nextcloud.');
 		$output->writeln('It will depend on the encryption module you use which files get encrypted.');
 		$output->writeln('Depending on the number and size of your files this can take some time');
 		$output->writeln('Please make sure that no user access his files during this process!');
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index 12a61d6341a..266b50a3fea 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -46,7 +46,7 @@ class Install extends Command {
 	protected function configure() {
 		$this
 			->setName('maintenance:install')
-			->setDescription('install ownCloud')
+			->setDescription('install Nextcloud')
 			->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
 			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
 			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index a60eee9e327..562839e80b9 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -253,8 +253,8 @@ class Upgrade extends Base {
 
 			return self::ERROR_SUCCESS;
 		} else if($this->config->getSystemValue('maintenance', false)) {
-			//Possible scenario: ownCloud core is updated but an app failed
-			$output->writeln('<warning>ownCloud is in maintenance mode</warning>');
+			//Possible scenario: Nextcloud server is updated but an app failed
+			$output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
 			$output->write('<comment>Maybe an upgrade is already in process. Please check the '
 				. 'logfile (data/owncloud.log). If you want to re-run the '
 				. 'upgrade procedure, remove the "maintenance mode" from '
@@ -262,7 +262,7 @@ class Upgrade extends Base {
 				, true);
 			return self::ERROR_MAINTENANCE_MODE;
 		} else {
-			$output->writeln('<info>ownCloud is already latest version</info>');
+			$output->writeln('<info>Nextcloud is already latest version</info>');
 			return self::ERROR_UP_TO_DATE;
 		}
 	}