Browse Source

replacing ownCloud by theme-able name or avoid it's usage

tags/v6.0.0beta3
Thomas Müller 10 years ago
parent
commit
ffb0e14d7b

+ 2
- 1
apps/files_encryption/files/error.php View File

@@ -12,7 +12,8 @@ if (!isset($_)) { //also provide standalone error page
$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
break;
case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR:
$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.');
$theme = new OC_Defaults();
$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.', array($theme->getName()));
break;
case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND:
$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');

+ 1
- 1
apps/user_ldap/ajax/testConfiguration.php View File

@@ -41,5 +41,5 @@ if($connection->setConfiguration($_POST)) {
}
} else {
OCP\JSON::error(array('message'
=> $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
=> $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
}

+ 1
- 1
apps/user_ldap/lib/access.php View File

@@ -356,7 +356,7 @@ class Access extends LDAPUtility {
}

//if everything else did not help..
\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
\OCP\Util::writeLog('user_ldap', 'Could not create unique name for '.$dn.'.', \OCP\Util::INFO);
return false;
}


Loading…
Cancel
Save