Rename users to account or person

Replace translated text in most locations

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/contactsinteraction/appinfo/info.xml

@@ -3,8 +3,8 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>contactsinteraction</id>
 	<name>Contacts Interaction</name>
-	<summary>Manages interaction between users and contacts</summary>
-	<description>Collect data about user and contacts interactions and provide an address book for the data</description>
+	<summary>Manages interaction between accounts and contacts</summary>
+	<description>Collect data about accounts and contacts interactions and provide an address book for the data</description>
 	<version>1.6.0</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>

apps/dashboard/appinfo/info.xml

@@ -8,7 +8,7 @@
 
 The Nextcloud Dashboard is your starting point of the day, giving you an
 overview of your upcoming appointments, urgent emails, chat messages,
-incoming tickets, latest tweets and much more! Users can add the widgets
+incoming tickets, latest tweets and much more! People can add the widgets
 they like and change the background to their liking.]]></description>
 	<version>7.5.0</version>
 	<licence>agpl</licence>

apps/dav/src/views/Availability.vue

@@ -1,6 +1,6 @@
 <template>
 	<NcSettingsSection :title="$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.')">
 		<div class="time-zone">
 			<strong>
 				{{ $t('dav', 'Time zone:') }}

apps/encryption/templates/settings-admin.php

@@ -24,7 +24,7 @@
 				<span class="msg"></span>
 				<br/>
 				<em>
-					<?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.")) ?>
+					<?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows the recovery of an account's files in case its password was forgotten.")) ?>
 				</em>
 				<br/>
 				<input type="password"

apps/federatedfilesharing/lib/FederatedShareProvider.php

@@ -193,7 +193,7 @@ public function create(IShare $share) {
 		$alreadySharedGroup = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE_GROUP, $share->getNode(), 1, 0);
 		if (!empty($alreadyShared) || !empty($alreadySharedGroup)) {
 			$message = 'Sharing %1$s failed, because this item is already shared with %2$s';
-			$message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with user %2$s', [$share->getNode()->getName(), $shareWith]);
+			$message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with account %2$s', [$share->getNode()->getName(), $shareWith]);
 			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
 			throw new \Exception($message_t);
 		}
@@ -204,8 +204,8 @@ public function create(IShare $share) {
 		$currentServer = $this->addressHandler->generateRemoteURL();
 		$currentUser = $sharedBy;
 		if ($this->addressHandler->compareAddresses($cloudId->getUser(), $cloudId->getRemote(), $currentUser, $currentServer)) {
-			$message = 'Not allowed to create a federated share with the same user.';
-			$message_t = $this->l->t('Not allowed to create a federated share with the same user');
+			$message = 'Not allowed to create a federated share to the same account.';
+			$message_t = $this->l->t('Not allowed to create a federated share to the same account');
 			$this->logger->debug($message, ['app' => 'Federated File Sharing']);
 			throw new \Exception($message_t);
 		}

apps/federatedfilesharing/src/components/AdminSettings.vue

@@ -22,44 +22,44 @@
 
 <template>
 	<NcSettingsSection :title="t('federatedfilesharing', 'Federated Cloud Sharing')"
-		:description="t('federatedfilesharing', 'Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing.')"
+		:description="t('federatedfilesharing', 'Adjust how people can share between servers. This includes shares between people on this server as well if they are using federated sharing.')"
 		:doc-url="sharingFederatedDocUrl">
 		<NcCheckboxRadioSwitch type="switch"
 			:checked.sync="outgoingServer2serverShareEnabled"
 			@update:checked="update('outgoing_server2server_share_enabled', outgoingServer2serverShareEnabled)">
-			{{ t('federatedfilesharing', 'Allow users on this server to send shares to other servers (this option also allows WebDAV access to public shares)') }}
+			{{ t('federatedfilesharing', 'Allow people on this server to send shares to other servers (this option also allows WebDAV access to public shares)') }}
 		</NcCheckboxRadioSwitch>
 
 		<NcCheckboxRadioSwitch type="switch"
 			:checked.sync="incomingServer2serverShareEnabled"
 			@update:checked="update('incoming_server2server_share_enabled', incomingServer2serverShareEnabled)">
-			{{ t('federatedfilesharing', 'Allow users on this server to receive shares from other servers') }}
+			{{ t('federatedfilesharing', 'Allow people on this server to receive shares from other servers') }}
 		</NcCheckboxRadioSwitch>
 
 		<NcCheckboxRadioSwitch v-if="federatedGroupSharingSupported"
 			type="switch"
 			:checked.sync="outgoingServer2serverGroupShareEnabled"
 			@update:checked="update('outgoing_server2server_group_share_enabled', outgoingServer2serverGroupShareEnabled)">
-			{{ t('federatedfilesharing', 'Allow users on this server to send shares to groups on other servers') }}
+			{{ t('federatedfilesharing', 'Allow people on this server to send shares to groups on other servers') }}
 		</NcCheckboxRadioSwitch>
 
 		<NcCheckboxRadioSwitch v-if="federatedGroupSharingSupported"
 			type="switch"
 			:checked.sync="incomingServer2serverGroupShareEnabled"
 			@update:checked="update('incoming_server2server_group_share_enabled', incomingServer2serverGroupShareEnabled)">
-			{{ t('federatedfilesharing', 'Allow users on this server to receive group shares from other servers') }}
+			{{ t('federatedfilesharing', 'Allow people on this server to receive group shares from other servers') }}
 		</NcCheckboxRadioSwitch>
 
 		<NcCheckboxRadioSwitch type="switch"
 			:checked.sync="lookupServerEnabled"
 			@update:checked="update('lookupServerEnabled', lookupServerEnabled)">
-			{{ t('federatedfilesharing', 'Search global and public address book for users') }}
+			{{ t('federatedfilesharing', 'Search global and public address book for people') }}
 		</NcCheckboxRadioSwitch>
 
 		<NcCheckboxRadioSwitch type="switch"
 			:checked.sync="lookupServerUploadEnabled"
 			@update:checked="update('lookupServerUploadEnabled', lookupServerUploadEnabled)">
-			{{ t('federatedfilesharing', 'Allow users to publish their data to a global and public address book') }}
+			{{ t('federatedfilesharing', 'Allow people to publish their data to a global and public address book') }}
 		</NcCheckboxRadioSwitch>
 	</NcSettingsSection>
 </template>

apps/federatedfilesharing/tests/FederatedShareProviderTest.php

@@ -398,7 +398,7 @@ public function testCreateShareWithSelf() {
 			$share = $this->provider->create($share);
 			$this->fail();
 		} catch (\Exception $e) {
-			$this->assertEquals('Not allowed to create a federated share with the same user', $e->getMessage());
+			$this->assertEquals('Not allowed to create a federated share to the same account', $e->getMessage());
 		}
 
 		$qb = $this->connection->getQueryBuilder();
@@ -460,7 +460,7 @@ public function testCreateAlreadyShared() {
 		try {
 			$this->provider->create($share);
 		} catch (\Exception $e) {
-			$this->assertEquals('Sharing myFile failed, because this item is already shared with user user@server.com', $e->getMessage());
+			$this->assertEquals('Sharing myFile failed, because this item is already shared with account user@server.com', $e->getMessage());
 		}
 	}
 

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>