From 5ef4a7606c60152b3f8785cd5d3f5a53bc9198b2 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 6 May 2015 12:39:02 +0200
Subject: [PATCH 1/2] Add l10n support to encryption settings

* fixes #16111
---
 settings/templates/admin.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 638c3d7bff..be87252126 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -340,9 +340,9 @@ if ($_['cronErrors']) {
 		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
 			<?php
 			if (empty($_['encryptionModules'])) {
-				p('No encryption module loaded, please load a encryption module in the app menu');
+				p($l->t('No encryption module loaded, please load a encryption module in the app menu'));
 			} else { ?>
-				<h3>Select default encryption module:</h3>
+				<h3><?php p($l->t('Select default encryption module:')) ?></h3>
 				<fieldset id='encryptionModules'>
 					<?php foreach ($_['encryptionModules'] as $id => $module): ?>
 						<input type="radio" id="<?php p($id) ?>"
@@ -361,10 +361,10 @@ if ($_['cronErrors']) {
 		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
 			<?php
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
-				p('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 "ownCloud Default Encryption Module" and run \'occ encryption:migrate\''));
 			} elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
-				p('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.'); ?>
+				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"
 					   value="<?php p($l->t('Start migration')); ?>"/>
 			<?php } ?>

From 5a46dad4e0441f88442550901b247f47c3f6ee71 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 6 May 2015 14:30:22 +0200
Subject: [PATCH 2/2] kill new lines in l10n strings

---
 settings/templates/admin.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index be87252126..f5a3a40662 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -327,10 +327,7 @@ if ($_['cronErrors']) {
 	</p>
 
 	<div id="EncryptionWarning" class="warning hidden">
-		<?php p($l->t('Encryption is a one way process. Once encryption is enabled,
-		all files from that point forward will be encrypted on the server and it
-		will not be possible to disable encryption at a later date. This is the final warning:
-		Do you really want to enable encryption?')) ?>
+		<?php p($l->t('Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?')) ?>
 		<input type="button"
 			   id="reallyEnableEncryption"
 			   value="<?php p($l->t("Enable encryption")); ?>" />
@@ -361,8 +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 "ownCloud 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"