diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Encryption/Manager.php | 4 | ||||
| -rw-r--r-- | lib/private/Mail/EMailTemplate.php | 4 | ||||
| -rw-r--r-- | lib/private/Setup/OCI.php | 2 | ||||
| -rw-r--r-- | lib/private/Setup/PostgreSQL.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 2 | ||||
| -rw-r--r-- | lib/public/Mail/IEMailTemplate.php | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 9053e371b65..bfadebd0db0 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -193,8 +193,8 @@ class Manager implements IManager { if (isset($this->encryptionModules[$moduleId])) { return call_user_func($this->encryptionModules[$moduleId]['callback']); } else { - $message = "Module with id: $moduleId does not exist."; - $hint = $this->l->t('Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]); + $message = "Module with ID: $moduleId does not exist."; + $hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]); throw new Exceptions\ModuleDoesNotExistsException($message, $hint); } } else { diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index c0949b91c42..7384069f430 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -456,11 +456,11 @@ EOF; /** * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email * - * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used + * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used */ public function addFooter($text = '') { if($text === '') { - $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically generated email, please do not reply.'); + $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically sent email, please do not reply.'); } if ($this->footerAdded) { diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php index d3fe3018f49..1bc6b08117f 100644 --- a/lib/private/Setup/OCI.php +++ b/lib/private/Setup/OCI.php @@ -154,7 +154,7 @@ class OCI extends AbstractDatabase { $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string); if(!$connection) { throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'), - $this->trans->t('You need to enter either an existing account or the administrator.')); + $this->trans->t('You need to enter details of an existing account.')); } $query = "SELECT count(*) FROM user_tables WHERE table_name = :un"; $stmt = oci_parse($connection, $query); diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index be3ac007493..18ed9fcdef6 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -98,7 +98,7 @@ class PostgreSQL extends AbstractDatabase { } catch (\Exception $e) { $this->logger->logException($e); throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'), - $this->trans->t('You need to enter either an existing account or the administrator.')); + $this->trans->t('You need to enter details of an existing account.')); } diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 5e01b6e2b87..9516a67af48 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -955,7 +955,7 @@ class OC_Util { } if (!file_exists($dataDirectory . '/.ocdata')) { $errors[] = [ - 'error' => $l->t('Your data directory is invalid'), + 'error' => $l->t('Your data directory is invalid'), 'hint' => $l->t('Please check that the data directory contains a file' . ' ".ocdata" in its root.') ]; diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php index 41daacdb49f..ab7713e8e2c 100644 --- a/lib/public/Mail/IEMailTemplate.php +++ b/lib/public/Mail/IEMailTemplate.php @@ -109,7 +109,7 @@ interface IEMailTemplate { /** * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email * - * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used + * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used * * @since 12.0.0 */ |