diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:54:31 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:54:31 +0200 |
| commit | 3fc5b34247cc30809ca525b96e73f1448e5b2e9b (patch) | |
| tree | e92a0b479329a3f386452396b595a38cac61e4b4 /apps/files_encryption | |
| parent | 38ed00398f4df27967ae771c54a6a8f6bed07dbd (diff) | |
| parent | 29dd7eda2de629024548ddef419f1d6991ae07a6 (diff) | |
| download | nextcloud-server-3fc5b34247cc30809ca525b96e73f1448e5b2e9b.tar.gz nextcloud-server-3fc5b34247cc30809ca525b96e73f1448e5b2e9b.zip | |
Merge branch 'master' into encryption_check_php_version
Conflicts:
apps/files_encryption/files/error.php
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/files/error.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php index 85128fa4aea..f93c67d920a 100644 --- a/apps/files_encryption/files/error.php +++ b/apps/files_encryption/files/error.php @@ -4,7 +4,7 @@ if (!isset($_)) { //also provide standalone error page $l = OC_L10N::get('files_encryption'); - $errorMsg = $l->t('Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files.'); + $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.'); if(isset($_GET['p']) && $_GET['p'] === '1') { header('HTTP/1.0 404 ' . $errorMsg); |