diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
index c6a19004e8e..69056225f8a 100644
--- a/apps/files_external/lib/Controller/GlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -170,7 +170,7 @@ class GlobalStoragesController extends StoragesController {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index d962848bd78..dd2bf69a0a6 100644
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -306,7 +306,7 @@ abstract class StoragesController extends Controller {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
@@ -331,7 +331,7 @@ abstract class StoragesController extends Controller {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
index 4acbc156261..22c9c867855 100644
--- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -122,7 +122,7 @@ class UserGlobalStoragesController extends StoragesController {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
@@ -162,7 +162,7 @@ class UserGlobalStoragesController extends StoragesController {
 			} else {
 				return new DataResponse(
 					[
-						'message' => (string)$this->l10n->t('Storage with id "%i" is not user editable', array($id))
+						'message' => (string)$this->l10n->t('Storage with ID "%d" is not user editable', array($id))
 					],
 					Http::STATUS_FORBIDDEN
 				);
@@ -170,7 +170,7 @@ class UserGlobalStoragesController extends StoragesController {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php
index db078346313..724bdd01463 100644
--- a/apps/files_external/lib/Controller/UserStoragesController.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -198,7 +198,7 @@ class UserStoragesController extends StoragesController {
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php
index 43839a17d76..4e38ea96259 100644
--- a/apps/files_external/lib/Service/StoragesService.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -147,14 +147,14 @@ abstract class StoragesService {
 		$mount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($mount)) {
-			throw new NotFoundException('Storage with id "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "' . $id . '" not found');
 		}
 
 		$config = $this->getStorageConfigFromDBMount($mount);
 		if ($this->isApplicable($config)) {
 			return $config;
 		} else {
-			throw new NotFoundException('Storage with id "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "' . $id . '" not found');
 		}
 	}
 
@@ -377,7 +377,7 @@ abstract class StoragesService {
 		$existingMount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with id "' . $id . '" not found while updating storage');
+			throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
 		}
 
 		$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
@@ -456,7 +456,7 @@ abstract class StoragesService {
 		$existingMount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with id "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "' . $id . '" not found');
 		}
 
 		$this->dbConfig->removeMount($id);
diff --git a/apps/updatenotification/lib/Notification/Notifier.php b/apps/updatenotification/lib/Notification/Notifier.php
index bef57b0d867..e512825da04 100644
--- a/apps/updatenotification/lib/Notification/Notifier.php
+++ b/apps/updatenotification/lib/Notification/Notifier.php
@@ -98,7 +98,7 @@ class Notifier implements INotifier {
 			}
 
 			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the nextcloud and server log files for errors.'));
+				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
 		} elseif ($notification->getObjectType() === 'core') {
 			$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
 
diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index d08a744f9ee..a2537539ede 100644
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -160,7 +160,7 @@ OCA = OCA || {};
 				} else if(message === 'connection error') {
 					message = t('user_ldap', 'A connection error to LDAP / AD occurred, please check host, port and credentials.');
 				} else if(message === 'missing placeholder') {
-					message = t('user_ldap', 'The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
+					message = t('user_ldap', 'The "%uid" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
 				}
 			}
 			OC.Notification.showTemporary(message, {isHTML: isHtml});
diff --git a/apps/user_ldap/templates/part.wizard-groupfilter.php b/apps/user_ldap/templates/part.wizard-groupfilter.php
index 5c406450f6f..640b0bccb8a 100644
--- a/apps/user_ldap/templates/part.wizard-groupfilter.php
+++ b/apps/user_ldap/templates/part.wizard-groupfilter.php
@@ -53,7 +53,7 @@
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count groups'));?>
+				<?php p($l->t('Verify settings and count the groups'));?>
 			</button>
 			<span id="ldap_group_count"></span>
 		</p>
diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
index a13931d9327..779b3fdb9a1 100644
--- a/apps/user_ldap/templates/part.wizard-loginfilter.php
+++ b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -9,7 +9,7 @@
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_username"
-				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>"
+				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or sAMAccountName and will be detected.'));?>"
 				   name="ldap_loginfilter_username" value="1" />
 		</p>
 		<p>
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 56d351eb10b..f4f2abe0f91 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -25,7 +25,7 @@
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"
-			title="<?php p($l->t('Add a new and blank configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
 		<button type="button" id="ldap_action_copy_configuration"
 			name="ldap_action_copy_configuration"
 			class="ldapIconCopy icon-default-style"
@@ -42,7 +42,7 @@
 						<input type="text" class="host" id="ldap_host"
 							name="ldap_host"
 							placeholder="<?php p($l->t('Host'));?>"
-							title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://'));?>"
+							title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
 							/>
 						<span class="hostPortCombinatorSpan">
 							<input type="number" id="ldap_port" name="ldap_port"
diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js
index 7f9a709ec14..ab122a8cd65 100644
--- a/apps/workflowengine/js/admin.js
+++ b/apps/workflowengine/js/admin.js
@@ -187,7 +187,7 @@
 					this.saving = false;
 					this.originalModel = JSON.parse(JSON.stringify(this.model));
 
-					this.message = t('workflowengine', 'Successfully saved');
+					this.message = t('workflowengine', 'Saved');
 					this.errorMessage = '';
 					this.render();
 				};
diff --git a/apps/workflowengine/js/filemimetypeplugin.js b/apps/workflowengine/js/filemimetypeplugin.js
index fd3f6a9ae63..17c092d209f 100644
--- a/apps/workflowengine/js/filemimetypeplugin.js
+++ b/apps/workflowengine/js/filemimetypeplugin.js
@@ -27,7 +27,7 @@
 		getCheck: function() {
 			return {
 				'class': 'OCA\\WorkflowEngine\\Check\\FileMimeType',
-				'name': t('workflowengine', 'File mime type'),
+				'name': t('workflowengine', 'File MIME type'),
 				'operators': [
 					{'operator': 'is', 'name': t('workflowengine', 'is')},
 					{'operator': '!is', 'name': t('workflowengine', 'is not')},
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 7e059b4bbc0..92f256699af 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -326,7 +326,7 @@ var OCdialogs = {
 					}
 				};
 				buttonlist[0] = {
-					text: t('core', 'Ok'),
+					text: t('core', 'OK'),
 					click: functionToCall,
 					defaultButton: true
 				};
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 53b2e46f90a..499709c0696 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -221,7 +221,7 @@
 				// .ocdata is an empty file in the data directory - if this is readable then the data dir is not protected
 				if (xhr.status === 200 && xhr.responseText === '') {
 					messages.push({
-						msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.'),
+						msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.'),
 						type: OC.SetupChecks.MESSAGE_TYPE_ERROR
 					});
 				}
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 36f15a7269d..75e56a23f58 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -17,7 +17,7 @@
 
 	var PASSWORD_PLACEHOLDER = '**********';
 	var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link');
-	var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press enter');
+	var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press "Enter ↵"');
 
 	var TEMPLATE =
 			'{{#if shareAllowed}}' +
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 937084aaa24..30a60d3599b 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -108,7 +108,7 @@ describe('OC.SetupChecks tests', function() {
 			async.done(function( data, s, x ){
 				expect(data).toEqual([
 					{
-						msg: 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.',
+						msg: 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.',
 						type: OC.SetupChecks.MESSAGE_TYPE_ERROR
 					}]);
 				done();
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
 	 */
diff --git a/settings/Activity/Provider.php b/settings/Activity/Provider.php
index f7ea425f628..7893b450a44 100644
--- a/settings/Activity/Provider.php
+++ b/settings/Activity/Provider.php
@@ -89,11 +89,11 @@ class Provider implements IProvider {
 			$subject = $this->l->t('Your password was reset by an administrator');
 
 		} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email');
+			$subject = $this->l->t('{actor} changed your email address');
 		} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email');
+			$subject = $this->l->t('You changed your email address');
 		} else if ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email was changed by an administrator');
+			$subject = $this->l->t('Your email address was changed by an administrator');
 
 		} else {
 			throw new \InvalidArgumentException();
diff --git a/settings/Controller/ChangePasswordController.php b/settings/Controller/ChangePasswordController.php
index 2f61d36c3ff..cb1a97386a6 100644
--- a/settings/Controller/ChangePasswordController.php
+++ b/settings/Controller/ChangePasswordController.php
@@ -246,7 +246,7 @@ class ChangePasswordController extends Controller {
 					return new JSONResponse([
 						'status' => 'error',
 						'data' => [
-							'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was successfully updated.'),
+							'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was updated.'),
 						]
 					]);
 				} elseif (!$result && !$recoveryEnabledForUser) {
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 215b3c2c92e..9a3ff09337d 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -435,7 +435,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 
 		OC.Settings.Apps.hideErrorMessage(appId);
-		element.val(t('settings','Uninstalling ....'));
+		element.val(t('settings','Uninstalling …'));
 		$.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) {
 			if(!result || result.status !== 'success') {
 				OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app'));
diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index d87fa81729f..d0fc6378e9a 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -81,7 +81,7 @@
 		if (!$_['has_fileinfo']) {
 			?>
 			<li>
-				<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
+				<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?>
 			</li>
 			<?php
 		}
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php
index 707abe9588d..7cf6c635360 100644
--- a/tests/Settings/Mailer/NewUserMailHelperTest.php
+++ b/tests/Settings/Mailer/NewUserMailHelperTest.php
@@ -324,7 +324,7 @@ class NewUserMailHelperTest extends TestCase {
 					</tr>
 					</tbody>
 				</table>
-				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically generated email, please do not reply.</p>
+				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>
 			</center>
 		</td>
 	</tr>
@@ -350,7 +350,7 @@ Install Client: https://nextcloud.com/install/#install-clients
 
 -- 
 TestCloud - 
-This is an automatically generated email, please do not reply.
+This is an automatically sent email, please do not reply.
 EOF;
 
 		$result = $this->newUserMailHelper->generateTemplate($user, true);
@@ -557,7 +557,7 @@ EOF;
 					</tr>
 					</tbody>
 				</table>
-				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically generated email, please do not reply.</p>
+				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>
 			</center>
 		</td>
 	</tr>
@@ -583,7 +583,7 @@ Install Client: https://nextcloud.com/install/#install-clients
 
 -- 
 TestCloud - 
-This is an automatically generated email, please do not reply.
+This is an automatically sent email, please do not reply.
 EOF;
 
 		$result = $this->newUserMailHelper->generateTemplate($user, false);
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html
index 2e3866163d7..32568e11b66 100644
--- a/tests/data/emails/new-account-email.html
+++ b/tests/data/emails/new-account-email.html
@@ -173,7 +173,7 @@
 					</tr>
 					</tbody>
 				</table>
-				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - A safe home for your data<br>This is an automatically generated email, please do not reply.</p>
+				<p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - A safe home for your data<br>This is an automatically sent email, please do not reply.</p>
 			</center>
 		</td>
 	</tr>
diff --git a/tests/data/emails/new-account-email.txt b/tests/data/emails/new-account-email.txt
index e01268b5620..42d41406ba8 100644
--- a/tests/data/emails/new-account-email.txt
+++ b/tests/data/emails/new-account-email.txt
@@ -10,4 +10,4 @@ Install Client: https://nextcloud.com/install/#install-clients
 
 -- 
 TestCloud - A safe home for your data
-This is an automatically generated email, please do not reply.
\ No newline at end of file
+This is an automatically sent email, please do not reply.
\ No newline at end of file
diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php
index ad7f47e0a3e..ac26d4cb528 100644
--- a/tests/lib/Encryption/ManagerTest.php
+++ b/tests/lib/Encryption/ManagerTest.php
@@ -100,7 +100,7 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
-	 * @expectedExceptionMessage Module with id: unknown does not exist.
+	 * @expectedExceptionMessage Module with ID: unknown does not exist.
 	 */
 	public function testGetEncryptionModuleUnknown() {
 		$this->config->expects($this->any())->method('getAppValue')->willReturn(true);
@@ -214,7 +214,7 @@ class ManagerTest extends TestCase {
 //
 //	/**
 //	 * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
-//	 * @expectedExceptionMessage Module with id: unknown does not exist.
+//	 * @expectedExceptionMessage Module with ID: unknown does not exist.
 //	 */
 //	public function testGetEncryptionModuleUnknown() {
 //		$config = $this->getMock('\OCP\IConfig');
diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php
index 2ba68dbbabb..450c007149c 100644
--- a/tests/lib/Mail/EMailTemplateTest.php
+++ b/tests/lib/Mail/EMailTemplateTest.php
@@ -81,7 +81,7 @@ class EMailTemplateTest extends TestCase {
 			'Install Client', 'https://nextcloud.com/install/#install-clients'
 		);
 		$this->emailTemplate->addFooter(
-			'TestCloud - A safe home for your data<br>This is an automatically generated email, please do not reply.'
+			'TestCloud - A safe home for your data<br>This is an automatically sent email, please do not reply.'
 		);
 
 		$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.html');