Re-add language changes

...after rebase due to too complex conflict resolution during rebase

Co-authored-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
Co-authored-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

apps/dav/src/views/Availability.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<NcSettingsSection :name="$t('dav', 'Availability')"
-			:description="$t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.')">
+			:description="$t('dav', 'If you configure your working hours, other people will see when you are out of office when they book a meeting.')">
 			<AvailabilityForm />
 		</NcSettingsSection>
 		<NcSettingsSection v-if="!hideAbsenceSettings"

apps/files_external/templates/settings.php

@@ -108,7 +108,7 @@ function writeParameterInput($parameter, $options, $classes = []) {
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" data-can-create-local="<?php echo $canCreateNewLocalStorage?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
 	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow people to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
 		print_unescaped(''.$_['dependencies'].'');
 	} ?>
@@ -171,7 +171,7 @@ function writeParameterInput($parameter, $options, $classes = []) {
 				<td class="configuration"></td>
 				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 					<td class="applicable" align="right">
-						<label><input type="checkbox" class="applicableToAllUsers" checked="" /><?php p($l->t('All users')); ?></label>
+						<label><input type="checkbox" class="applicableToAllUsers" checked="" /><?php p($l->t('All people')); ?></label>
 						<div class="applicableUsersContainer">
 							<input type="hidden" class="applicableUsers" style="width:20em;" value="" />
 						</div>
@@ -193,7 +193,7 @@ function writeParameterInput($parameter, $options, $classes = []) {
 			value="1" <?php if ($_['allowUserMounting']) {
 				print_unescaped(' checked="checked"');
 			} ?> />
-		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
+		<label for="allowUserMounting"><?php p($l->t('Allow people to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
 			<?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('Username')) ?>"/>
+			   placeholder="<?php p($l->t('Account name')) ?>"/>
 		<input type="password" name="password"
 			   autocomplete="false"
 			   value="<?php p($_['globalCredentials']['password']); ?>"

apps/files_versions/lib/Command/ExpireVersions.php

@@ -50,7 +50,7 @@ protected function configure(): void {
 			->addArgument(
 				'user_id',
 				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+				'expire file versions of the given account(s), if no account is given file versions for all accounts will be expired.'
 			);
 	}
 
@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		if (!empty($users)) {
 			foreach ($users as $user) {
 				if (!$this->userManager->userExists($user)) {
-					$output->writeln("<error>Unknown user $user</error>");
+					$output->writeln("<error>Unknown account $user</error>");
 					return self::FAILURE;
 				}
 

apps/settings/lib/SetupChecks/CheckUserCertificates.php

@@ -46,7 +46,7 @@ public function getCategory(): string {
 	}
 
 	public function getName(): string {
-		return $this->l10n->t('Old user imported certificates');
+		return $this->l10n->t('Old administration imported certificates');
 	}
 
 	public function run(): SetupResult {
@@ -55,8 +55,8 @@ public function run(): SetupResult {
 			return SetupResult::success();
 		}
 		if ($this->configValue === 'not-run-yet') {
-			return SetupResult::info($this->l10n->t('A background job is pending that checks for user imported SSL certificates. Please check back later.'));
+			return SetupResult::info($this->l10n->t('A background job is pending that checks for administration imported SSL certificates. Please check back later.'));
 		}
-		return SetupResult::error($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 SetupResult::error($this->l10n->t('There are some administration 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.'));
 	}
 }

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', 'Username')" :value="loginName" readonly />
+			<NcTextField :label="t('settings', 'Account name')" :value="loginName" readonly />
 			<NcButton type="tertiary"
 				:title="copyLoginNameLabel"
 				:aria-label="copyLoginNameLabel"

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 type="radio"
 			:disabled="!cliBasedCronPossible"
@@ -121,7 +121,7 @@ export default {
 		cronLabel() {
 			let desc = t('settings', 'Use system cron service to call the cron.php file every 5 minutes.')
 			if (this.cliBasedCronPossible) {
-				desc += '<br>' + t('settings', 'The cron.php needs to be executed by the system user "{user}".', { user: this.cliBasedCronUser })
+				desc += '<br>' + t('settings', 'The cron.php needs to be executed by the system account "{user}".', { user: this.cliBasedCronUser })
 			} else {
 				desc += '<br>' + t('settings', 'The PHP POSIX extension is required. See {linkstart}PHP documentation{linkend} for more details.', {
 					linkstart: '<a target="_blank" rel="noreferrer nofollow" class="external" href="https://www.php.net/manual/en/book.posix.php">',

apps/settings/src/components/GroupListItem.vue

@@ -30,7 +30,7 @@
 				</h2>
 				<NcNoteCard type="warning"
 					show-alert>
-					{{ t('settings', 'You are about to remove the group "{group}". The users will NOT be deleted.', { group: name }) }}
+					{{ t('settings', 'You are about to remove the group "{group}". The accounts will NOT be deleted.', { group: name }) }}
 				</NcNoteCard>
 				<div class="modal__button-row">
 					<NcButton type="secondary"

apps/settings/src/components/UserList.vue

@@ -31,10 +31,10 @@
 
 		<NcEmptyContent v-if="filteredUsers.length === 0"
 			class="empty"
-			:name="isInitialLoad && loading.users ? null : t('settings', 'No users')">
+			:name="isInitialLoad && loading.users ? null : t('settings', 'No accounts')">
 			<template #icon>
 				<NcLoadingIcon v-if="isInitialLoad && loading.users"
-					:name="t('settings', 'Loading users …')"
+					:name="t('settings', 'Loading accounts …')"
 					:size="64" />
 				<NcIconSvgWrapper v-else
 					:svg="usersSvg" />
@@ -61,7 +61,7 @@
 			@scroll-end="handleScrollEnd">
 			<template #before>
 				<caption class="hidden-visually">
-					{{ t('settings', 'List of users. This list is not fully rendered for performance reasons. The users will be rendered as you navigate through the list.') }}
+					{{ t('settings', 'List of accounts. This list is not fully rendered for performance reasons. The accounts will be rendered as you navigate through the list.') }}
 				</caption>
 			</template>
 
@@ -320,8 +320,8 @@ export default {
 				}
 				logger.debug(`${this.users.length} total user(s) loaded`)
 			} catch (error) {
-				logger.error('Failed to load users', { error })
-				showError('Failed to load users')
+				logger.error('Failed to load accounts', { error })
+				showError('Failed to load accounts')
 			}
 			this.loading.users = false
 			this.isInitialLoad = false
@@ -368,7 +368,7 @@ export default {
 
 		setNewUserDefaultGroup(value) {
 			if (value && value.length > 0) {
-				// setting new user default group to the current selected one
+				// setting new account default group to the current selected one
 				const currentGroup = this.groups.find(group => group.id === value)
 				if (currentGroup) {
 					this.newUser.groups = [currentGroup]

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

@@ -28,7 +28,7 @@
 		:data-cy-user-row="user.id">
 		<td class="row__cell row__cell--avatar" data-cy-user-list-cell-avatar>
 			<NcLoadingIcon v-if="isLoadingUser"
-				:name="t('settings', 'Loading user …')"
+				:name="t('settings', 'Loading account …')"
 				:size="32" />
 			<NcAvatar v-else-if="visible"
 				disable-menu
@@ -87,7 +87,7 @@
 					@trailing-button-click="updatePassword" />
 			</template>
 			<span v-else-if="isObfuscated">
-				{{ 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') }}
 			</span>
 		</td>
 
@@ -130,7 +130,7 @@
 					:multiple="true"
 					:append-to-body="false"
 					:options="availableGroups"
-					:placeholder="t('settings', 'Add user to group')"
+					:placeholder="t('settings', 'Add account to group')"
 					:taggable="settings.isAdmin"
 					:value="userGroups"
 					label="name"
@@ -152,7 +152,7 @@
 			<template v-if="editing && settings.isAdmin && subAdminsGroups.length > 0">
 				<label class="hidden-visually"
 					:for="'subadmins' + uniqueId">
-					{{ t('settings', 'Set user as admin for') }}
+					{{ t('settings', 'Set account as admin for') }}
 				</label>
 				<NcSelect data-cy-user-list-input-subadmins
 					:data-loading="loading.subadmins || undefined"
@@ -165,7 +165,7 @@
 					:multiple="true"
 					:no-wrap="true"
 					:options="subAdminsGroups"
-					:placeholder="t('settings', 'Set user as admin for')"
+					:placeholder="t('settings', 'Set account as admin for')"
 					:value="userSubAdminsGroups"
 					@option:deselected="removeUserSubAdmin"
 					@option:selected="options => addUserSubAdmin(options.at(-1))" />
@@ -180,7 +180,7 @@
 			<template v-if="editing">
 				<label class="hidden-visually"
 					:for="'quota' + uniqueId">
-					{{ t('settings', 'Select user quota') }}
+					{{ t('settings', 'Select account quota') }}
 				</label>
 				<NcSelect v-model="editedUserQuota"
 					:close-on-select="true"
@@ -193,7 +193,7 @@
 					:clearable="false"
 					:input-id="'quota' + uniqueId"
 					:options="quotaOptions"
-					:placeholder="t('settings', 'Select user quota')"
+					:placeholder="t('settings', 'Select account quota')"
 					:taggable="true"
 					@option:selected="setUserQuota" />
 			</template>
@@ -398,8 +398,8 @@ export default {
 
 	computed: {
 		managerLabel() {
-			// TRANSLATORS This string describes a manager in the context of an organization
-			return t('settings', 'Set user manager')
+			// TRANSLATORS This string describes a person's manager in the context of an organization
+			return t('settings', 'Set line manager')
 		},
 
 		isObfuscated() {
@@ -469,7 +469,7 @@ export default {
 			const actions = [
 				{
 					icon: 'icon-delete',
-					text: t('settings', 'Delete user'),
+					text: t('settings', 'Delete account'),
 					action: this.deleteUser,
 				},
 				{
@@ -479,7 +479,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,
 				},
 			]
@@ -586,8 +586,8 @@ export default {
 					value: this.currentManager ? this.currentManager.id : '',
 				})
 			} catch (error) {
-				// TRANSLATORS This string describes a manager in the context of an organization
-				showError(t('setting', 'Failed to update user manager'))
+				// TRANSLATORS This string describes a line manager in the context of an organization
+				showError(t('setting', 'Failed to update line manager'))
 				console.error(error)
 			} finally {
 				this.loading.manager = false

apps/settings/src/components/Users/UserRowActions.vue

@@ -22,7 +22,7 @@
 -->
 
 <template>
-	<NcActions :aria-label="t('settings', 'Toggle user actions menu')"
+	<NcActions :aria-label="t('settings', 'Toggle account actions menu')"
 		:disabled="disabled"
 		:inline="1">
 		<NcActionButton :data-cy-user-list-action-toggle-edit="`${edit}`"

apps/settings/src/views/Users.vue

@@ -23,9 +23,9 @@
 <template>
 	<Fragment>
 		<NcContent app-name="settings">
-			<NcAppNavigation :aria-label="t('settings', 'User management')">
+			<NcAppNavigation :aria-label="t('settings', 'Account management')">
 				<NcAppNavigationNew button-id="new-user-button"
-					:text="t('settings','New user')"
+					:text="t('settings','New account')"
 					@click="showNewUserMenu"
 					@keyup.enter="showNewUserMenu"
 					@keyup.space="showNewUserMenu">
@@ -37,7 +37,7 @@
 				<template #list>
 					<NcAppNavigationItem id="everyone"
 						:exact="true"
-						:name="t('settings', 'Active users')"
+						:name="t('settings', 'Active accounts')"
 						:to="{ name: 'users' }">
 						<template #icon>
 							<AccountGroup :size="20" />
@@ -117,7 +117,7 @@
 
 				<template #footer>
 					<ul class="app-navigation-entry__settings">
-						<NcAppNavigationItem :name="t('settings', 'User management settings')"
+						<NcAppNavigationItem :name="t('settings', 'Account management settings')"
 							@click="isDialogOpen = true">
 							<template #icon>
 								<Cog :size="20" />
@@ -214,13 +214,13 @@ export default {
 	computed: {
 		pageHeading() {
 			if (this.selectedGroupDecoded === null) {
-				return t('settings', 'Active users')
+				return t('settings', 'Active accounts')
 			}
 			const matchHeading = {
 				admin: t('settings', 'Admins'),
-				disabled: t('settings', 'Disabled users'),
+				disabled: t('settings', 'Disabled accounts'),
 			}
-			return matchHeading[this.selectedGroupDecoded] ?? t('settings', 'User group: {group}', { group: this.selectedGroupDecoded })
+			return matchHeading[this.selectedGroupDecoded] ?? t('settings', 'Account group: {group}', { group: this.selectedGroupDecoded })
 		},
 
 		showConfig() {

apps/settings/templates/help.php

@@ -12,7 +12,7 @@
 				} ?>
 					href="<?php print_unescaped($_['urlUserDocs']); ?>">
 					<span class="help-list__text">
-						<?php p($l->t('User documentation')); ?>
+						<?php p($l->t('Account documentation')); ?>
 					</span>
 				</a>
 			</li>
@@ -25,7 +25,7 @@
 				} ?>
 					href="<?php print_unescaped($_['urlAdminDocs']); ?>">
 					<span class="help-list__text">
-						<?php p($l->t('Administrator documentation')); ?>
+						<?php p($l->t('Administration documentation')); ?>
 					</span>
 				</a>
 			</li>

apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php

@@ -54,7 +54,7 @@ public function run(): SetupResult {
 			&& count($this->groupMapping->getList(0, 1, true)) === 0) {
 			return SetupResult::success($this->l10n->t('None found'));
 		} else {
-			return SetupResult::warning($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 SetupResult::warning($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.'));
 		}
 	}
 }

core/Command/User/Add.php

@@ -49,7 +49,7 @@ public function __construct(
 	protected function configure() {
 		$this
 			->setName('user:add')
-			->setDescription('adds a user')
+			->setDescription('adds an account')
 			->addArgument(
 				'uid',
 				InputArgument::REQUIRED,
@@ -71,14 +71,14 @@ protected function configure() {
 				'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 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 
 		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;
 		}