From aa2c9342ba68755f0a231f06cfe16d0fe925fd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Tue, 13 Feb 2024 14:37:09 +0100
Subject: [PATCH] fix: replace `Account name` by `Login`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 apps/dav/lib/Controller/OutOfOfficeController.php    |  2 +-
 apps/files/lib/Activity/Provider.php                 |  4 ++--
 apps/files_external/lib/Command/Notify.php           |  2 +-
 .../lib/Lib/Auth/OpenStack/OpenStackV2.php           |  2 +-
 .../lib/Lib/Auth/OpenStack/OpenStackV3.php           |  2 +-
 .../lib/Lib/Auth/OpenStack/Rackspace.php             |  2 +-
 .../lib/Lib/Auth/Password/Password.php               |  4 ++--
 .../lib/Lib/Auth/Password/UserProvided.php           |  2 +-
 apps/files_external/lib/Lib/Auth/PublicKey/RSA.php   |  2 +-
 .../lib/Lib/Auth/PublicKey/RSAPrivateKey.php         |  2 +-
 apps/files_external/lib/Lib/Backend/SMB_OC.php       |  2 +-
 apps/files_external/lib/Lib/Storage/Swift.php        |  2 +-
 apps/files_external/templates/settings.php           |  2 +-
 .../lib/Controller/ChangePasswordController.php      |  2 +-
 apps/settings/lib/Mailer/NewUserMailHelper.php       |  2 +-
 .../settings/src/components/AuthTokenSetupDialog.vue |  2 +-
 .../templates/settings/admin/additional-mail.php     |  2 +-
 apps/settings/tests/Mailer/NewUserMailHelperTest.php |  8 ++++----
 core/Command/Maintenance/Install.php                 |  4 ++--
 core/Command/User/Add.php                            |  2 +-
 core/Command/User/AuthTokens/Add.php                 |  2 +-
 core/Command/User/ResetPassword.php                  |  2 +-
 core/src/components/login/LoginForm.vue              |  4 ++--
 core/src/components/login/PasswordLessLoginForm.vue  |  4 ++--
 core/src/components/login/ResetPassword.vue          |  4 ++--
 core/templates/installation.php                      |  2 +-
 core/templates/loginflow/authpicker.php              |  4 ++--
 core/templates/loginflowv2/authpicker.php            |  4 ++--
 lib/private/Setup.php                                |  2 +-
 lib/private/Setup/AbstractDatabase.php               |  4 ++--
 lib/private/Setup/MySQL.php                          |  2 +-
 lib/private/Setup/OCI.php                            |  6 +++---
 lib/private/Setup/PostgreSQL.php                     |  2 +-
 lib/private/User/Manager.php                         | 12 ++++++------
 34 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php
index a2e7378f32de1..5ab99c34b7942 100644
--- 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
index aede4bda12748..fb81e200688fa 100644
--- 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
index 1602ea6e3540f..2fdd2f3a2ee00 100644
--- 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
index b16dcb5b65114..a36a86afce46d 100644
--- 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
index 62f9dda783b24..090a54596bc7e 100644
--- 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
index 4e0f46a2359a7..2ec0b8b035e08 100644
--- 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
index 6f0322b802080..3435ebbb1deb8 100644
--- 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
index 933bbeb9d8bb5..87bf96aeae16d 100644
--- 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
index 9aef3995f7fc2..c9ed8d1b9e38d 100644
--- 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
index 7868594eb1296..c648173a82b7c 100644
--- 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
index c7bde7ce171f2..35743c5bc3bf0 100644
--- 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
index f72836316992e..7283e5ae7b12a 100644
--- 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
index d22ec50614cd1..c6525a8be8376 100644
--- 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/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index b878d34352569..50d72e582dd1d 100644
--- 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
index 598b69c0a9ec8..2d41577f5545b 100644
--- 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
index 71fb53a014ccd..20e3b29d0f139 100644
--- 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
index 644812237f7f9..3d41874096388 100644
--- 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
index d98d558a8d3bb..d4ab5c1069256 100644
--- 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
index cc56c28eef082..f5d28db23e3f3 100644
--- 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
index 83bc08a54ab2e..1e34b435e930d 100644
--- 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
index ac18b45f17692..e055d210447d2 100644
--- 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
index 926b913a02115..a94be81fed82c 100644
--- 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
index b00a9dde69f8d..92f5eb7dc8139 100644
--- 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
index 5c62760a169ac..8a3886e52d0f3 100644
--- 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
index e1d66daa4aa81..0490bd84cf5d8 100644
--- 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
index 0352e31694190..6963f394ad16a 100644
--- 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
index e87dc97d99b03..b0a2efe32bd2b 100644
--- 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
index 611e12d4472c8..5d30f482df3a2 100644
--- 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/lib/private/Setup.php b/lib/private/Setup.php
index c190a47b53fa1..1e42fbfbeb598 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -265,7 +265,7 @@ public function install(array $options, ?IOutput $output = null): array {
 		$dbType = $options['dbtype'];
 
 		if (empty($options['adminlogin'])) {
-			$error[] = $l->t('Set an admin account name.');
+			$error[] = $l->t('Set an admin Login.');
 		}
 		if (empty($options['adminpass'])) {
 			$error[] = $l->t('Set an admin password.');
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 7fb5a1363dd2e..ef35ecef919d3 100644
--- a/lib/private/Setup/AbstractDatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
@@ -71,9 +71,9 @@ public function __construct(IL10N $trans, SystemConfig $config, LoggerInterface
 	public function validate($config) {
 		$errors = [];
 		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("Enter the database account name and name for %s", [$this->dbprettyname]);
+			$errors[] = $this->trans->t("Enter the database Login and name for %s", [$this->dbprettyname]);
 		} elseif (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("Enter the database account name for %s", [$this->dbprettyname]);
+			$errors[] = $this->trans->t("Enter the database Login for %s", [$this->dbprettyname]);
 		} elseif (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]);
 		}
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 754a56a99d977..29d0651cc6765 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -73,7 +73,7 @@ public function setupDatabase($username) {
 			$this->logger->error($e->getMessage(), [
 				'exception' => $e,
 			]);
-			throw new \OC\DatabaseSetupException($this->trans->t('MySQL account name and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('MySQL Login and/or password not valid'),
 				$this->trans->t('You need to enter details of an existing account.'), 0, $e);
 		}
 	}
diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php
index 25c7ce66a18c3..8c5fa333f707d 100644
--- a/lib/private/Setup/OCI.php
+++ b/lib/private/Setup/OCI.php
@@ -53,9 +53,9 @@ public function initialize($config) {
 	public function validate($config) {
 		$errors = [];
 		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("Enter the database account name and name for %s", [$this->dbprettyname]);
+			$errors[] = $this->trans->t("Enter the database Login and name for %s", [$this->dbprettyname]);
 		} elseif (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("Enter the database account name for %s", [$this->dbprettyname]);
+			$errors[] = $this->trans->t("Enter the database Login for %s", [$this->dbprettyname]);
 		} elseif (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]);
 		}
