upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

kill new lines in l10n strings

Browse source
This commit is contained in:
Morris Jobke 2015-05-06 14:30:22 +02:00
parent 5ef4a7606c
commit 5a46dad4e0
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
settings/templates/admin.php
View file

@ -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"