[Pkg-owncloud-commits] [owncloud] 100/122: kill new lines in l10n strings

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5a46dad4e0441f88442550901b247f47c3f6ee71
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed May 6 14:30:22 2015 +0200

    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 be87252..f5a3a40 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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git