summaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-05-04 17:40:05 +0200
committerBjörn Schießle <bjoern@schiessle.org>2015-05-04 17:40:05 +0200
commited16127a8d2315ddf93be297aa2ca973d09add28 (patch)
treeb00fba863d395f63d0ae3f4acf00289958aee4d1 /apps/encryption
parent08b98a8ede6593c5101abdd2c8a4020dda4729ae (diff)
parentf76c0552445268a6558d8d42b9dfa6f14713aec6 (diff)
downloadnextcloud-server-ed16127a8d2315ddf93be297aa2ca973d09add28.tar.gz
nextcloud-server-ed16127a8d2315ddf93be297aa2ca973d09add28.zip
Merge pull request #16026 from owncloud/enc_ux_improvements
[encryption] some small ux improvements
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/templates/settings-admin.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index b64e75512e7..f1cb83f7457 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -11,9 +11,13 @@ script('core', 'multiselect');
<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
<?php else: ?>
<p id="encryptionSetRecoveryKey">
- <?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
+ <?php p($l->t('Enable recovery key: ')); ?>
<span class="msg"></span>
<br/>
+ <em>
+ <?php p($l->t("The recovery key is an extra encryption key that is used
+ to encrypt files. It allows recovery of a user's files if the user forgets their password.")) ?>
+ </em>
<br/>
<input type="password" name="encryptionRecoveryPassword" id="encryptionRecoveryPassword"/>
<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
@@ -27,7 +31,7 @@ script('core', 'multiselect');
name='adminEnableRecovery'
value='1'
<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : ''); ?> />
- <label for="adminEnableRecovery"><?php p($l->t("Enabled")); ?></label>
+ <label for="adminEnableRecovery"><?php p($l->t("Enable recovery key")); ?></label>
<br/>
<input
@@ -36,7 +40,7 @@ script('core', 'multiselect');
name='adminEnableRecovery'
value='0'
<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : ''); ?> />
- <label for="adminDisableRecovery"><?php p($l->t("Disabled")); ?></label>
+ <label for="adminDisableRecovery"><?php p($l->t("Disable recovery key")); ?></label>
</p>
<br/><br/>