aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Command/Maintenance/Install.php6
-rw-r--r--core/Command/User/Add.php16
-rw-r--r--core/Command/User/AuthTokens/Add.php8
-rw-r--r--core/Command/User/LastSeen.php2
-rw-r--r--core/Command/User/Report.php2
-rw-r--r--core/Command/User/ResetPassword.php2
-rw-r--r--core/Command/User/Setting.php2
-rw-r--r--core/Controller/LostController.php2
-rw-r--r--core/Controller/OCSController.php2
-rw-r--r--core/Controller/ProfileApiController.php6
-rw-r--r--core/Notification/CoreNotifier.php4
-rw-r--r--core/doc/user/index.html2
-rw-r--r--core/src/components/login/LoginForm.vue4
-rw-r--r--core/src/components/login/PasswordLessLoginForm.vue4
-rw-r--r--core/strings.php2
-rw-r--r--core/templates/installation.php4
-rw-r--r--core/templates/loginflow/authpicker.php4
-rw-r--r--core/templates/loginflowv2/authpicker.php4
-rw-r--r--core/templates/update.use-cli.php2
19 files changed, 39 insertions, 39 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 84ac34528f1..cc56c28eef0 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -64,10 +64,10 @@ class Install extends Command {
->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, 'User name to connect to the database')
+ ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'Account name 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, 'User name of the admin account', 'admin')
+ ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Account name 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");
@@ -150,7 +150,7 @@ class Install extends Command {
if ($db !== 'sqlite') {
if (is_null($dbUser)) {
- throw new InvalidArgumentException("Database user not provided.");
+ throw new InvalidArgumentException("Database account not provided.");
}
if (is_null($dbName)) {
throw new InvalidArgumentException("Database name not provided.");
diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php
index 5e8ab92070d..83bc08a54ab 100644
--- a/core/Command/User/Add.php
+++ b/core/Command/User/Add.php
@@ -49,11 +49,11 @@ class Add extends Command {
protected function configure() {
$this
->setName('user:add')
- ->setDescription('adds a user')
+ ->setDescription('adds an account')
->addArgument(
'uid',
InputArgument::REQUIRED,
- 'User ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
+ 'Account ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
)
->addOption(
'password-from-env',
@@ -65,20 +65,20 @@ class Add extends Command {
'display-name',
null,
InputOption::VALUE_OPTIONAL,
- 'User name used in the web UI (can contain any characters)'
+ 'Account name used in the web UI (can contain any characters)'
)
->addOption(
'group',
'g',
InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
- 'groups the user should be added to (The group will be created if it does not exist)'
+ 'groups the account should be added to (The group will be created if it does not exist)'
);
}
protected function execute(InputInterface $input, OutputInterface $output): int {
$uid = $input->getArgument('uid');
if ($this->userManager->userExists($uid)) {
- $output->writeln('<error>The user "' . $uid . '" already exists.</error>');
+ $output->writeln('<error>The account "' . $uid . '" already exists.</error>');
return 1;
}
@@ -121,9 +121,9 @@ class Add extends Command {
if ($user instanceof IUser) {
- $output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
+ $output->writeln('<info>The account "' . $user->getUID() . '" was created successfully</info>');
} else {
- $output->writeln('<error>An error occurred while creating the user</error>');
+ $output->writeln('<error>An error occurred while creating the account</error>');
return 1;
}
@@ -151,7 +151,7 @@ class Add extends Command {
}
if ($group instanceof IGroup) {
$group->addUser($user);
- $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+ $output->writeln('Account "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
}
}
return 0;
diff --git a/core/Command/User/AuthTokens/Add.php b/core/Command/User/AuthTokens/Add.php
index e067c069c79..ac18b45f176 100644
--- a/core/Command/User/AuthTokens/Add.php
+++ b/core/Command/User/AuthTokens/Add.php
@@ -54,11 +54,11 @@ class Add extends Command {
$this
->setName('user:auth-tokens:add')
->setAliases(['user:add-app-password'])
- ->setDescription('Add app password for the named user')
+ ->setDescription('Add app password for the named account')
->addArgument(
'user',
InputArgument::REQUIRED,
- 'Username to add app password for'
+ 'Account name to add app password for'
)
->addOption(
'password-from-env',
@@ -75,7 +75,7 @@ class Add extends Command {
$user = $this->userManager->get($username);
if (is_null($user)) {
- $output->writeln('<error>User does not exist</error>');
+ $output->writeln('<error>Account does not exist</error>');
return 1;
}
@@ -89,7 +89,7 @@ class Add extends Command {
/** @var QuestionHelper $helper */
$helper = $this->getHelper('question');
- $question = new Question('Enter the user password: ');
+ $question = new Question('Enter the account password: ');
$question->setHidden(true);
/** @var null|string $password */
$password = $helper->ask($input, $output, $question);
diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php
index 90ddb6992d9..5c6d44a2245 100644
--- a/core/Command/User/LastSeen.php
+++ b/core/Command/User/LastSeen.php
@@ -60,7 +60,7 @@ class LastSeen extends Base {
$lastLogin = $user->getLastLogin();
if ($lastLogin === 0) {
- $output->writeln('User ' . $user->getUID() .
+ $output->writeln('Account ' . $user->getUID() .
' has never logged in, yet.');
} else {
$date = new \DateTime();
diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php
index 74ab5c29cc1..b54ec2b0308 100644
--- a/core/Command/User/Report.php
+++ b/core/Command/User/Report.php
@@ -63,7 +63,7 @@ class Report extends Command {
protected function execute(InputInterface $input, OutputInterface $output): int {
$table = new Table($output);
- $table->setHeaders(['User Report', '']);
+ $table->setHeaders(['Account Report', '']);
$userCountArray = $this->countUsers();
$total = 0;
if (!empty($userCountArray)) {
diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php
index 6719f893be3..926b913a021 100644
--- a/core/Command/User/ResetPassword.php
+++ b/core/Command/User/ResetPassword.php
@@ -55,7 +55,7 @@ class ResetPassword extends Base {
->addArgument(
'user',
InputArgument::REQUIRED,
- 'Username to reset password'
+ 'Account name to reset password'
)
->addOption(
'password-from-env',
diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php
index 8a8736fdaa2..9134d174418 100644
--- a/core/Command/User/Setting.php
+++ b/core/Command/User/Setting.php
@@ -51,7 +51,7 @@ class Setting extends Base {
->addArgument(
'uid',
InputArgument::REQUIRED,
- 'User ID used to login'
+ 'Account ID used to login'
)
->addArgument(
'app',
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index d6b13a4cb96..2a0d374b552 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -318,7 +318,7 @@ class LostController extends Controller {
$user = $this->userManager->get($input);
if ($user instanceof IUser) {
if (!$user->isEnabled()) {
- throw new ResetPasswordException('User ' . $user->getUID() . ' is disabled');
+ throw new ResetPasswordException('Account ' . $user->getUID() . ' is disabled');
}
return $user;
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index ace9875130c..b0ab867f8d8 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -134,6 +134,6 @@ class OCSController extends \OCP\AppFramework\OCSController {
return new DataResponse($data);
}
- return new DataResponse(['User not found'], 404);
+ return new DataResponse(['Account not found'], 404);
}
}
diff --git a/core/Controller/ProfileApiController.php b/core/Controller/ProfileApiController.php
index 193102c20a7..1ffba071f2b 100644
--- a/core/Controller/ProfileApiController.php
+++ b/core/Controller/ProfileApiController.php
@@ -73,11 +73,11 @@ class ProfileApiController extends OCSController {
$targetUser = $this->userManager->get($targetUserId);
if (!$this->userManager->userExists($targetUserId)) {
- throw new OCSNotFoundException('User does not exist');
+ throw new OCSNotFoundException('Account does not exist');
}
if ($requestingUser !== $targetUser) {
- throw new OCSForbiddenException('Users can only edit their own visibility settings');
+ throw new OCSForbiddenException('People can only edit their own visibility settings');
}
// Ensure that a profile config is created in the database
@@ -85,7 +85,7 @@ class ProfileApiController extends OCSController {
$config = $this->configMapper->get($targetUserId);
if (!in_array($paramId, array_keys($config->getVisibilityMap()), true)) {
- throw new OCSBadRequestException('User does not have a profile parameter with ID: ' . $paramId);
+ throw new OCSBadRequestException('Account does not have a profile parameter with ID: ' . $paramId);
}
$config->setVisibility($paramId, $visibility);
diff --git a/core/Notification/CoreNotifier.php b/core/Notification/CoreNotifier.php
index de6182aad4c..0d10bf26954 100644
--- a/core/Notification/CoreNotifier.php
+++ b/core/Notification/CoreNotifier.php
@@ -77,8 +77,8 @@ class CoreNotifier implements INotifier {
}
if ($notification->getSubject() === 'user_limit_reached') {
- $notification->setParsedSubject($l->t('The user limit of this instance is reached.'));
- $notification->setParsedMessage($l->t('Enter your subscription key in the support app in order to increase the user limit. This does also grant you all additional benefits that Nextcloud Enterprise offers and is highly recommended for the operation in companies.'));
+ $notification->setParsedSubject($l->t('The account limit of this instance is reached.'));
+ $notification->setParsedMessage($l->t('Enter your subscription key in the support app in order to increase the account limit. This does also grant you all additional benefits that Nextcloud Enterprise offers and is highly recommended for the operation in companies.'));
$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
$action = $notification->createAction();
$label = $l->t('Learn more ↗');
diff --git a/core/doc/user/index.html b/core/doc/user/index.html
index 409495a42c9..d994b919c13 100644
--- a/core/doc/user/index.html
+++ b/core/doc/user/index.html
@@ -1,2 +1,2 @@
-Here goes the user documentation
+Here goes the usage documentation
In the meantime go to <a href="https://nextcloud.com/support/" target="_blank">nextcloud.com/support/</a>
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 9a8689dc9cc..b00a9dde69f 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -176,10 +176,10 @@ export default {
},
errorLabel() {
if (this.invalidPassword) {
- return t('core', 'Wrong username or password.')
+ return t('core', 'Wrong account name or password.')
}
if (this.userDisabled) {
- return t('core', 'User disabled')
+ return t('core', 'This account is disabled')
}
if (this.throttleDelay > 5000) {
return t('core', 'We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds.')
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index dbc4fdae695..5c62760a169 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', 'Username or email')"
- :placeholder="t('core', 'Username or email')"
+ :label="t('core', 'Account name or email')"
+ :placeholder="t('core', 'Account name or email')"
:helper-text="!validCredentials ? t('core', 'Your account is not setup for passwordless login.') : ''"
@update:value="changeUsername" />
diff --git a/core/strings.php b/core/strings.php
index 50051936eb0..973a255c879 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
//some strings that are used in /lib but won't be translatable unless they are in /core too
$l = \OCP\Util::getL10N('core');
$l->t("Personal");
-$l->t("Users");
+$l->t("Accounts");
$l->t("Apps");
$l->t("Admin");
$l->t("Help");
diff --git a/core/templates/installation.php b/core/templates/installation.php
index b5487d7b985..0352e316941 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -35,7 +35,7 @@ script('core', 'install');
<fieldset id="adminaccount">
<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
<p>
- <label for="adminlogin"><?php p($l->t('Username')); ?></label>
+ <label for="adminlogin"><?php p($l->t('Account name')); ?></label>
<input type="text" name="adminlogin" id="adminlogin"
value="<?php p($_['adminlogin']); ?>"
autocomplete="off" autocapitalize="none" spellcheck="false" autofocus required>
@@ -100,7 +100,7 @@ script('core', 'install');
<fieldset id='databaseField'>
<div id="use_other_db">
<p class="grouptop">
- <label for="dbuser"><?php p($l->t('Database user')); ?></label>
+ <label for="dbuser"><?php p($l->t('Database account')); ?></label>
<input type="text" name="dbuser" id="dbuser"
value="<?php p($_['dbuser']); ?>"
autocomplete="off" autocapitalize="none" spellcheck="false">
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php
index 3a3d7d0b035..e87dc97d99b 100644
--- a/core/templates/loginflow/authpicker.php
+++ b/core/templates/loginflow/authpicker.php
@@ -53,8 +53,8 @@ $urlGenerator = $_['urlGenerator'];
<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('Username')) ?>">
- <label for="user" class="infield"><?php p($l->t('Username')) ?></label>
+ <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>
</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 5cc6077b0c6..611e12d4472 100644
--- a/core/templates/loginflowv2/authpicker.php
+++ b/core/templates/loginflowv2/authpicker.php
@@ -53,8 +53,8 @@ $urlGenerator = $_['urlGenerator'];
<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('Username')) ?>">
- <label for="user" class="infield"><?php p($l->t('Username')) ?></label>
+ <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>
</p>
<p class="groupbottom">
<input type="password" name="password" id="password" placeholder="<?php p($l->t('App password')) ?>">
diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
index ae82436d2f1..36e348568c3 100644
--- a/core/templates/update.use-cli.php
+++ b/core/templates/update.use-cli.php
@@ -3,7 +3,7 @@
<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
<div class="text-left">
<?php if ($_['tooBig']) {
- p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
+ p($l->t('Please use the command line updater because you have a big instance with more than 50 accounts.'));
} else {
p($l->t('Please use the command line updater because updating via browser is disabled in your config.php.'));
} ?><br><br>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 16:33:20 +0000