diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-05-06 14:30:22 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-05-06 14:30:22 +0200 |
| commit | 5a46dad4e0441f88442550901b247f47c3f6ee71 (patch) | |
| tree | f64046addbbf1349d2f17bc3066a05b19568c42c /settings | |
| parent | 5ef4a7606c60152b3f8785cd5d3f5a53bc9198b2 (diff) | |
| download | nextcloud-server-5a46dad4e0441f88442550901b247f47c3f6ee71.tar.gz nextcloud-server-5a46dad4e0441f88442550901b247f47c3f6ee71.zip | |
kill new lines in l10n strings
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/admin.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index be87252126d..f5a3a40662a 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" |