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

diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index 61574edf5098dc05db9614f2cabecebd76673983..317cea05a128cc8a8cc930c3066c12a266486dc4 100644 (file)
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -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.');

diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index 0b8e4ccfe2048dac6248a43eb667dc75b64b5ddf..b31fd983995428ae773c7aad117de3a449ea12ba 100644 (file)
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -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.')));
 }

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f133260383cba4ba8b4c052077bee1512d9e4a4b..a07bd3fa11fc06cac2a1e942ddaf91c460458e44 100644 (file)
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -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;
        }