Rename user to account/people

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

9 files changed, 14 insertions, 14 deletions

diff --git a/README.md b/README.md
index 55756797..14c7706f 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
 
 ### Bring cloud-users closer together
 
-Circles allow your users to create their own groups of users/colleagues/friends. 
-Those groups of users (or circles) can then be used by any other app for sharing purpose 
+Circles allow people to create their own groups of people/colleagues/friends. 
+Those groups of people (or circles) can then be used by any other app for sharing purpose 
  through the Circles API
 
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ac19d5fb..2be80339 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -4,8 +4,8 @@
 	<id>circles</id>
 	<name>Circles</name>
 	<summary>Bring cloud-users closer together.</summary>
-	<description><![CDATA[Circles allows your users to create their own groups of users/colleagues/friends.
-Those groups of users (or "circles") can then be used by any other app for sharing purpose.
+	<description><![CDATA[Circles allows people to create their own groups of people/colleagues/friends.
+Those groups of people (or "circles") can then be used by any other app for sharing purpose.
 		]]>
 	</description>
 	<version>25.0.0-alpha.0</version>
diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php
index e90b661f..d39e87c1 100644
--- a/lib/AppInfo/Capabilities.php
+++ b/lib/AppInfo/Capabilities.php
@@ -170,7 +170,7 @@ class Capabilities implements ICapability {
 			'source' =>
 				[
 					'core' => [
-						Member::TYPE_USER => $this->l10n->t('Nextcloud User'),
+						Member::TYPE_USER => $this->l10n->t('Nextcloud Account'),
 						Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'),
 						Member::TYPE_MAIL => $this->l10n->t('Email Address'),
 						Member::TYPE_CONTACT => $this->l10n->t('Contact'),
diff --git a/lib/Command/CirclesSync.php b/lib/Command/CirclesSync.php
index ff04b1c2..5c66285f 100644
--- a/lib/Command/CirclesSync.php
+++ b/lib/Command/CirclesSync.php
@@ -102,7 +102,7 @@ class CirclesSync extends Base {
 			 ->addOption('force', '', InputOption::VALUE_NONE, 'Force migration')
 			 ->addOption('force-run', '', InputOption::VALUE_NONE, 'Force migration run')
 			 ->addOption('apps', '', InputOption::VALUE_NONE, 'Sync Apps')
-			 ->addOption('users', '', InputOption::VALUE_NONE, 'Sync Nextcloud Users')
+			 ->addOption('users', '', InputOption::VALUE_NONE, 'Sync Nextcloud Account')
 			 ->addOption('groups', '', InputOption::VALUE_NONE, 'Sync Nextcloud Groups')
 			 ->addOption('contacts', '', InputOption::VALUE_NONE, 'Sync Contacts')
 			 ->addOption('remotes', '', InputOption::VALUE_NONE, 'Sync Remotes')
diff --git a/lib/Db/DeprecatedMembersRequest.php b/lib/Db/DeprecatedMembersRequest.php
index 8a0be9cb..14caa8ff 100644
--- a/lib/Db/DeprecatedMembersRequest.php
+++ b/lib/Db/DeprecatedMembersRequest.php
@@ -353,7 +353,7 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
 
 //		if ($member->alreadyExistOrJoining()) {
 //			throw new MemberAlreadyExistsException(
-//				$this->l10n->t('This user is already a member of the circle')
+//				$this->l10n->t('This account is already a member of the circle')
 //			);
 //		}
 
@@ -493,7 +493,7 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
 			$qb->execute();
 		} catch (UniqueConstraintViolationException $e) {
 			throw new MemberAlreadyExistsException(
-				$this->l10n->t('This user is already a member of the circle')
+				$this->l10n->t('This account is already a member of the circle')
 			);
 		}
 	}
diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php
index 03c54e39..79841c1a 100644
--- a/lib/Model/Circle.php
+++ b/lib/Model/Circle.php
@@ -151,7 +151,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow
 	 * @var array
 	 */
 	public static $DEF_SOURCE = [
-		1 => 'Nextcloud User',
+		1 => 'Nextcloud Account',
 		2 => 'Nextcloud Group',
 		4 => 'Email Address',
 		8 => 'Contact',
diff --git a/lib/Model/DeprecatedMember.php b/lib/Model/DeprecatedMember.php
index a79146d7..ebbe8adc 100644
--- a/lib/Model/DeprecatedMember.php
+++ b/lib/Model/DeprecatedMember.php
@@ -241,13 +241,13 @@ class DeprecatedMember extends BaseMember {
 	public function hasToBeInviteAble() {
 		if ($this->getLevel() > 0) {
 			throw new MemberAlreadyExistsException(
-				$this->l10n->t("The user is already a member of this circle")
+				$this->l10n->t("The account is already a member of this circle")
 			);
 		}
 
 		if ($this->getStatus() === DeprecatedMember::STATUS_INVITED) {
 			throw new MemberAlreadyExistsException(
-				$this->l10n->t("The user has already been invited into this circle")
+				$this->l10n->t("The account has already been invited into this circle")
 			);
 		}
 	}
diff --git a/lib/Service/MembersService.php b/lib/Service/MembersService.php
index e1558f6b..e9c9b0c8 100644
--- a/lib/Service/MembersService.php
+++ b/lib/Service/MembersService.php
@@ -362,7 +362,7 @@ class MembersService {
 			try {
 				$ident = $this->miscService->getRealUserId($ident);
 			} catch (NoUserException $e) {
-				throw new NoUserException($this->l10n->t("This user does not exist"));
+				throw new NoUserException($this->l10n->t("This account does not exist"));
 			}
 		}
 	}
diff --git a/lib/Service/SyncService.php b/lib/Service/SyncService.php
index 0fb12f43..daca4668 100644
--- a/lib/Service/SyncService.php
+++ b/lib/Service/SyncService.php
@@ -217,7 +217,7 @@ class SyncService {
 	 * @return void
 	 */
 	public function syncNextcloudUsers(): void {
-		$this->outputService->output('Syncing Nextcloud Users');
+		$this->outputService->output('Syncing Nextcloud Accounts');
 
 		$users = $this->userManager->search('');
 		$this->outputService->startMigrationProgress(count($users));
@@ -246,7 +246,7 @@ class SyncService {
 	 * @throws SingleCircleNotFoundException
 	 */
 	public function syncNextcloudUser(string $userId): FederatedUser {
-		$this->outputService->output('Syncing Nextcloud User \'' . $userId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Account \'' . $userId . '\'', true);
 
 		return $this->federatedUserService->getLocalFederatedUser($userId);
 	}