diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index a25f0b0e59bf7..47aad698f1a2b 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 user supplied'), + 'message' => $this->l->t('No account name supplied'), ], ]); } @@ -214,7 +214,7 @@ public function changeUserPassword(string $username = null, string $password = n return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'), + 'message' => $this->l->t('Please provide an admin recovery password; otherwise, all account data will be lost.'), ] ]); } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) { @@ -240,7 +240,7 @@ public function changeUserPassword(string $username = null, string $password = n return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'), + 'message' => $this->l->t('Backend does not support password change, but the encryption of the account key was updated.'), ] ]); } elseif (!$result && !$recoveryEnabledForUser) { diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php index 22c0622a0722d..7680b23738d27 100644 --- a/apps/settings/lib/Controller/MailSettingsController.php +++ b/apps/settings/lib/Controller/MailSettingsController.php @@ -182,6 +182,6 @@ public function sendTestMail() { } $this->config->setAppValue('core', 'emailTestSuccessful', '0'); - return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST); + return new DataResponse($this->l10n->t('You need to set your account email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST); } } diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 6be93d6a3a03d..fd4cd2faccfd8 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -237,7 +237,7 @@ public function usersList(): TemplateResponse { $disabledUsersGroup = [ 'id' => 'disabled', - 'name' => 'Disabled users', + 'name' => 'Disabled accounts', 'usercount' => $disabledUsers ]; @@ -381,7 +381,7 @@ public function setUserSettings(?string $avatarScope = null, [ 'status' => 'error', 'data' => [ - 'message' => $this->l10n->t('Invalid user') + 'message' => $this->l10n->t('Invalid account') ] ], Http::STATUS_UNAUTHORIZED diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php index 50502ed1d3924..5d177fe0153bc 100644 --- a/apps/settings/lib/Mailer/NewUserMailHelper.php +++ b/apps/settings/lib/Mailer/NewUserMailHelper.php @@ -133,7 +133,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 username is: %s', [$userId])); + $emailTemplate->addBodyText($l10n->t('Your account name is: %s', [$userId])); } if ($generatePasswordResetToken) { $leftButtonText = $l10n->t('Set your password'); diff --git a/apps/settings/lib/Middleware/SubadminMiddleware.php b/apps/settings/lib/Middleware/SubadminMiddleware.php index c4f3ae3c7c2dd..91c80e9b3d2f9 100644 --- a/apps/settings/lib/Middleware/SubadminMiddleware.php +++ b/apps/settings/lib/Middleware/SubadminMiddleware.php @@ -67,7 +67,7 @@ public function __construct(ControllerMethodReflector $reflector, public function beforeController($controller, $methodName) { if (!$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->reflector->hasAnnotation('AuthorizedAdminSetting')) { if (!$this->isSubAdmin) { - throw new NotAdminException($this->l10n->t('Logged in user must be a subadmin')); + throw new NotAdminException($this->l10n->t('Logged in account must be a subadmin')); } } } diff --git a/apps/settings/lib/SetupChecks/CheckUserCertificates.php b/apps/settings/lib/SetupChecks/CheckUserCertificates.php index 52fea7b6551d7..d59346b9a495d 100644 --- a/apps/settings/lib/SetupChecks/CheckUserCertificates.php +++ b/apps/settings/lib/SetupChecks/CheckUserCertificates.php @@ -49,9 +49,9 @@ public function description(): string { return ''; } if ($this->configValue === 'not-run-yet') { - return $this->l10n->t('A background job is pending that checks for user imported SSL certificates. Please check back later.'); + return $this->l10n->t('A background job is pending that checks for administrator-imported SSL certificates. Please check back later.'); } - return $this->l10n->t('There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.'); + return $this->l10n->t('There are some user administrator-imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.'); } public function severity(): string { diff --git a/apps/settings/lib/SetupChecks/LdapInvalidUuids.php b/apps/settings/lib/SetupChecks/LdapInvalidUuids.php index 11b0105cada84..bf9521e00a9f9 100644 --- a/apps/settings/lib/SetupChecks/LdapInvalidUuids.php +++ b/apps/settings/lib/SetupChecks/LdapInvalidUuids.php @@ -48,7 +48,7 @@ public function __construct(IAppManager $appManager, IL10N $l10n, IServerContain } public function description(): string { - return $this->l10n->t('Invalid UUIDs of LDAP users or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.'); + return $this->l10n->t('Invalid UUIDs of LDAP accounts or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.'); } public function severity(): string { diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue index 950b857b07a08..0be369cdb2b93 100644 --- a/apps/settings/src/components/AdminTwoFactor.vue +++ b/apps/settings/src/components/AdminTwoFactor.vue @@ -1,6 +1,6 @@ diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue index 3eae5b389b973..58363d24df592 100644 --- a/apps/settings/src/components/AuthTokenSetupDialogue.vue +++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue @@ -38,7 +38,7 @@ {{ t('settings', 'Use the credentials below to configure your app or device.') }} {{ t('settings', 'For security reasons this password will only be shown once.') }}
- + {{ t('settings', 'AJAX') }} - {{ t('settings', 'Execute one task with each page loaded. Use case: Single user instance.') }} + {{ t('settings', 'Execute one task with each page loaded. Use case: Single account instance.') }} {{ t('settings', 'Webcron') }} - {{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 users depending on the usage).') }} + {{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 accounts depending on the usage).') }}

- {{ t('settings', 'Enable or disable profile by default for new users.') }} + {{ t('settings', 'Enable or disable profile by default for new accounts.') }}

-

{{ t('settings','New user') }}

+

{{ t('settings','New account') }}

- {{ t('settings', 'Add a new user') }} + {{ t('settings', 'Add a new account') }}
@@ -156,7 +156,7 @@ class="row">
- {{ t('settings', 'Username') }} + {{ t('settings', 'Account name') }}
{{ t('settings', 'Display name') }} @@ -188,7 +188,7 @@
- {{ t('settings', 'User backend') }} + {{ t('settings', 'Account backend') }}
@@ -224,7 +224,7 @@
-

{{ t('settings', 'No users in here') }}

+

{{ t('settings', 'No accounts in here') }}

diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue index 3254c17d4cea1..102a990093d12 100644 --- a/apps/settings/src/components/UserList/UserRow.vue +++ b/apps/settings/src/components/UserList/UserRow.vue @@ -37,7 +37,7 @@ {{ user.id }}
- {{ t('settings','You do not have permissions to see the details of this user') }} + {{ t('settings','You do not have permissions to see the details of this account') }}
@@ -139,7 +139,7 @@ :limit="2" :multiple="true" :options="availableGroups" - :placeholder="t('settings', 'Add user to group')" + :placeholder="t('settings', 'Add account to group')" :tag-width="60" :taggable="settings.isAdmin" :value="userGroups" @@ -161,7 +161,7 @@ :limit="2" :multiple="true" :options="subAdminsGroups" - :placeholder="t('settings', 'Set user as admin for')" + :placeholder="t('settings', 'Set account as admin for')" :tag-width="60" :value="userSubAdminsGroups" class="multiselect-vue" @@ -178,7 +178,7 @@ - {{ t('settings', 'Edit User') }} + {{ t('settings', 'Edit account') }}