Rename user to account in apps/settings

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) {

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);
 	}
 }

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

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');

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'));
 			}
 		}
 	}

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 {

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 {

apps/settings/src/components/AdminTwoFactor.vue

@@ -1,6 +1,6 @@
 <template>
 	<NcSettingsSection :title="t('settings', 'Two-Factor Authentication')"
-		:description="t('settings', 'Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')"
+		:description="t('settings', 'Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')"
 		:doc-url="twoFactorAdminDoc">
 		<p v-if="loading">
 			<span class="icon-loading-small two-factor-loading" />
@@ -48,7 +48,7 @@
 			<p class="top-margin">
 				<em>
 					<!-- this text is also found in the documentation. update it there as well if it ever changes -->
-					{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if a user has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If a user is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}
+					{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}
 				</em>
 			</p>
 		</template>

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.') }}
 		<div class="app-password-row">
-			<label for="app-username" class="app-password-label">{{ t('settings', 'Username') }}</label>
+			<label for="app-username" class="app-password-label">{{ t('settings', 'Account name') }}</label>
 			<input id="app-username"
 				:value="loginName"
 				type="text"

apps/settings/src/components/BasicSettings/BackgroundJob.vue

@@ -54,7 +54,7 @@
 			@update:checked="onBackgroundJobModeChanged">
 			{{ t('settings', 'AJAX') }}
 		</NcCheckboxRadioSwitch>
-		<em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single user instance.') }}</em>
+		<em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single account instance.') }}</em>
 
 		<NcCheckboxRadioSwitch type="radio"
 			:checked.sync="backgroundJobsMode"
@@ -63,7 +63,7 @@
 			@update:checked="onBackgroundJobModeChanged">
 			{{ t('settings', 'Webcron') }}
 		</NcCheckboxRadioSwitch>
-		<em>{{ 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).') }}</em>
+		<em>{{ 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).') }}</em>
 
 		<NcCheckboxRadioSwitch v-if="cliBasedCronPossible"
 			type="radio"
@@ -127,7 +127,7 @@ export default {
 		cronLabel() {
 			let desc = t('settings', 'Use system cron service to call the cron.php file every 5 minutes. Recommended for all instances.')
 			if (this.cliBasedCronPossible) {
-				desc += ' ' + t('settings', 'The cron.php needs to be executed by the system user "{user}".', { user: this.cliBasedCronUser })
+				desc += ' ' + t('settings', 'The cron.php needs to be executed by the system account "{user}".', { user: this.cliBasedCronUser })
 			}
 			return desc
 		},

apps/settings/src/components/BasicSettings/ProfileSettings.vue

@@ -28,7 +28,7 @@
 		</h2>
 
 		<p class="settings-hint">
-			{{ t('settings', 'Enable or disable profile by default for new users.') }}
+			{{ t('settings', 'Enable or disable profile by default for new accounts.') }}
 		</p>
 
 		<NcCheckboxRadioSwitch type="switch"

apps/settings/src/components/GroupListItem.vue

@@ -126,7 +126,7 @@ export default {
 			const self = this
 			// TODO migrate to a vue js confirm dialog component
 			OC.dialogs.confirm(
-				t('settings', 'You are about to remove the group {group}. The users will NOT be deleted.', { group: groupid }),
+				t('settings', 'You are about to remove the group {group}. The accounts will NOT be deleted.', { group: groupid }),
 				t('settings', 'Please confirm the group removal '),
 				function(success) {
 					if (success) {

apps/settings/src/components/UserList.vue

@@ -27,14 +27,14 @@
 				:disabled="loading.all"
 				class="modal__content"
 				@submit.prevent="createUser">
-				<h2>{{ t('settings','New user') }}</h2>
+				<h2>{{ t('settings','New account') }}</h2>
 				<input id="newusername"
 					ref="newusername"
 					v-model="newUser.id"
 					:disabled="settings.newUserGenerateUserID"
 					:placeholder="settings.newUserGenerateUserID
 						? t('settings', 'Will be autogenerated')
-						: t('settings', 'Username')"
+						: t('settings', 'Account name')"
 					autocapitalize="none"
 					autocomplete="off"
 					autocorrect="off"
@@ -88,7 +88,7 @@
 						:disabled="loading.groups||loading.all"
 						:multiple="true"
 						:options="canAddGroups"
-						:placeholder="t('settings', 'Add user to group')"
+						:placeholder="t('settings', 'Add account to group')"
 						:tag-width="60"
 						:taggable="true"
 						class="multiselect-vue"
@@ -108,7 +108,7 @@
 						:close-on-select="false"
 						:multiple="true"
 						:options="subAdminsGroups"
-						:placeholder="t('settings', 'Set user as admin for')"
+						:placeholder="t('settings', 'Set account as admin for')"
 						:tag-width="60"
 						class="multiselect-vue"
 						label="name"
@@ -120,7 +120,7 @@
 					<NcMultiselect v-model="newUser.quota"
 						:allow-empty="false"
 						:options="quotaOptions"
-						:placeholder="t('settings', 'Select user quota')"
+						:placeholder="t('settings', 'Select account quota')"
 						:taggable="true"
 						class="multiselect-vue"
 						label="label"
@@ -146,7 +146,7 @@
 						type="primary"
 						native-type="submit"
 						value="">
-						{{ t('settings', 'Add a new user') }}
+						{{ t('settings', 'Add a new account') }}
 					</NcButton>
 				</div>
 			</form>
@@ -156,7 +156,7 @@
 			class="row">
 			<div id="headerAvatar" class="avatar" />
 			<div id="headerName" class="name">
-				{{ t('settings', 'Username') }}
+				{{ t('settings', 'Account name') }}
 
 				<div class="subtitle">
 					{{ t('settings', 'Display name') }}
@@ -188,7 +188,7 @@
 			<div v-if="showConfig.showUserBackend || showConfig.showStoragePath"
 				class="headerUserBackend userBackend">
 				<div v-if="showConfig.showUserBackend" class="userBackend">
-					{{ t('settings', 'User backend') }}
+					{{ t('settings', 'Account backend') }}
 				</div>
 				<div v-if="showConfig.showStoragePath"
 					class="subtitle storageLocation">
@@ -224,7 +224,7 @@
 			<div slot="no-results">
 				<div id="emptycontent">
 					<div class="icon-contacts-dark" />
-					<h2>{{ t('settings', 'No users in here') }}</h2>
+					<h2>{{ t('settings', 'No accounts in here') }}</h2>
 				</div>
 			</div>
 		</InfiniteLoading>

apps/settings/src/components/UserList/UserRow.vue

@@ -37,7 +37,7 @@
 			{{ user.id }}
 		</div>
 		<div class="obfuscated">
-			{{ 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') }}
 		</div>
 	</div>
 
@@ -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 @@
 			<NcMultiselect :allow-empty="false"
 				:disabled="loading.quota||loading.all"
 				:options="quotaOptions"
-				:placeholder="t('settings', 'Select user quota')"
+				:placeholder="t('settings', 'Select account quota')"
 				:taggable="true"
 				:value="userQuota"
 				class="multiselect-vue"
@@ -328,7 +328,7 @@ export default {
 			const actions = [
 				{
 					icon: 'icon-delete',
-					text: t('settings', 'Delete user'),
+					text: t('settings', 'Delete account'),
 					action: this.deleteUser,
 				},
 				{
@@ -338,7 +338,7 @@ export default {
 				},
 				{
 					icon: this.user.enabled ? 'icon-close' : 'icon-add',
-					text: this.user.enabled ? t('settings', 'Disable user') : t('settings', 'Enable user'),
+					text: this.user.enabled ? t('settings', 'Disable account') : t('settings', 'Enable account'),
 					action: this.enableDisableUser,
 				},
 			]

apps/settings/src/components/UserList/UserRowSimple.vue

@@ -58,13 +58,13 @@
 			<div v-if="canEdit && !loading.all" class="toggleUserActions">
 				<NcActions>
 					<NcActionButton icon="icon-rename" @click="toggleEdit">
-						{{ t('settings', 'Edit User') }}
+						{{ t('settings', 'Edit account') }}
 					</NcActionButton>
 				</NcActions>
 				<div class="userPopoverMenuWrapper">
 					<button v-click-outside="hideMenu"
 						class="icon-more"
-						:aria-label="t('settings', 'Toggle user actions menu')"
+						:aria-label="t('settings', 'Toggle account actions menu')"
 						@click.prevent="toggleMenu" />
 					<div class="popovermenu" :class="{ 'open': openedMenu }" :aria-expanded="openedMenu">
 						<NcPopoverMenu :menu="userActions" />

apps/settings/src/constants/AccountPropertyConstants.js

@@ -175,14 +175,14 @@ export const SCOPE_PROPERTY_ENUM = Object.freeze({
 		name: SCOPE_ENUM.FEDERATED,
 		displayName: t('settings', 'Federated'),
 		tooltip: t('settings', 'Only synchronize to trusted servers'),
-		tooltipDisabled: t('settings', 'Not available as publishing user specific data to the lookup server is not allowed, contact your system administrator if you have any questions'),
+		tooltipDisabled: t('settings', 'Not available as publishing account specific data to the lookup server is not allowed, contact your system administrator if you have any questions'),
 		iconClass: 'icon-contacts-dark',
 	},
 	[SCOPE_ENUM.PUBLISHED]: {
 		name: SCOPE_ENUM.PUBLISHED,
 		displayName: t('settings', 'Published'),
 		tooltip: t('settings', 'Synchronize to trusted servers and the global and public address book'),
-		tooltipDisabled: t('settings', 'Not available as publishing user specific data to the lookup server is not allowed, contact your system administrator if you have any questions'),
+		tooltipDisabled: t('settings', 'Not available as publishing account specific data to the lookup server is not allowed, contact your system administrator if you have any questions'),
 		iconClass: 'icon-link',
 	},
 })

apps/settings/src/constants/ProfileConstants.js

@@ -41,7 +41,7 @@ export const VISIBILITY_PROPERTY_ENUM = Object.freeze({
 	},
 	[VISIBILITY_ENUM.SHOW_USERS_ONLY]: {
 		name: VISIBILITY_ENUM.SHOW_USERS_ONLY,
-		label: t('settings', 'Show to logged in users only'),
+		label: t('settings', 'Show to logged in accounts only'),
 	},
 	[VISIBILITY_ENUM.HIDE]: {
 		name: VISIBILITY_ENUM.HIDE,

apps/settings/src/views/Users.vue

@@ -24,7 +24,7 @@
 	<NcContent app-name="settings" :navigation-class="{ 'icon-loading': loadingAddGroup }">
 		<NcAppNavigation>
 			<NcAppNavigationNew button-id="new-user-button"
-				:text="t('settings','New user')"
+				:text="t('settings','New account')"
 				button-class="icon-add"
 				@click="showNewUserMenu"
 				@keyup.enter="showNewUserMenu"
@@ -41,7 +41,7 @@
 					@update:title="createGroup" />
 				<NcAppNavigationItem id="everyone"
 					:exact="true"
-					:title="t('settings', 'Active users')"
+					:title="t('settings', 'Active accounts')"
 					:to="{ name: 'users' }"
 					icon="icon-contacts-dark">
 					<NcAppNavigationCounter v-if="userCount > 0" slot="counter">
@@ -63,7 +63,7 @@
 				<NcAppNavigationItem v-if="disabledGroupMenu.usercount > 0 || disabledGroupMenu.usercount === -1"
 					id="disabled"
 					:exact="true"
-					:title="t('settings', 'Disabled users')"
+					:title="t('settings', 'Disabled accounts')"
 					:to="{ name: 'group', params: { selectedGroup: 'disabled' } }"
 					icon="icon-disabled-users">
 					<NcAppNavigationCounter v-if="disabledGroupMenu.usercount > 0" slot="counter">
@@ -112,7 +112,7 @@
 							v-model="showUserBackend"
 							type="checkbox"
 							class="checkbox">
-						<label for="showUserBackend">{{ t('settings', 'Show user backend') }}</label>
+						<label for="showUserBackend">{{ t('settings', 'Show account backend') }}</label>
 					</div>
 					<div>
 						<input id="showStoragePath"
@@ -127,7 +127,7 @@
 							:disabled="loadingSendMail"
 							type="checkbox"
 							class="checkbox">
-						<label for="sendWelcomeMail">{{ t('settings', 'Send email to new user') }}</label>
+						<label for="sendWelcomeMail">{{ t('settings', 'Send email to new account') }}</label>
 					</div>
 				</NcAppNavigationSettings>
 			</template>

apps/settings/templates/settings/admin/additional-mail.php

@@ -149,7 +149,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 Username'))?>"
+			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP account name'))?>"
 				   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']) ?>" />