4 files changed, 6 insertions, 4 deletions
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
index 15397ca5707..2ba7c606abf 100644
--- a/apps/encryption/l10n/is.js
+++ b/apps/encryption/l10n/is.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Default encryption module" : "Sjálfgefin dulritunareining",
+    "Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hæ,\n\nkerfisstjórinn virkjaði dulritun á vefþjóni. Skrárnar þínar voru dulritaðar með lykilorðinu '%s'.\n\nSkráðu þig inn í vefviðmótinu, farðu í hlutann 'Grunn-dulritunareining' (basic encryption module) í persónulegu stillingunum þínum og uppfærðu dulritunarlykilorðið þitt með því að setja þetta lykilorð inn í reitinn 'Gamla innskráningarlykilorðið' ásamt núverandi innskráningarlykilorði.\n\n",
     "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
     "Cheers!" : "Til hamingju!",
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
index 29564257e94..6943895b62e 100644
--- a/apps/encryption/l10n/is.json
+++ b/apps/encryption/l10n/is.json
@@ -29,6 +29,7 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
     "Default encryption module" : "Sjálfgefin dulritunareining",
+    "Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hæ,\n\nkerfisstjórinn virkjaði dulritun á vefþjóni. Skrárnar þínar voru dulritaðar með lykilorðinu '%s'.\n\nSkráðu þig inn í vefviðmótinu, farðu í hlutann 'Grunn-dulritunareining' (basic encryption module) í persónulegu stillingunum þínum og uppfærðu dulritunarlykilorðið þitt með því að setja þetta lykilorð inn í reitinn 'Gamla innskráningarlykilorðið' ásamt núverandi innskráningarlykilorði.\n\n",
     "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
     "Cheers!" : "Til hamingju!",
diff --git a/apps/encryption/lib/Settings/Admin.php b/apps/encryption/lib/Settings/Admin.php
index 2faa118e2a2..7ada315e233 100644
--- a/apps/encryption/lib/Settings/Admin.php
+++ b/apps/encryption/lib/Settings/Admin.php
@@ -110,7 +110,7 @@ class Admin implements ISettings {
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection() {
-		return 'encryption';
+		return 'security';
 	}
 
 	/**
@@ -121,7 +121,7 @@ class Admin implements ISettings {
 	 * E.g.: 70
 	 */
 	public function getPriority() {
-		return 5;
+		return 11;
 	}
 
 }
diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php
index 9afc024dfc8..54b3187a97e 100644
--- a/apps/encryption/tests/Settings/AdminTest.php
+++ b/apps/encryption/tests/Settings/AdminTest.php
@@ -92,10 +92,10 @@ class AdminTest extends TestCase {
 	}
 
 	public function testGetSection() {
-		$this->assertSame('encryption', $this->admin->getSection());
+		$this->assertSame('security', $this->admin->getSection());
 	}
 
 	public function testGetPriority() {
-		$this->assertSame(5, $this->admin->getPriority());
+		$this->assertSame(11, $this->admin->getPriority());
 	}
 }