Rename users to account or person

apps/comments/lib/Notification/Notifier.php

@@ -123,7 +123,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

@@ -211,7 +211,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);
@@ -255,7 +255,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.10.0</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>

apps/dashboard/appinfo/info.xml

@@ -6,7 +6,7 @@
 	<summary>Dashboard app</summary>
 	<description><![CDATA[Start your day informed
 
-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 they like and change the background to their liking.]]>
+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! People can add the widgets they like and change the background to their liking.]]>
 	</description>
 	<version>7.9.0</version>
 	<licence>agpl</licence>

apps/dav/lib/Controller/OutOfOfficeController.php

@@ -57,7 +57,7 @@ public function __construct(
 	}
 
 	/**
-	 * Get the currently configured out-of-office data of a user.
+	 * Get the currently configured out-of-office data of a user
 	 *
 	 * @param string $userId The user id to get out-of-office data for.
 	 * @return DataResponse<Http::STATUS_OK, DAVCurrentOutOfOfficeData, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>

apps/dav/openapi.json

@@ -268,7 +268,7 @@
         "/ocs/v2.php/apps/dav/api/v1/outOfOffice/{userId}/now": {
             "get": {
                 "operationId": "out_of_office-get-current-out-of-office-data",
-                "summary": "Get the currently configured out-of-office data of a user.",
+                "summary": "Get the currently configured out-of-office data of a user",
                 "tags": [
                     "out_of_office"
                 ],

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/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 additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten.")) ?>
 				</em>
 				<br/>
 				<input type="password"

apps/federatedfilesharing/lib/FederatedShareProvider.php

@@ -132,7 +132,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 the 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);
 		}
@@ -143,8 +143,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 :name="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

@@ -397,7 +397,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();
@@ -459,7 +459,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 the account [email protected]', $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.19.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>

apps/federation/openapi.json

@@ -3,7 +3,7 @@
     "info": {
         "title": "federation",
         "version": "0.0.1",
-        "description": "Federation allows you to connect with other trusted servers to exchange the user directory.",
+        "description": "Federation allows you to connect with other trusted servers to exchange the account directory.",
         "license": {
             "name": "agpl"
         }

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/js/mainfileinfodetailview.js

@@ -69,7 +69,7 @@
 		_setupClipboard: function() {
 			var clipboard = new Clipboard('.permalink');
 			clipboard.on('success', function(e) {
-				OC.Notification.show(t('files', 'Direct link was copied (only works for users who have access to this file/folder)'), {type: 'success'});
+				OC.Notification.show(t('files', 'Direct link was copied (only works for people who have access to this file/folder)'), {type: 'success'});
 			});
 			clipboard.on('error', function(e) {
 				var $row = this.$('.permalink-field');
@@ -166,7 +166,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

@@ -163,7 +163,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 account"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);
@@ -281,7 +281,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 account"'), $subject);
 		}
 
 		$this->setSubjects($event, $subject, $parsedParameters);

apps/files_external/appinfo/info.xml

@@ -5,9 +5,9 @@
 	<name>External storage support</name>
 	<summary>Adds basic external storage support</summary>
 	<description>
-This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
+This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, other Nextcloud servers, WebDAV servers, and more. Administration can choose which types of storage to enable and can mount these storage locations for an account, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows people to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
 
-External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
+External storage can be configured using the GUI or at the command line. This second option provides the administration with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
 	</description>
 	<version>1.21.0</version>
 	<licence>agpl</licence>

apps/files_external/js/settings.js

@@ -91,7 +91,7 @@ function initApplicableUsersMultiselect($elements, userListLimit) {
 		return;
 	}
 	return $elements.select2({
-		placeholder: t('files_external', 'Type to select user or group.'),
+		placeholder: t('files_external', 'Type to select account or group.'),
 		allowClear: true,
 		multiple: true,
 		toggleSelect: true,

apps/files_external/lib/Command/Notify.php

@@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (\Exception $e) {
 			$output->writeln('<error>Error while trying to create storage</error>');
 			if ($noAuth) {
-				$output->writeln('<error>Username and/or password required</error>');
+				$output->writeln('<error>Login and/or password required</error>');
 			}
 			return self::FAILURE;
 		}

apps/files_external/lib/Controller/UserGlobalStoragesController.php

@@ -172,7 +172,7 @@ public function update(
 			} else {
 				return new DataResponse(
 					[
-						'message' => $this->l10n->t('Storage with ID "%d" is not user editable', [$id])
+						'message' => $this->l10n->t('Storage with ID "%d" is not editable by non-admins', [$id])
 					],
 					Http::STATUS_FORBIDDEN
 				);

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php

@@ -38,7 +38,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('OpenStack v2'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 				new DefinitionParameter('tenant', $l->t('Tenant name')),

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php

@@ -42,7 +42,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('OpenStack v3'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
+				new DefinitionParameter('user', $l->t('Login')),
 				new DefinitionParameter('domain', $l->t('Domain')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),

apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php

@@ -37,7 +37,7 @@ public function __construct(IL10N $l) {
 			->setScheme(self::SCHEME_OPENSTACK)
 			->setText($l->t('Rackspace'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('key', $l->t('API key')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 			])

apps/files_external/lib/Lib/Auth/Password/Password.php

@@ -35,9 +35,9 @@ public function __construct(IL10N $l) {
 		$this
 			->setIdentifier('password::password')
 			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Username and password'))
+			->setText($l->t('Login and password'))
 			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
+				new DefinitionParameter('user', $l->t('Login')),
 				(new DefinitionParameter('password', $l->t('Password')))
 					->setType(DefinitionParameter::VALUE_PASSWORD),
 			]);

apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php

@@ -52,7 +52,7 @@ public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
 			->setIdentifier('password::global::user')
 			->setVisibility(BackendService::VISIBILITY_DEFAULT)
 			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Global credentials, user entered'));
+			->setText($l->t('Global credentials, manually entered'));
 	}
 
 	public function saveBackendOptions(IUser $user, $id, $backendOptions) {