fix: replace Account name by Login

skjnldsv · skjnldsv · commit 42d99d1d8dc5 · 2024-02-13T17:44:01.000+01:00
Signed-off-by: John Molakvoæ &lt;skjnldsv@protonmail.com&gt;
diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php
@@ -57,7 +57,7 @@ public function __construct(
 	}
 
 	/**
-	 * Get the currently configured out-of-office data of a user.
+	 * Get the currently configured out-of-office data of a user
 	 *
 	 * @param string $userId The user id to get out-of-office data for.
 	 * @return DataResponse<Http::STATUS_OK, DAVCurrentOutOfOfficeData, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
@@ -163,7 +163,7 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
 
 		if (!isset($parsedParameters['user'])) {
 			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);
+			$subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);
@@ -281,7 +281,7 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
 
 		if (!isset($parsedParameters['user'])) {
 			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);
+			$subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php
@@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (\Exception $e) {
 			$output->writeln('<error>Error while trying to create storage</error>');
 			if ($noAuth) {
-				$output->writeln('<error>Account name and/or password required</error>');
+				$output->writeln('<error>Login and/or password required</error>');
 			}
 			return self::FAILURE;
 		}
diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php
@@ -38,7 +38,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('OpenStack v2'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 				new DefinitionParameter('tenant', $l->t('Tenant name')),
diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php
@@ -42,7 +42,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('OpenStack v3'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				new DefinitionParameter('domain', $l->t('Domain')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php
@@ -37,7 +37,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('Rackspace'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('key', $l->t('API key')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 			])
diff --git a/apps/files_external/lib/Lib/Auth/Password/Password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php
@@ -35,9 +35,9 @@ public function __construct(IL10N $l) {
 		$this
 			->setIdentifier('password::password')
 			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Account name and password'))
+			->setText($l->t('Login and password'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 			]);
diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
@@ -52,7 +52,7 @@ public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
 			->setScheme(self::SCHEME_PASSWORD)
 			->setText($l->t('Manually entered, store in database'))
 			->addParameters([
-				(new DefinitionParameter('user', $l->t('Account name')))
+				(new DefinitionParameter('user', $l->t('Login')))
 					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD)
diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php
@@ -47,7 +47,7 @@ public function __construct(IL10N $l, IConfig $config) {
 			->setScheme(self::SCHEME_PUBLICKEY)
 			->setText($l->t('RSA public key'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				new DefinitionParameter('public_key', $l->t('Public key')),
 				(new DefinitionParameter('private_key', 'private_key'))
 					->setType(DefinitionParameter::VALUE_HIDDEN),
diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php
@@ -46,7 +46,7 @@ public function __construct(IL10N $l, IConfig $config) {
 			->setScheme(self::SCHEME_PUBLICKEY)
 			->setText($l->t('RSA private key'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Account name')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL)
 					->setType(DefinitionParameter::VALUE_PASSWORD),
diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php
@@ -46,7 +46,7 @@ public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBa
 			->setText($l->t('SMB/CIFS using OC login'))
 			->addParameters([
 				new DefinitionParameter('host', $l->t('Host')),
-				(new DefinitionParameter('username_as_share', $l->t('Account name as share')))
+				(new DefinitionParameter('username_as_share', $l->t('Login as share')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 				(new DefinitionParameter('share', $l->t('Share')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -167,7 +167,7 @@ public function __construct($params) {
 			or (empty($params['user']) && empty($params['userid'])) or empty($params['bucket'])
 			or empty($params['region'])
 		) {
-			throw new StorageBadConfigException("API Key or password, Account name, Bucket and Region have to be configured.");
+			throw new StorageBadConfigException("API Key or password, Login, Bucket and Region have to be configured.");
 		}
 
 		$user = $params['user'];
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
@@ -228,7 +228,7 @@ class="<?php if (isset($_['visibilityType']) && $_['visibilityType'] === Backend
 		<input type="text" name="username"
 			   autocomplete="false"
 			   value="<?php p($_['globalCredentials']['user']); ?>"
-			   placeholder="<?php p($l->t('Account name')) ?>"/>
+			   placeholder="<?php p($l->t('Login')) ?>"/>
 		<input type="password" name="password"
 			   autocomplete="false"
 			   value="<?php p($_['globalCredentials']['password']); ?>"
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>File sharing</name>
 	<summary>File sharing</summary>
 	<description>
-		This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other people and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
+		This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other accounts and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
 Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation.
 
 	</description>
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -132,7 +132,7 @@ public function changeUserPassword(string $username = null, string $password = n
 			return new JSONResponse([
 				'status' => 'error',
 				'data' => [
-					'message' => $this->l->t('No account name supplied'),
+					'message' => $this->l->t('No Login supplied'),
 				],
 			]);
 		}
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -134,7 +134,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
 		}
 		$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
 		if ($user->getBackendClassName() !== 'LDAP') {
-			$emailTemplate->addBodyText($l10n->t('Your account name is: %s', [$userId]));
+			$emailTemplate->addBodyText($l10n->t('Your Login is: %s', [$userId]));
 		}
 		if ($generatePasswordResetToken) {
 			$leftButtonText = $l10n->t('Set your password');
diff --git a/apps/settings/src/components/AuthTokenSetupDialog.vue b/apps/settings/src/components/AuthTokenSetupDialog.vue
@@ -27,7 +27,7 @@
 			{{ t('settings', 'Use the credentials below to configure your app or device. For security reasons this password will only be shown once.') }}
 		</p>
 		<div class="token-dialog__name">
-			<NcTextField :label="t('settings', 'Account name')" :value="loginName" readonly />
+			<NcTextField :label="t('settings', 'Login')" :value="loginName" readonly />
 			<NcButton type="tertiary"
 				:title="copyLoginNameLabel"
 				:aria-label="copyLoginNameLabel"
diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php
@@ -148,7 +148,7 @@
 			print_unescaped(' class="hidden"');
 		} ?>>
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
-			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP account name'))?>"
+			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Login'))?>"
 				   value="<?php p($_['mail_smtpname']) ?>" />
 			<input type="text" name="mail_smtppassword" id="mail_smtppassword" autocomplete="off"
 				   placeholder="<?php p($l->t('SMTP Password'))?>" value="<?php p($_['mail_smtppassword']) ?>" />
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -262,7 +262,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
 			<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%">
 				<tr style="padding:0;text-align:left;vertical-align:top">
 					<th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
-						<p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your account name is: john</p>
+						<p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your Login is: john</p>
 					</th>
 					<th class="expander" style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th>
 				</tr>
@@ -363,7 +363,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
 
 Welcome to your TestCloud account, you can add, protect, and share your data.
 
-Your account name is: john
+Your Login is: john
 
 
 Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken
@@ -498,7 +498,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
 			<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%">
 				<tr style="padding:0;text-align:left;vertical-align:top">
 					<th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
-						<p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your account name is: john</p>
+						<p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your Login is: john</p>
 					</th>
 					<th class="expander" style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th>
 				</tr>
@@ -599,7 +599,7 @@ public function testGenerateTemplateWithoutPasswordResetToken() {
 
 Welcome to your TestCloud account, you can add, protect, and share your data.
 
-Your account name is: john
+Your Login is: john
 
 
 Go to TestCloud: https://example.com/
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
@@ -64,10 +64,10 @@ protected function configure(): void {
 			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
 			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
 			->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
-			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'Account name to connect to the database')
+			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'Login to connect to the database')
 			->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
 			->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
-			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Account name of the admin account', 'admin')
+			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Login of the admin account', 'admin')
 			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
 			->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
 			->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php
@@ -65,7 +65,7 @@ protected function configure() {
 				'display-name',
 				null,
 				InputOption::VALUE_OPTIONAL,
-				'Account name used in the web UI (can contain any characters)'
+				'Login used in the web UI (can contain any characters)'
 			)
 			->addOption(
 				'group',
diff --git a/core/Command/User/AuthTokens/Add.php b/core/Command/User/AuthTokens/Add.php
@@ -58,7 +58,7 @@ protected function configure() {
 			->addArgument(
 				'user',
 				InputArgument::REQUIRED,
-				'Account name to add app password for'
+				'Login to add app password for'
 			)
 			->addOption(
 				'password-from-env',
diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php
@@ -55,7 +55,7 @@ protected function configure() {
 			->addArgument(
 				'user',
 				InputArgument::REQUIRED,
-				'Account name to reset password'
+				'Login to reset password'
 			)
 			->addOption(
 				'password-from-env',
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
@@ -60,7 +60,7 @@
 			<h2 class="login-form__headline" data-login-form-headline v-html="headline" />
 			<NcTextField id="user"
 				ref="user"
-				:label="t('core', 'Account name or email')"
+				:label="t('core', 'Login or email')"
 				name="user"
 				:value.sync="user"
 				:class="{shake: invalidPassword}"
@@ -176,7 +176,7 @@ export default {
 		},
 		errorLabel() {
 			if (this.invalidPassword) {
-				return t('core', 'Wrong account name or password.')
+				return t('core', 'Wrong login or password.')
 			}
 			if (this.userDisabled) {
 				return t('core', 'This account is disabled')
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
@@ -10,8 +10,8 @@
 				:value="user"
 				:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
 				:error="!validCredentials"
-				:label="t('core', 'Account name or email')"
-				:placeholder="t('core', 'Account name or email')"
+				:label="t('core', 'Login or email')"
+				:placeholder="t('core', 'Login or email')"
 				:helper-text="!validCredentials ? t('core', 'Your account is not setup for passwordless login.') : ''"
 				@update:value="changeUsername" />
 
diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
@@ -26,14 +26,14 @@
 				:value.sync="user"
 				name="user"
 				autocapitalize="off"
-				:label="t('core', 'Account name or email')"
+				:label="t('core', 'Login or email')"
 				required
 				@change="updateUsername" />
 			<LoginButton :value="t('core', 'Reset password')" />
 
 			<NcNoteCard v-if="message === 'send-success'"
 				type="success">
-				{{ t('core', 'If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.') }}
+				{{ t('core', 'If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or Login, check your spam/junk folders or ask your local administration for help.') }}
 			</NcNoteCard>
 			<NcNoteCard v-else-if="message === 'send-error'"
 				type="error">
diff --git a/core/templates/installation.php b/core/templates/installation.php
@@ -35,7 +35,7 @@
 	<fieldset id="adminaccount">
 		<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
 		<p>
-			<label for="adminlogin"><?php p($l->t('Account name')); ?></label>
+			<label for="adminlogin"><?php p($l->t('Login')); ?></label>
 			<input type="text" name="adminlogin" id="adminlogin"
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="none" spellcheck="false" autofocus required>
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php
@@ -53,8 +53,8 @@
 
 	<form action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.apptokenRedirect')); ?>" method="post" id="app-token-login-field" class="hidden">
 		<p class="grouptop">
-			<input type="text" name="user" id="user" placeholder="<?php p($l->t('Account name')) ?>">
-			<label for="user" class="infield"><?php p($l->t('Account name')) ?></label>
+			<input type="text" name="user" id="user" placeholder="<?php p($l->t('Login')) ?>">
+			<label for="user" class="infield"><?php p($l->t('Login')) ?></label>
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="password" id="password" placeholder="<?php p($l->t('App password')) ?>">
diff --git a/core/templates/loginflowv2/authpicker.php b/core/templates/loginflowv2/authpicker.php
@@ -53,8 +53,8 @@
 
 	<form action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.apptokenRedirect')); ?>" method="post" id="app-token-login-field" class="hidden">
 		<p class="grouptop">
-			<input type="text" name="user" id="user" placeholder="<?php p($l->t('Account name')) ?>">
-			<label for="user" class="infield"><?php p($l->t('Account name')) ?></label>
+			<input type="text" name="user" id="user" placeholder="<?php p($l->t('Login')) ?>">
+			<label for="user" class="infield"><?php p($l->t('Login')) ?></label>
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="password" id="password" placeholder="<?php p($l->t('App password')) ?>">
diff --git a/cypress/e2e/login/login.cy.ts b/cypress/e2e/login/login.cy.ts
@@ -103,7 +103,7 @@ describe('Login', () => {
 		// Then I see that the current page is the Login page
 		cy.url().should('match', /\/login/)
 		// And I see that a wrong password message is shown
-		cy.get('form[name="login"]').then(($el) => expect($el.text()).to.match(/Wrong.+password/i).and.to.match(/Wrong.+account/))
+		cy.get('form[name="login"]').then(($el) => expect($el.text()).to.match(/Wrong.+password/i).and.to.match(/Wrong.+login/))
 		cy.get('input[name="password"]:invalid').should('exist')
 	})
 
@@ -125,7 +125,7 @@ describe('Login', () => {
 		// Then I see that the current page is the Login page
 		cy.url().should('match', /\/login/)
 		// And I see that a wrong password message is shown
-		cy.get('form[name="login"]').then(($el) => expect($el.text()).to.match(/Wrong.+password/i).and.to.match(/Wrong.+account/))
+		cy.get('form[name="login"]').then(($el) => expect($el.text()).to.match(/Wrong.+password/i).and.to.match(/Wrong.+login/))
 		cy.get('input[name="password"]:invalid').should('exist')
 	})
 
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/settings-vue-settings-personal-security.js b/dist/settings-vue-settings-personal-security.js
diff --git a/dist/settings-vue-settings-personal-security.js.map b/dist/settings-vue-settings-personal-security.js.map
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function __construct(`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`		`- * Get the currently configured out-of-office data of a user.`
	`60`	`+ * Get the currently configured out-of-office data of a user`
`61`	`61`	`*`
`62`	`62`	`* @param string $userId The user id to get out-of-office data for.`
`63`	`63`	`* @return DataResponse<Http::STATUS_OK, DAVCurrentOutOfOfficeData, array{}>\|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {`
`163`	`163`
`164`	`164`	`if (!isset($parsedParameters['user'])) {`
`165`	`165`	`// External user via public link share`
`166`		`- $subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);`
	`166`	`+ $subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`$this->setSubjects($event, $subject, $parsedParameters);`
`@@ -281,7 +281,7 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {`
`281`	`281`
`282`	`282`	`if (!isset($parsedParameters['user'])) {`
`283`	`283`	`// External user via public link share`
`284`		`- $subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);`
	`284`	`+ $subject = str_replace('{user}', $this->activityLang->t('"remote account"'), $subject);`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`$this->setSubjects($event, $subject, $parsedParameters);`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`158`	`158`	`} catch (\Exception $e) {`
`159`	`159`	`$output->writeln('<error>Error while trying to create storage</error>');`
`160`	`160`	`if ($noAuth) {`
`161`		`- $output->writeln('<error>Account name and/or password required</error>');`
	`161`	`+ $output->writeln('<error>Login and/or password required</error>');`
`162`	`162`	`}`
`163`	`163`	`return self::FAILURE;`
`164`	`164`	`}`