@@ -75,7 +75,7 @@ public function setupDatabase($username) {
 					. ' NLS_LANG=' . getenv('NLS_LANG')
 					. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable', 0, $e);
 			}
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle account name and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('Oracle Login and/or password not valid'),
 				'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
 				. ' ORACLE_SID=' . getenv('ORACLE_SID')
 				. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
index 9b2644ea432e7..84a978eab2010 100644
--- a/lib/private/Setup/PostgreSQL.php
+++ b/lib/private/Setup/PostgreSQL.php
@@ -114,7 +114,7 @@ public function setupDatabase($username) {
 			$this->logger->error($e->getMessage(), [
 				'exception' => $e,
 			]);
-			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL account name and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL Login and/or password not valid'),
 				$this->trans->t('You need to enter details of an existing account.'), 0, $e);
 		}
 	}
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 2fc3b3542c142..25a7507850325 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -456,7 +456,7 @@ public function createUserFromBackend($uid, $password, UserInterface $backend) {
 
 		// Check if user already exists
 		if ($this->userExists($uid)) {
-			throw new \InvalidArgumentException($l->t('The account name is already being used'));
+			throw new \InvalidArgumentException($l->t('The Login is already being used'));
 		}
 
 		/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
@@ -734,27 +734,27 @@ public function validateUserId(string $uid, bool $checkDataDirectory = false): v
 		// Check the name for bad characters
 		// Allowed are: "a-z", "A-Z", "0-9", spaces and "_.@-'"
 		if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
-			throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an account name:'
+			throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an Login:'
 				. ' "a-z", "A-Z", "0-9", spaces and "_.@-\'"'));
 		}
 
 		// No empty username
 		if (trim($uid) === '') {
-			throw new \InvalidArgumentException($l->t('A valid account name must be provided'));
+			throw new \InvalidArgumentException($l->t('A valid Login must be provided'));
 		}
 
 		// No whitespace at the beginning or at the end
 		if (trim($uid) !== $uid) {
-			throw new \InvalidArgumentException($l->t('Account name contains whitespace at the beginning or at the end'));
+			throw new \InvalidArgumentException($l->t('Login contains whitespace at the beginning or at the end'));
 		}
 
 		// Username only consists of 1 or 2 dots (directory traversal)
 		if ($uid === '.' || $uid === '..') {
-			throw new \InvalidArgumentException($l->t('Account name must not consist of dots only'));
+			throw new \InvalidArgumentException($l->t('Login must not consist of dots only'));
 		}
 
 		if (!$this->verifyUid($uid, $checkDataDirectory)) {
-			throw new \InvalidArgumentException($l->t('Account name is invalid because files already exist for this user'));
+			throw new \InvalidArgumentException($l->t('Login is invalid because files already exist for this user'));
 		}
 	}