fix more strings

4 files changed, 8 insertions, 12 deletions

diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
index db9130badcd..e97cf2a4013 100644
--- a/lib/private/App/DependencyAnalyzer.php
+++ b/lib/private/App/DependencyAnalyzer.php
@@ -303,12 +303,12 @@ class DependencyAnalyzer {
 
 		if (!is_null($minVersion)) {
 			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('ownCloud %s or higher is required.', $minVersion);
+				$missing[] = (string)$this->l->t('Server version %s or higher is required.', $minVersion);
 			}
 		}
 		if (!is_null($maxVersion)) {
 			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('ownCloud %s or lower is required.', $maxVersion);
+				$missing[] = (string)$this->l->t('Server version %s or lower is required.', $maxVersion);
 			}
 		}
 		return $missing;
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index e8872c6662f..cd23f95b857 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -392,7 +392,7 @@ class Installer {
 		// check if the app is compatible with this version of ownCloud
 		if(!OC_App::isAppCompatible(\OCP\Util::getVersion(), $info)) {
 			OC_Helper::rmdirr($extractDir);
-			throw new \Exception($l->t("App can't be installed because it is not compatible with this version of ownCloud"));
+			throw new \Exception($l->t("App can't be installed because it is not compatible with this version of the server"));
 		}
 
 		// check if shipped tag is set which is only allowed for apps that are shipped with ownCloud
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index d4bf4f50c0e..87553cca805 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -1139,7 +1139,7 @@ class OC_App {
 			$version = \OCP\Util::getVersion();
 			if (!self::isAppCompatible($version, $info)) {
 				throw new \Exception(
-					$l->t('App "%s" cannot be installed because it is not compatible with this version of ownCloud.',
+					$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
 						array($info['name'])
 					)
 				);
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 65d00c16388..4c9419d6eda 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -648,12 +648,8 @@ class OC_Util {
 		if(OC_Util::runningOnWindows()) {
 			$errors[] = [
 				'error' => $l->t('Microsoft Windows Platform is not supported'),
-				'hint' => $l->t('Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you ' .
-					'use a Linux server in a virtual machine if you have no option for migrating the server itself. ' .
-					'Find Linux packages as well as easy to deploy virtual machine images on <a href="%s">%s</a>. ' .
-					'For migrating existing installations to Linux you can find some tips and a migration script ' .
-					'in <a href="%s">our documentation</a>.',
-					['https://owncloud.org/install/', 'owncloud.org/install/', 'https://owncloud.org/?p=8045'])
+				'hint' => $l->t('Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you ' .
+					'use a Linux server in a virtual machine if you have no option for migrating the server itself.')
 			];
 		}
 
@@ -704,7 +700,7 @@ class OC_Util {
 					. '%sgiving the webserver write access to the root directory%s.',
 					array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'));
 				$errors[] = array(
-					'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable by ownCloud',
+					'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable',
 					'hint' => $permissionsHint
 				);
 			} else {
@@ -814,7 +810,7 @@ class OC_Util {
 			}
 			$errors[] = [
 				'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
-				'hint' =>  $l->t('Adjusting this setting in php.ini will make ownCloud run again')
+				'hint' =>  $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
 			];
 			$webServerRestart = true;
 		}