[Pkg-owncloud-commits] [owncloud] 38/122: some small ux improvements

[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 f76c0552445268a6558d8d42b9dfa6f14713aec6
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon May 4 10:51:08 2015 +0200

    some small ux improvements
---
 apps/encryption/templates/settings-admin.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index b64e755..f1cb83f 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/>
 

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