Rename user to account/people in various apps

Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>

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 [email protected]', $e->getMessage());
+			$this->assertEquals('Sharing myFile failed, because this item is already shared with account [email protected]', $e->getMessage());
 		}
 	}
 

apps/files/js/mainfileinfodetailview.js

@@ -77,7 +77,7 @@
 					.tooltip('show');
 				_.delay(function() {
 					$el.tooltip('hide');
-					$el.attr('data-original-title', t('files', 'Copy direct link (only works for users who have access to this file/folder)'))
+					$el.attr('data-original-title', t('files', 'Copy direct link (only works for people who have access to this file/folder)'))
 						.tooltip('_fixTitle');
 				}, 3000);
 			});
@@ -176,7 +176,7 @@
 					starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'),
 					starClass: isFavorite ? 'icon-starred' : 'icon-star',
 					permalink: this._makePermalink(this.model.get('id')),
-					permalinkTitle: t('files', 'Copy direct link (only works for users who have access to this file/folder)')
+					permalinkTitle: t('files', 'Copy direct link (only works for people who have access to this file/folder)')
 				}));
 
 				// TODO: we really need OC.Previews

apps/files/lib/Activity/Provider.php

@@ -165,7 +165,7 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
 
 		if (!isset($parsedParameters['user'])) {
 			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+			$subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);
@@ -283,7 +283,7 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
 
 		if (!isset($parsedParameters['user'])) {
 			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+			$subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);

apps/files/src/components/TransferOwnershipDialogue.vue

@@ -42,7 +42,7 @@
 					:options="formatedUserSuggestions"
 					:multiple="false"
 					:searchable="true"
-					:placeholder="t('files', 'Search users')"
+					:placeholder="t('files', 'Search people')"
 					:preselect-first="true"
 					:preserve-search="true"
 					:loading="loadingUsers"

apps/files_sharing/src/components/PersonalSettings.vue

@@ -29,7 +29,7 @@
 				class="checkbox"
 				type="checkbox"
 				@change="toggleEnabled">
-			<label for="files-sharing-personal-settings-accept">{{ t('files_sharing', 'Accept user and group shares by default') }}</label>
+			<label for="files-sharing-personal-settings-accept">{{ t('files_sharing', 'Accept shares from other accounts and groups by default') }}</label>
 		</p>
 		<p v-if="allowCustomDirectory">
 			<SelectShareFolderDialogue />

apps/files_trashbin/appinfo/info.xml

@@ -3,10 +3,10 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>files_trashbin</id>
 	<name>Deleted files</name>
-	<summary>This application enables users to restore files that were deleted from the system.</summary>
+	<summary>This application enables people to restore files that were deleted from the system.</summary>
 	<description>
-This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.
-To prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation.
+This application enables people to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the people file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.
+To prevent an account from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation.
 
 	</description>
 	<version>1.15.0</version>

apps/files_versions/appinfo/info.xml

@@ -5,8 +5,8 @@
 	<name>Versions</name>
 	<summary>This application automatically maintains older versions of files that are changed.</summary>
 	<description>
-		This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user does not run out of Quota because of versions.
-		In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
+		This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the account does not run out of Quota because of versions.
+		In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the account's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
 	</description>
 	<version>1.18.0</version>
 	<licence>agpl</licence>

apps/files_versions/lib/Command/ExpireVersions.php

@@ -62,11 +62,11 @@ public function __construct(IUserManager $userManager,
 	protected function configure() {
 		$this
 			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
+			->setDescription('Expires the account\'s file versions')
 			->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.'
 			);
 	}
 
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$userObject = $this->userManager->get($user);
 					$this->expireVersionsForUser($userObject);
 				} else {
-					$output->writeln("<error>Unknown user $user</error>");
+					$output->writeln("<error>Unknown account $user</error>");
 					return 1;
 				}
 			}

apps/lookup_server_connector/appinfo/info.xml

@@ -3,8 +3,8 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>lookup_server_connector</id>
 	<name>Lookup Server Connector</name>
-	<summary>Sync public user information with the lookup server</summary>
-	<description>Sync public user information with the lookup server</description>
+	<summary>Sync public account information with the lookup server</summary>
+	<description>Sync public account information with the lookup server</description>
 	<version>1.13.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>

apps/provisioning_api/appinfo/info.xml

@@ -3,10 +3,10 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>provisioning_api</id>
 	<name>Provisioning API</name>
-	<summary>This application enables a set of APIs that external systems can use to manage users, groups and apps.</summary>
+	<summary>This application enables a set of APIs that external systems can use to manage accounts, groups and apps.</summary>
 	<description>
-		This application enables a set of APIs that external systems can use to create, edit, delete and query user
-		attributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users
+		This application enables a set of APIs that external systems can use to create, edit, delete and query account
+		attributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin accounts
 		can also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables
 		an admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely.
 		Once the app is enabled, HTTP requests can be used via a Basic Auth header to perform any of the functions

apps/provisioning_api/lib/Controller/AppConfigController.php

@@ -140,7 +140,7 @@ public function setValue(string $app, string $key, string $value): DataResponse
 		}
 
 		if (!$this->isAllowedToChangedKey($user, $app, $key)) {
-			throw new NotAdminException($this->l10n->t('Logged in user must be an administrator or have authorization to edit this setting.'));
+			throw new NotAdminException($this->l10n->t('Logged in account must be an administrator or have authorization to edit this setting.'));
 		}
 
 		try {

apps/provisioning_api/lib/Controller/VerificationController.php

@@ -80,7 +80,7 @@ public function __construct(
 	public function showVerifyMail(string $token, string $userId, string $key) {
 		if ($this->userSession->getUser()->getUID() !== $userId) {
 			// not a public page, hence getUser() must return an IUser
-			throw new InvalidArgumentException('Logged in user is not mail address owner');
+			throw new InvalidArgumentException('Logged in account is not mail address owner');
 		}
 		$email = $this->crypto->decrypt($key);
 
@@ -99,7 +99,7 @@ public function showVerifyMail(string $token, string $userId, string $key) {
 	public function verifyMail(string $token, string $userId, string $key) {
 		try {
 			if ($this->userSession->getUser()->getUID() !== $userId) {
-				throw new InvalidArgumentException('Logged in user is not mail address owner');
+				throw new InvalidArgumentException('Logged in account is not mail address owner');
 			}
 			$email = $this->crypto->decrypt($key);
 			$ref = \substr(hash('sha256', $email), 0, 8);

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

@@ -27,6 +27,6 @@
 
 class NotSubAdminException extends \Exception {
 	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+		parent::__construct('Logged in account must be at least a sub admin', Http::STATUS_FORBIDDEN);
 	}
 }

apps/sharebymail/lib/ShareByMailProvider.php

@@ -175,8 +175,8 @@ public function create(IShare $share) {
 		 */
 		$alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0);
 		if (!empty($alreadyShared)) {
-			$message = 'Sharing %1$s failed, because this item is already shared with user %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 = 'Sharing %1$s failed, because this item is already shared with account %2$s';
+			$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);
 		}

apps/sharebymail/src/components/AdminSettings.vue

@@ -22,7 +22,7 @@
 
 <template>
 	<NcSettingsSection :title="t('sharebymail', 'Share by mail')"
-		:description="t('sharebymail', 'Allows users to share a personalized link to a file or folder by putting in an email address.')">
+		:description="t('sharebymail', 'Allows people to share a personalized link to a file or folder by putting in an email address.')">
 		<NcCheckboxRadioSwitch type="switch"
 			:checked.sync="sendPasswordMail"
 			@update:checked="update('sendpasswordmail', sendPasswordMail)">