Rename users to account or person

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

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

Author: PVince81

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.");