Rename users to account or person

Replace translated texts in comments, files_sharing, core and lib.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

apps/comments/lib/Notification/Notifier.php

@@ -136,7 +136,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 				];
 
 				if ($isDeletedActor) {
-					$subject = $l->t('You were mentioned on "{file}", in a comment by a user that has since been deleted');
+					$subject = $l->t('You were mentioned on "{file}", in a comment by an account that has since been deleted');
 				} else {
 					$subject = $l->t('{user} mentioned you in a comment on "{file}"');
 					$subjectParameters['user'] = [

apps/comments/tests/Unit/Notification/NotifierTest.php

@@ -217,7 +217,7 @@ public function testPrepareSuccess() {
 
 	public function testPrepareSuccessDeletedUser() {
 		$fileName = 'Gre\'thor.odp';
-		$message = 'You were mentioned on "Gre\'thor.odp", in a comment by a user that has since been deleted';
+		$message = 'You were mentioned on "Gre\'thor.odp", in a comment by an account that has since been deleted';
 
 		/** @var Node|MockObject $node */
 		$node = $this->createMock(Node::class);
@@ -263,7 +263,7 @@ public function testPrepareSuccessDeletedUser() {
 		$this->notification
 			->expects($this->once())
 			->method('setRichSubject')
-			->with('You were mentioned on "{file}", in a comment by a user that has since been deleted', $this->anything())
+			->with('You were mentioned on "{file}", in a comment by an account that has since been deleted', $this->anything())
 			->willReturnSelf();
 		$this->notification
 			->expects($this->once())

apps/federation/appinfo/info.xml

@@ -3,8 +3,8 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>federation</id>
 	<name>Federation</name>
-	<summary>Federation allows you to connect with other trusted servers to exchange the user directory.</summary>
-	<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
+	<summary>Federation allows you to connect with other trusted servers to exchange the account directory.</summary>
+	<description>Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing.</description>
 	<version>1.15.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>

apps/federation/templates/settings-admin.php

@@ -8,7 +8,7 @@
 ?>
 <div id="ocFederationSettings" class="section">
 	<h2><?php p($l->t('Trusted servers')); ?></h2>
-	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')); ?></p>
 
 	<ul id="listOfTrustedServers">
 		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>

apps/files_sharing/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>File sharing</name>
 	<summary>File sharing</summary>
 	<description>
-		This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
+		This application enables people to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable people can then share files and folders with other people and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other people outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
 Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation.
 
 	</description>

apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -530,7 +530,7 @@ public function createShare(
 		if ($shareType === IShare::TYPE_USER) {
 			// Valid user is required to share
 			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+				throw new OCSNotFoundException($this->l->t('Please specify a valid person to share with'));
 			}
 			$share->setSharedWith($shareWith);
 			$share->setPermissions($permissions);
@@ -617,7 +617,7 @@ public function createShare(
 			}
 
 			if ($shareWith === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid federated user ID'));
+				throw new OCSNotFoundException($this->l->t('Please specify a valid federated account ID'));
 			}
 
 			$share->setSharedWith($shareWith);

apps/files_sharing/src/components/SharingEntryInternal.vue

@@ -74,9 +74,9 @@ export default {
 
 		internalLinkSubtitle() {
 			if (this.fileInfo.type === 'dir') {
-				return t('files_sharing', 'Only works for users with access to this folder')
+				return t('files_sharing', 'Only works for people with access to this folder')
 			}
-			return t('files_sharing', 'Only works for users with access to this file')
+			return t('files_sharing', 'Only works for people with access to this file')
 		},
 	},
 

apps/files_sharing/src/views/SharingInherited.vue

@@ -94,7 +94,7 @@ export default {
 		},
 		subTitle() {
 			return (this.showInheritedShares && this.shares.length === 0)
-				? t('files_sharing', 'No other users with access found')
+				? t('files_sharing', 'No other accounts with access found')
 				: ''
 		},
 		toggleTooltip() {

apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

@@ -1662,7 +1662,7 @@ public function testCreateShareInvalidPermissions() {
 
 	public function testCreateShareUserNoShareWith() {
 		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
-		$this->expectExceptionMessage('Please specify a valid user');
+		$this->expectExceptionMessage('Please specify a person to share with');
 
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);
@@ -1698,7 +1698,7 @@ public function testCreateShareUserNoShareWith() {
 
 	public function testCreateShareUserNoValidShareWith() {
 		$this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class);
-		$this->expectExceptionMessage('Please specify a valid user');
+		$this->expectExceptionMessage('Please specify a valid person to share with');
 
 		$share = $this->newShare();
 		$this->shareManager->method('newShare')->willReturn($share);

core/Command/Maintenance/Install.php

@@ -64,10 +64,10 @@ protected function configure() {
 			->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");
@@ -148,7 +148,7 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
 
 		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.");

core/Command/User/Add.php

@@ -55,7 +55,7 @@ protected function configure() {
 			->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',
@@ -67,7 +67,7 @@ protected function configure() {
 				'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',
@@ -153,7 +153,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			}
 			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;

core/Command/User/AddAppPassword.php

@@ -64,7 +64,7 @@ protected function configure() {
 			->addArgument(
 				'user',
 				InputArgument::REQUIRED,
-				'Username to add app password for'
+				'Account name to add app password for'
 			)
 			->addOption(
 				'password-from-env',

core/Command/User/LastSeen.php

@@ -61,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$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();

core/Command/User/Report.php

@@ -66,7 +66,7 @@ protected function configure(): void {
 
 	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)) {

core/Command/User/ResetPassword.php

@@ -57,7 +57,7 @@ protected function configure() {
 			->addArgument(
 				'user',
 				InputArgument::REQUIRED,
-				'Username to reset password'
+				'Account name to reset password'
 			)
 			->addOption(
 				'password-from-env',

core/Command/User/Setting.php

@@ -53,7 +53,7 @@ protected function configure() {
 			->addArgument(
 				'uid',
 				InputArgument::REQUIRED,
-				'User ID used to login'
+				'Account ID used to login'
 			)
 			->addArgument(
 				'app',

core/Controller/LostController.php

@@ -314,7 +314,7 @@ protected function findUserByIdOrMail(string $input): IUser {
 		$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;

core/Controller/OCSController.php

@@ -129,6 +129,6 @@ public function getIdentityProof(string $cloudId): DataResponse {
 			return new DataResponse($data);
 		}
 
-		return new DataResponse(['User not found'], 404);
+		return new DataResponse(['Account not found'], 404);
 	}
 }

core/Controller/ProfileApiController.php

@@ -67,19 +67,19 @@ public function setVisibility(string $targetUserId, string $paramId, string $vis
 		$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
 		$this->profileManager->getProfileConfig($targetUser, $targetUser);
 		$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);

core/Notification/CoreNotifier.php

@@ -78,8 +78,8 @@ public function prepare(INotification $notification, string $languageCode): INot
 		}
 
 		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 to increase the user limit. For more information about Nextcloud Enterprise see our website.'));
+			$notification->setParsedSubject($l->t('The account limit of this instance is reached.'));
+			$notification->setParsedMessage($l->t('Enter your subscription key to increase the account limit. For more information about Nextcloud Enterprise see our website.'));
 			$notification->setLink('https://nextcloud.com/enterprise/');
 			$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
 			return $notification;

core/js/setupchecks.js

@@ -225,7 +225,7 @@
 					}
 					if (data.suggestedOverwriteCliURL !== '') {
 						messages.push({
-							msg: t('core', 'Please make sure to set the "overwrite.cli.url" option in your config.php file to the URL that your users mainly use to access this Nextcloud. Suggestion: "{suggestedOverwriteCliURL}". Otherwise there might be problems with the URL generation via cron. (It is possible though that the suggested URL is not the URL that your users mainly use to access this Nextcloud. Best is to double check this in any case.)', {suggestedOverwriteCliURL: data.suggestedOverwriteCliURL}),
+							msg: t('core', 'Please make sure to set the "overwrite.cli.url" option in your config.php file to the URL that people mainly use to access this Nextcloud. Suggestion: "{suggestedOverwriteCliURL}". Otherwise there might be problems with the URL generation via cron. (It is possible though that the suggested URL is not the URL that people mainly use to access this Nextcloud. Best is to double check this in any case.)', {suggestedOverwriteCliURL: data.suggestedOverwriteCliURL}),
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						});
 					}
@@ -476,7 +476,7 @@
 							''
 						);
 						messages.push({
-							msg: t('core', 'Some app directories are owned by a different user than the web server one. ' +
+							msg: t('core', 'Some app directories are owned by a different account than the web server one. ' +
 									'This may be the case if apps have been installed manually. ' +
 									'Check the permissions of the following app directories:')
 									+ '<ul>' + appDirsWithDifferentOwner + '</ul>',

core/js/tests/specs/setupchecksSpec.js

@@ -623,7 +623,7 @@ describe('OC.SetupChecks tests', function() {
 
 			async.done(function( data, s, x ){
 				expect(data).toEqual([{
-					msg: 'Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:<ul><li>/some/path</li></ul>',
+					msg: 'Some app directories are owned by a different account than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:<ul><li>/some/path</li></ul>',
 					type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 				}]);
 				done();
@@ -1234,7 +1234,7 @@ describe('OC.SetupChecks tests', function() {
 			});
 		});
 
-		
+
 		it('should return an error if imagick is not enabled', function(done) {
 			var async = OC.SetupChecks.checkSetup();
 
@@ -1293,7 +1293,7 @@ describe('OC.SetupChecks tests', function() {
 			});
 		});
 
-		
+
 		it('should return an error if gmp or bcmath are not enabled', function(done) {
 			var async = OC.SetupChecks.checkSetup();
 

core/src/components/login/LoginForm.vue

@@ -171,10 +171,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 && 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.')

core/src/components/login/PasswordLessLoginForm.vue

@@ -6,15 +6,15 @@
 		@submit.prevent="submit">
 		<fieldset>
 			<p class="grouptop groupbottom">
-				<label for="user" class="infield">{{ t('core', 'Username or	email') }}</label>
+				<label for="user" class="infield">{{ t('core', 'Account name or email') }}</label>
 				<input id="user"
 					ref="user"
 					v-model="user"
 					type="text"
 					name="user"
 					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
-					:placeholder="t('core', 'Username or email')"
-					:aria-label="t('core', 'Username or email')"
+					:placeholder="t('core', 'Account name or email')"
+					:aria-label="t('core', 'Account name or email')"
 					required
 					@change="$emit('update:username', user)">
 			</p>

core/strings.php

@@ -27,7 +27,7 @@
 //some strings that are used in /lib but won't be translatable unless they are in /core too
 $l = \OC::$server->getL10N('core');
 $l->t("Personal");
-$l->t("Users");
+$l->t("Accounts");
 $l->t("Apps");
 $l->t("Admin");
 $l->t("Help");

core/templates/installation.php

@@ -36,10 +36,10 @@
 		<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
 		<p class="grouptop">
 			<input type="text" name="adminlogin" id="adminlogin"
-				placeholder="<?php p($l->t('Username')); ?>"
+				placeholder="<?php p($l->t('Account name')); ?>"
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required>
-			<label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label>
+			<label for="adminlogin" class="infield"><?php p($l->t('Account name')); ?></label>
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
@@ -102,9 +102,9 @@
 		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="grouptop">
-				<label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label>
+				<label for="dbuser" class="infield"><?php p($l->t('Database account')); ?></label>
 				<input type="text" name="dbuser" id="dbuser"
-					placeholder="<?php p($l->t('Database user')); ?>"
+					placeholder="<?php p($l->t('Database account')); ?>"
 					value="<?php p($_['dbuser']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 			</p>

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('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 token')) ?>">