From 35292eb66cdfa263ce5e6225ae871167378ee98b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 5 May 2015 22:08:16 +0200
Subject: [PATCH] rename to 'Default encryption module'

---
 apps/encryption/appinfo/info.xml          | 2 +-
 apps/encryption/lib/crypto/encryption.php | 4 ++--
 lib/private/encryption/manager.php        | 2 +-
 lib/private/encryption/util.php           | 2 +-
 settings/templates/admin.php              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 53a2459f86..8d3b680fc0 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -16,7 +16,7 @@
 		based on AES 128 or 256 bit keys. More information is available in
 		the Encryption documentation
 	</description>
-	<name>ownCloud Default Encryption Module</name>
+	<name>Default encryption module</name>
 	<license>AGPL</license>
 	<author>Bjoern Schiessle, Clark Tomlinson</author>
 	<requiremin>8</requiremin>
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index a4abcd7dc5..1bc42ce032 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -34,7 +34,7 @@ use OCP\ILogger;
 class Encryption implements IEncryptionModule {
 
 	const ID = 'OC_DEFAULT_MODULE';
-	const DISPLAY_NAME = 'ownCloud Default Encryption';
+	const DISPLAY_NAME = 'Default encryption module';
 
 	/**
 	 * @var Crypt
@@ -287,7 +287,7 @@ class Encryption implements IEncryptionModule {
 	 */
 	public function update($path, $uid, array $accessList) {
 		$fileKey = $this->keyManager->getFileKey($path, $uid);
-		
+
 		if (!empty($fileKey)) {
 
 			$publicKeys = array();
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 1a42646daf..45f4504564 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -79,7 +79,7 @@ class Manager implements IManager {
 		$oldEncryption = $this->config->getAppValue('files_encryption', 'installed_version');
 		if (!empty($oldEncryption)) {
 			$warning = 'Installation is in transit between the old Encryption (ownCloud <= 8.0)
-			and the new encryption. Please enable the "ownCloud Default Encryption Module"
+			and the new encryption. Please enable the "Default encryption module"
 			and run \'occ encryption:migrate\'';
 			$this->logger->warning($warning);
 			return false;
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 032ac83f37..5ea9b8bdea 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -114,7 +114,7 @@ class Util {
 				// ownCloud <= 8.0 with the old encryption
 				$id = \OCA\Encryption\Crypto\Encryption::ID;
 			} else {
-				throw new ModuleDoesNotExistsException('ownCloud default encryption module missing');
+				throw new ModuleDoesNotExistsException('Default encryption module missing');
 			}
 		}
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index f5a3a40662..50a481eb20 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -358,7 +358,7 @@ if ($_['cronErrors']) {
 		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
 			<?php
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
-				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "ownCloud Default Encryption Module" and run \'occ encryption:migrate\''));
+				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
 			} elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
 				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?>
 				<input type="submit" name="startmigration" id="startmigration"