diff options
Diffstat (limited to 'apps')
83 files changed, 159 insertions, 159 deletions
diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php index 94a46bbce78..9501c8b954c 100644 --- a/apps/comments/lib/Notification/Notifier.php +++ b/apps/comments/lib/Notification/Notifier.php @@ -123,7 +123,7 @@ class Notifier implements INotifier { ]; 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'] = [ diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php index 9281bb99fe8..e94f0686f18 100644 --- a/apps/comments/tests/Unit/Notification/NotifierTest.php +++ b/apps/comments/tests/Unit/Notification/NotifierTest.php @@ -211,7 +211,7 @@ class NotifierTest extends TestCase { 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 @@ class NotifierTest extends TestCase { $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()) diff --git a/apps/contactsinteraction/appinfo/info.xml b/apps/contactsinteraction/appinfo/info.xml index 0760d9b3626..4edaf402e08 100644 --- a/apps/contactsinteraction/appinfo/info.xml +++ b/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> diff --git a/apps/dashboard/appinfo/info.xml b/apps/dashboard/appinfo/info.xml index b5b739014ad..b4f2000123c 100644 --- a/apps/dashboard/appinfo/info.xml +++ b/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> diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php index a2e7378f32d..5ab99c34b79 100644 --- a/apps/dav/lib/Controller/OutOfOfficeController.php +++ b/apps/dav/lib/Controller/OutOfOfficeController.php @@ -57,7 +57,7 @@ class OutOfOfficeController extends OCSController { } /** - * 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{}> diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json index a0df1cedd16..6200fbafb4f 100644 --- a/apps/dav/openapi.json +++ b/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" ], diff --git a/apps/dav/src/views/Availability.vue b/apps/dav/src/views/Availability.vue index 62778839142..b39e5671da1 100644 --- a/apps/dav/src/views/Availability.vue +++ b/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" diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index e9e9a97b900..290450bf8b6 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -24,7 +24,7 @@ style('encryption', 'settings-admin'); <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" diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 479b636fd40..69813289cae 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -132,7 +132,7 @@ class FederatedShareProvider implements IShareProvider { $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 @@ class FederatedShareProvider implements IShareProvider { $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); } diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index 484dd9a519e..f9de2e0858c 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/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> diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 744cb769c54..6f0cb93c4a9 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -397,7 +397,7 @@ class FederatedShareProviderTest extends \Test\TestCase { $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 @@ class FederatedShareProviderTest extends \Test\TestCase { 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 the account user@server.com', $e->getMessage()); } } diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index 180882216d8..49e8537ec0f 100644 --- a/apps/federation/appinfo/info.xml +++ b/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> diff --git a/apps/federation/openapi.json b/apps/federation/openapi.json index fe72b2d133d..71e72dbec92 100644 --- a/apps/federation/openapi.json +++ b/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" } diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index 62922b19994..a214160a264 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -8,7 +8,7 @@ style('federation', 'settings-admin') ?> <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) { ?> diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 45988a60a02..e3357384cf9 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/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 diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 8b817f92c1e..fb81e200688 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -163,7 +163,7 @@ class Provider implements IProvider { 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 @@ class Provider implements IProvider { 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); diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index 650353b7b1f..01899ab6411 100644 --- a/apps/files_external/appinfo/info.xml +++ b/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> diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index db77fe4dfc1..39f4a6ab7f0 100644 --- a/apps/files_external/js/settings.js +++ b/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, diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php index fd3a66a756e..2fdd2f3a2ee 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -158,7 +158,7 @@ class Notify extends Base { } 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; } diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index ba15afb2bdf..7b3f54d25c7 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -172,7 +172,7 @@ class UserGlobalStoragesController extends StoragesController { } 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 ); diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php index ddc734ff1ec..a36a86afce4 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php @@ -38,7 +38,7 @@ class OpenStackV2 extends AuthMechanism { ->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')), diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php index 44ea1c61155..090a54596bc 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php @@ -42,7 +42,7 @@ class OpenStackV3 extends AuthMechanism { ->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), diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php index 8bf3eba668d..2ec0b8b035e 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php @@ -37,7 +37,7 @@ class Rackspace extends AuthMechanism { ->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), ]) diff --git a/apps/files_external/lib/Lib/Auth/Password/Password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php index 5165a61d028..3435ebbb1de 100644 --- a/apps/files_external/lib/Lib/Auth/Password/Password.php +++ b/apps/files_external/lib/Lib/Auth/Password/Password.php @@ -35,9 +35,9 @@ class Password extends AuthMechanism { $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), ]); diff --git a/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php index 6312a3d136e..d8ed217b336 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php @@ -52,7 +52,7 @@ class UserGlobalAuth extends AuthMechanism { ->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) { diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php index 0c8140e3c14..87bf96aeae1 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php @@ -50,9 +50,9 @@ class UserProvided extends AuthMechanism implements IUserProvided { ->setIdentifier('password::userprovided') ->setVisibility(BackendService::VISIBILITY_ADMIN) ->setScheme(self::SCHEME_PASSWORD) - ->setText($l->t('User entered, store in database')) + ->setText($l->t('Manually entered, store in database')) ->addParameters([ - (new DefinitionParameter('user', $l->t('Username'))) + (new DefinitionParameter('user', $l->t('Login'))) ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD) diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php index d45db03b2da..c9ed8d1b9e3 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php @@ -47,7 +47,7 @@ class RSA extends AuthMechanism { ->setScheme(self::SCHEME_PUBLICKEY) ->setText($l->t('RSA public key')) ->addParameters([ - new DefinitionParameter('user', $l->t('Username')), + new DefinitionParameter('user', $l->t('Login')), new DefinitionParameter('public_key', $l->t('Public key')), (new DefinitionParameter('private_key', 'private_key')) ->setType(DefinitionParameter::VALUE_HIDDEN), diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php index 7d04aaaf057..c648173a82b 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php @@ -46,7 +46,7 @@ class RSAPrivateKey extends AuthMechanism { ->setScheme(self::SCHEME_PUBLICKEY) ->setText($l->t('RSA private key')) ->addParameters([ - new DefinitionParameter('user', $l->t('Username')), + new DefinitionParameter('user', $l->t('Login')), (new DefinitionParameter('password', $l->t('Password'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL) ->setType(DefinitionParameter::VALUE_PASSWORD), diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php index c455464c2be..9ac10025ea0 100644 --- a/apps/files_external/lib/Lib/Backend/SMB.php +++ b/apps/files_external/lib/Lib/Backend/SMB.php @@ -67,7 +67,7 @@ class SMB extends Backend { (new DefinitionParameter('check_acl', $l->t('Verify ACL access when listing files'))) ->setType(DefinitionParameter::VALUE_BOOLEAN) ->setFlag(DefinitionParameter::FLAG_OPTIONAL) - ->setTooltip($l->t("Check the ACL's of each file or folder inside a directory to filter out items where the user has no read permissions, comes with a performance penalty")), + ->setTooltip($l->t("Check the ACL's of each file or folder inside a directory to filter out items where the account has no read permissions, comes with a performance penalty")), (new DefinitionParameter('timeout', $l->t('Timeout'))) ->setType(DefinitionParameter::VALUE_HIDDEN) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php index 78c266e36d1..35743c5bc3b 100644 --- a/apps/files_external/lib/Lib/Backend/SMB_OC.php +++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php @@ -46,7 +46,7 @@ class SMB_OC extends Backend { ->setText($l->t('SMB/CIFS using OC login')) ->addParameters([ new DefinitionParameter('host', $l->t('Host')), - (new DefinitionParameter('username_as_share', $l->t('Username as share'))) + (new DefinitionParameter('username_as_share', $l->t('Login as share'))) ->setType(DefinitionParameter::VALUE_BOOLEAN), (new DefinitionParameter('share', $l->t('Share'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 19c83b29bc8..7283e5ae7b1 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -167,7 +167,7 @@ class Swift extends \OC\Files\Storage\Common { or (empty($params['user']) && empty($params['userid'])) or empty($params['bucket']) or empty($params['region']) ) { - throw new StorageBadConfigException("API Key or password, Username, Bucket and Region have to be configured."); + throw new StorageBadConfigException("API Key or password, Login, Bucket and Region have to be configured."); } $user = $params['user']; diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index d2dd70410ef..c6525a8be83 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -108,7 +108,7 @@ function writeParameterInput($parameter, $options, $classes = []) { <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" data-can-create-local="<?php echo $canCreateNewLocalStorage?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> <h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2> <a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a> - <p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p> + <p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow people to mount their own external storage services.')); ?></p> <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { print_unescaped(''.$_['dependencies'].''); } ?> @@ -171,7 +171,7 @@ uasort($sortedBackends, function ($a, $b) { <td class="configuration"></td> <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> <td class="applicable" align="right"> - <label><input type="checkbox" class="applicableToAllUsers" checked="" /><?php p($l->t('All users')); ?></label> + <label><input type="checkbox" class="applicableToAllUsers" checked="" /><?php p($l->t('All people')); ?></label> <div class="applicableUsersContainer"> <input type="hidden" class="applicableUsers" style="width:20em;" value="" /> </div> @@ -193,7 +193,7 @@ uasort($sortedBackends, function ($a, $b) { value="1" <?php if ($_['allowUserMounting']) { print_unescaped(' checked="checked"'); } ?> /> - <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> + <label for="allowUserMounting"><?php p($l->t('Allow people to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> <?php @@ -228,7 +228,7 @@ uasort($sortedBackends, function ($a, $b) { <input type="text" name="username" autocomplete="false" value="<?php p($_['globalCredentials']['user']); ?>" - placeholder="<?php p($l->t('Username')) ?>"/> + placeholder="<?php p($l->t('Login')) ?>"/> <input type="password" name="password" autocomplete="false" value="<?php p($_['globalCredentials']['password']); ?>" diff --git a/apps/files_reminders/lib/Controller/ApiController.php b/apps/files_reminders/lib/Controller/ApiController.php index 91b7e51eb6f..aeac3bd7a6b 100644 --- a/apps/files_reminders/lib/Controller/ApiController.php +++ b/apps/files_reminders/lib/Controller/ApiController.php @@ -59,7 +59,7 @@ class ApiController extends OCSController { * @return DataResponse<Http::STATUS_OK, array{dueDate: ?string}, array{}>|DataResponse<Http::STATUS_UNAUTHORIZED, array<empty>, array{}> * * 200: Reminder returned - * 401: User not found + * 401: Account not found */ #[NoAdminRequired] public function get(int $fileId): DataResponse { @@ -93,7 +93,7 @@ class ApiController extends OCSController { * 200: Reminder updated * 201: Reminder created successfully * 400: Creating reminder is not possible - * 401: User not found + * 401: Account not found * 404: File not found */ #[NoAdminRequired] @@ -129,7 +129,7 @@ class ApiController extends OCSController { * @return DataResponse<Http::STATUS_OK|Http::STATUS_UNAUTHORIZED|Http::STATUS_NOT_FOUND, array<empty>, array{}> * * 200: Reminder deleted successfully - * 401: User not found + * 401: Account not found * 404: Reminder not found */ #[NoAdminRequired] diff --git a/apps/files_reminders/openapi.json b/apps/files_reminders/openapi.json index 67135e57cc1..4e9653b2f0b 100644 --- a/apps/files_reminders/openapi.json +++ b/apps/files_reminders/openapi.json @@ -134,7 +134,7 @@ } }, "401": { - "description": "User not found", + "description": "Account not found", "content": { "application/json": { "schema": { @@ -303,7 +303,7 @@ } }, "401": { - "description": "User not found", + "description": "Account not found", "content": { "application/json": { "schema": { @@ -435,7 +435,7 @@ } }, "401": { - "description": "User not found", + "description": "Account not found", "content": { "application/json": { "schema": { diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 802b8a7ca92..f8a682cda1d 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/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 accounts 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> diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index aa239ae8bb6..5762aa47b3b 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -687,7 +687,7 @@ class ShareAPIController extends OCSController { 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 account to share with')); } $share->setSharedWith($shareWith); $share->setPermissions($permissions); @@ -762,7 +762,7 @@ class ShareAPIController extends OCSController { } 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); diff --git a/apps/files_sharing/src/components/PersonalSettings.vue b/apps/files_sharing/src/components/PersonalSettings.vue index 7a14b015223..e3fe603c342 100644 --- a/apps/files_sharing/src/components/PersonalSettings.vue +++ b/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 /> diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue index f6b900b8bf7..bc5bdd32e57 100644 --- a/apps/files_sharing/src/components/SharingEntryInternal.vue +++ b/apps/files_sharing/src/components/SharingEntryInternal.vue @@ -72,9 +72,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') }, }, diff --git a/apps/files_sharing/src/views/SharingInherited.vue b/apps/files_sharing/src/views/SharingInherited.vue index b61f65ae47a..515ab8c1608 100644 --- a/apps/files_sharing/src/views/SharingInherited.vue +++ b/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() { diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 822212ae86f..caa121932f9 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -1679,7 +1679,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid user'); + $this->expectExceptionMessage('Please specify a valid account to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); @@ -1707,7 +1707,7 @@ class ShareAPIControllerTest extends TestCase { public function testCreateShareUserNoValidShareWith() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Please specify a valid user'); + $this->expectExceptionMessage('Please specify a valid account to share with'); $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index 0386ccdfee6..c1bab46bd69 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/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.19.0</version> diff --git a/apps/files_trashbin/openapi.json b/apps/files_trashbin/openapi.json index afa0ccfdafd..2103047c282 100644 --- a/apps/files_trashbin/openapi.json +++ b/apps/files_trashbin/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "files_trashbin", "version": "0.0.1", - "description": "This application enables users to restore files that were deleted from the system.", + "description": "This application enables people to restore files that were deleted from the system.", "license": { "name": "agpl" } diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index a00f165c542..23ed3a22a02 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/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.22.0</version> <licence>agpl</licence> diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php index d8e59b40dba..24cc6a896d5 100644 --- a/apps/files_versions/lib/Command/ExpireVersions.php +++ b/apps/files_versions/lib/Command/ExpireVersions.php @@ -50,7 +50,7 @@ class ExpireVersions extends Command { ->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.' ); } @@ -65,7 +65,7 @@ class ExpireVersions extends Command { if (!empty($users)) { foreach ($users as $user) { if (!$this->userManager->userExists($user)) { - $output->writeln("<error>Unknown user $user</error>"); + $output->writeln("<error>Unknown account $user</error>"); return self::FAILURE; } diff --git a/apps/lookup_server_connector/appinfo/info.xml b/apps/lookup_server_connector/appinfo/info.xml index 30a7bc0aadc..7c88c6cb21b 100644 --- a/apps/lookup_server_connector/appinfo/info.xml +++ b/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.17.0</version> <licence>agpl</licence> <author>Bjoern Schiessle</author> diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index a38d9f20a61..da03b2b00e4 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/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 diff --git a/apps/provisioning_api/lib/Controller/AppConfigController.php b/apps/provisioning_api/lib/Controller/AppConfigController.php index ea862550e2d..7ca5e76962f 100644 --- a/apps/provisioning_api/lib/Controller/AppConfigController.php +++ b/apps/provisioning_api/lib/Controller/AppConfigController.php @@ -133,7 +133,7 @@ class AppConfigController extends OCSController { } 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 { diff --git a/apps/provisioning_api/lib/Controller/VerificationController.php b/apps/provisioning_api/lib/Controller/VerificationController.php index 6b2443796fc..e184dc13fc6 100644 --- a/apps/provisioning_api/lib/Controller/VerificationController.php +++ b/apps/provisioning_api/lib/Controller/VerificationController.php @@ -83,7 +83,7 @@ class VerificationController extends Controller { 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); @@ -102,7 +102,7 @@ class VerificationController extends Controller { 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); diff --git a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php index 6f5b15628f9..2b31e2f7d1b 100644 --- a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php +++ b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php @@ -27,6 +27,6 @@ use OCP\AppFramework\Http; 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); } } diff --git a/apps/provisioning_api/openapi-administration.json b/apps/provisioning_api/openapi-administration.json index ea8a5cdc546..9104c76ab42 100644 --- a/apps/provisioning_api/openapi-administration.json +++ b/apps/provisioning_api/openapi-administration.json @@ -3,7 +3,7 @@ "info": { "title": "provisioning_api-administration", "version": "0.0.1", - "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.", + "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.", "license": { "name": "agpl" } diff --git a/apps/provisioning_api/openapi-full.json b/apps/provisioning_api/openapi-full.json index d7fbec5569e..20746bbf769 100644 --- a/apps/provisioning_api/openapi-full.json +++ b/apps/provisioning_api/openapi-full.json @@ -3,7 +3,7 @@ "info": { "title": "provisioning_api-full", "version": "0.0.1", - "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.", + "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.", "license": { "name": "agpl" } diff --git a/apps/provisioning_api/openapi.json b/apps/provisioning_api/openapi.json index e26adfc2d0a..e5e184194b9 100644 --- a/apps/provisioning_api/openapi.json +++ b/apps/provisioning_api/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "provisioning_api", "version": "0.0.1", - "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.", + "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.", "license": { "name": "agpl" } diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index af4cf5969c9..50d72e582dd 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -132,7 +132,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('No user supplied'), + 'message' => $this->l->t('No Login supplied'), ], ]); } @@ -186,7 +186,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'), + 'message' => $this->l->t('Please provide an admin recovery password; otherwise, all account data will be lost.'), ] ]); } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) { @@ -212,7 +212,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'), + 'message' => $this->l->t('Backend does not support password change, but the encryption of the account key was updated.'), ] ]); } elseif (!$result && !$recoveryEnabledForUser) { diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php index be662ed641a..c329de3cb6a 100644 --- a/apps/settings/lib/Controller/MailSettingsController.php +++ b/apps/settings/lib/Controller/MailSettingsController.php @@ -180,6 +180,6 @@ class MailSettingsController extends Controller { } $this->config->setAppValue('core', 'emailTestSuccessful', '0'); - return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST); + return new DataResponse($this->l10n->t('You need to set your account email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST); } } diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 3c6ee1806f0..c6abe6bff4f 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -240,7 +240,7 @@ class UsersController extends Controller { $disabledUsersGroup = [ 'id' => 'disabled', - 'name' => 'Disabled users', + 'name' => 'Disabled accounts', 'usercount' => $disabledUsers ]; @@ -388,7 +388,7 @@ class UsersController extends Controller { [ 'status' => 'error', 'data' => [ - 'message' => $this->l10n->t('Invalid user') + 'message' => $this->l10n->t('Invalid account') ] ], Http::STATUS_UNAUTHORIZED diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php index 69fb9a8e6cf..2d41577f554 100644 --- a/apps/settings/lib/Mailer/NewUserMailHelper.php +++ b/apps/settings/lib/Mailer/NewUserMailHelper.php @@ -134,7 +134,7 @@ class NewUserMailHelper { } $emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()])); if ($user->getBackendClassName() !== 'LDAP') { - $emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId])); + $emailTemplate->addBodyText($l10n->t('Your Login is: %s', [$userId])); } if ($generatePasswordResetToken) { $leftButtonText = $l10n->t('Set your password'); diff --git a/apps/settings/lib/Middleware/SubadminMiddleware.php b/apps/settings/lib/Middleware/SubadminMiddleware.php index 782f0155510..d29d46ea62e 100644 --- a/apps/settings/lib/Middleware/SubadminMiddleware.php +++ b/apps/settings/lib/Middleware/SubadminMiddleware.php @@ -67,7 +67,7 @@ class SubadminMiddleware extends Middleware { public function beforeController($controller, $methodName) { if (!$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->reflector->hasAnnotation('AuthorizedAdminSetting')) { if (!$this->isSubAdmin) { - throw new NotAdminException($this->l10n->t('Logged in user must be a subadmin')); + throw new NotAdminException($this->l10n->t('Logged in account must be a subadmin')); } } } diff --git a/apps/settings/lib/SetupChecks/CheckUserCertificates.php b/apps/settings/lib/SetupChecks/CheckUserCertificates.php index 8e9c0080a26..3f80b466201 100644 --- a/apps/settings/lib/SetupChecks/CheckUserCertificates.php +++ b/apps/settings/lib/SetupChecks/CheckUserCertificates.php @@ -46,7 +46,7 @@ class CheckUserCertificates implements ISetupCheck { } public function getName(): string { - return $this->l10n->t('Old user imported certificates'); + return $this->l10n->t('Old administration imported certificates'); } public function run(): SetupResult { @@ -55,8 +55,8 @@ class CheckUserCertificates implements ISetupCheck { return SetupResult::success(); } if ($this->configValue === 'not-run-yet') { - return SetupResult::info($this->l10n->t('A background job is pending that checks for user imported SSL certificates. Please check back later.')); + return SetupResult::info($this->l10n->t('A background job is pending that checks for administration imported SSL certificates. Please check back later.')); } - return SetupResult::error($this->l10n->t('There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.')); + return SetupResult::error($this->l10n->t('There are some administration imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via "occ security:certificates:import" command. Their paths inside the data directory are shown below.')); } } diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue index aba6dc7537f..f2572be9c90 100644 --- a/apps/settings/src/components/AdminTwoFactor.vue +++ b/apps/settings/src/components/AdminTwoFactor.vue @@ -1,6 +1,6 @@ <template> <NcSettingsSection :name="t('settings', 'Two-Factor Authentication')" - :description="t('settings', 'Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')" + :description="t('settings', 'Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system.')" :doc-url="twoFactorAdminDoc"> <p v-if="loading"> <span class="icon-loading-small two-factor-loading" /> @@ -50,7 +50,7 @@ <p class="top-margin"> <em> <!-- this text is also found in the documentation. update it there as well if it ever changes --> - {{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if a user has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If a user is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }} + {{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }} </em> </p> </template> diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue index 0440741f4c9..0f9969c650b 100644 --- a/apps/settings/src/components/AppDetails.vue +++ b/apps/settings/src/components/AppDetails.vue @@ -130,7 +130,7 @@ class="appslink" :href="app.documentation.user" target="_blank" - rel="noreferrer noopener">{{ t('settings', 'User documentation') }} ↗</a> + rel="noreferrer noopener">{{ t('settings', 'Usage documentation') }} ↗</a> <a v-if="app.documentation && app.documentation.admin" class="appslink" :href="app.documentation.admin" diff --git a/apps/settings/src/components/AuthTokenSetupDialog.vue b/apps/settings/src/components/AuthTokenSetupDialog.vue index f40fe722cef..20e3b29d0f1 100644 --- a/apps/settings/src/components/AuthTokenSetupDialog.vue +++ b/apps/settings/src/components/AuthTokenSetupDialog.vue @@ -27,7 +27,7 @@ {{ t('settings', 'Use the credentials below to configure your app or device. For security reasons this password will only be shown once.') }} </p> <div class="token-dialog__name"> - <NcTextField :label="t('settings', 'Username')" :value="loginName" readonly /> + <NcTextField :label="t('settings', 'Login')" :value="loginName" readonly /> <NcButton type="tertiary" :title="copyLoginNameLabel" :aria-label="copyLoginNameLabel" diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 04ef607e03b..c19eac47889 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -54,7 +54,7 @@ @update:checked="onBackgroundJobModeChanged"> {{ t('settings', 'AJAX') }} </NcCheckboxRadioSwitch> - <em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single user instance.') }}</em> + <em>{{ t('settings', 'Execute one task with each page loaded. Use case: Single account instance.') }}</em> <NcCheckboxRadioSwitch type="radio" :checked.sync="backgroundJobsMode" @@ -63,7 +63,7 @@ @update:checked="onBackgroundJobModeChanged"> {{ t('settings', 'Webcron') }} </NcCheckboxRadioSwitch> - <em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 users depending on the usage).') }}</em> + <em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 accounts depending on the usage).') }}</em> <NcCheckboxRadioSwitch type="radio" :disabled="!cliBasedCronPossible" @@ -121,7 +121,7 @@ export default { cronLabel() { let desc = t('settings', 'Use system cron service to call the cron.php file every 5 minutes.') if (this.cliBasedCronPossible) { - desc += '<br>' + t('settings', 'The cron.php needs to be executed by the system user "{user}".', { user: this.cliBasedCronUser }) + desc += '<br>' + t('settings', 'The cron.php needs to be executed by the system account "{user}".', { user: this.cliBasedCronUser }) } else { desc += '<br>' + t('settings', 'The PHP POSIX extension is required. See {linkstart}PHP documentation{linkend} for more details.', { linkstart: '<a target="_blank" rel="noreferrer nofollow" class="external" href="https://www.php.net/manual/en/book.posix.php">', diff --git a/apps/settings/src/components/BasicSettings/ProfileSettings.vue b/apps/settings/src/components/BasicSettings/ProfileSettings.vue index 8b63940e257..40cb83d98fe 100644 --- a/apps/settings/src/components/BasicSettings/ProfileSettings.vue +++ b/apps/settings/src/components/BasicSettings/ProfileSettings.vue @@ -28,7 +28,7 @@ </h2> <p class="settings-hint"> - {{ t('settings', 'Enable or disable profile by default for new users.') }} + {{ t('settings', 'Enable or disable profile by default for new accounts.') }} </p> <NcCheckboxRadioSwitch type="switch" diff --git a/apps/settings/src/components/GroupListItem.vue b/apps/settings/src/components/GroupListItem.vue index cba0b7b3748..ca50b38b200 100644 --- a/apps/settings/src/components/GroupListItem.vue +++ b/apps/settings/src/components/GroupListItem.vue @@ -30,7 +30,7 @@ </h2> <NcNoteCard type="warning" show-alert> - {{ t('settings', 'You are about to remove the group "{group}". The users will NOT be deleted.', { group: name }) }} + {{ t('settings', 'You are about to remove the group "{group}". The accounts will NOT be deleted.', { group: name }) }} </NcNoteCard> <div class="modal__button-row"> <NcButton type="secondary" diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue index 92c823e8bc5..73c4c3bdfec 100644 --- a/apps/settings/src/components/UserList.vue +++ b/apps/settings/src/components/UserList.vue @@ -31,10 +31,10 @@ <NcEmptyContent v-if="filteredUsers.length === 0" class="empty" - :name="isInitialLoad && loading.users ? null : t('settings', 'No users')"> + :name="isInitialLoad && loading.users ? null : t('settings', 'No accounts')"> <template #icon> <NcLoadingIcon v-if="isInitialLoad && loading.users" - :name="t('settings', 'Loading users …')" + :name="t('settings', 'Loading accounts …')" :size="64" /> <NcIconSvgWrapper v-else :svg="usersSvg" /> @@ -61,7 +61,7 @@ @scroll-end="handleScrollEnd"> <template #before> <caption class="hidden-visually"> - {{ t('settings', 'List of users. This list is not fully rendered for performance reasons. The users will be rendered as you navigate through the list.') }} + {{ t('settings', 'List of accounts. This list is not fully rendered for performance reasons. The accounts will be rendered as you navigate through the list.') }} </caption> </template> @@ -320,8 +320,8 @@ export default { } logger.debug(`${this.users.length} total user(s) loaded`) } catch (error) { - logger.error('Failed to load users', { error }) - showError('Failed to load users') + logger.error('Failed to load accounts', { error }) + showError('Failed to load accounts') } this.loading.users = false this.isInitialLoad = false @@ -368,7 +368,7 @@ export default { setNewUserDefaultGroup(value) { if (value && value.length > 0) { - // setting new user default group to the current selected one + // setting new account default group to the current selected one const currentGroup = this.groups.find(group => group.id === value) if (currentGroup) { this.newUser.groups = [currentGroup] diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue index a27b41e11a6..179ec8956e4 100644 --- a/apps/settings/src/components/Users/UserRow.vue +++ b/apps/settings/src/components/Users/UserRow.vue @@ -28,7 +28,7 @@ :data-cy-user-row="user.id"> <td class="row__cell row__cell--avatar" data-cy-user-list-cell-avatar> <NcLoadingIcon v-if="isLoadingUser" - :name="t('settings', 'Loading user …')" + :name="t('settings', 'Loading account …')" :size="32" /> <NcAvatar v-else-if="visible" disable-menu @@ -87,7 +87,7 @@ @trailing-button-click="updatePassword" /> </template> <span v-else-if="isObfuscated"> - {{ t('settings', 'You do not have permissions to see the details of this user') }} + {{ t('settings', 'You do not have permissions to see the details of this account') }} </span> </td> @@ -130,7 +130,7 @@ :multiple="true" :append-to-body="false" :options="availableGroups" - :placeholder="t('settings', 'Add user to group')" + :placeholder="t('settings', 'Add account to group')" :taggable="settings.isAdmin" :value="userGroups" label="name" @@ -152,7 +152,7 @@ <template v-if="editing && settings.isAdmin && subAdminsGroups.length > 0"> <label class="hidden-visually" :for="'subadmins' + uniqueId"> - {{ t('settings', 'Set user as admin for') }} + {{ t('settings', 'Set account as admin for') }} </label> <NcSelect data-cy-user-list-input-subadmins :data-loading="loading.subadmins || undefined" @@ -165,7 +165,7 @@ :multiple="true" :no-wrap="true" :options="subAdminsGroups" - :placeholder="t('settings', 'Set user as admin for')" + :placeholder="t('settings', 'Set account as admin for')" :value="userSubAdminsGroups" @option:deselected="removeUserSubAdmin" @option:selected="options => addUserSubAdmin(options.at(-1))" /> @@ -180,7 +180,7 @@ <template v-if="editing"> <label class="hidden-visually" :for="'quota' + uniqueId"> - {{ t('settings', 'Select user quota') }} + {{ t('settings', 'Select account quota') }} </label> <NcSelect v-model="editedUserQuota" :close-on-select="true" @@ -193,7 +193,7 @@ :clearable="false" :input-id="'quota' + uniqueId" :options="quotaOptions" - :placeholder="t('settings', 'Select user quota')" + :placeholder="t('settings', 'Select account quota')" :taggable="true" @option:selected="setUserQuota" /> </template> @@ -398,8 +398,8 @@ export default { computed: { managerLabel() { - // TRANSLATORS This string describes a manager in the context of an organization - return t('settings', 'Set user manager') + // TRANSLATORS This string describes a person's manager in the context of an organization + return t('settings', 'Set line manager') }, isObfuscated() { @@ -469,7 +469,7 @@ export default { const actions = [ { icon: 'icon-delete', - text: t('settings', 'Delete user'), + text: t('settings', 'Delete account'), action: this.deleteUser, }, { @@ -479,7 +479,7 @@ export default { }, { icon: this.user.enabled ? 'icon-close' : 'icon-add', - text: this.user.enabled ? t('settings', 'Disable user') : t('settings', 'Enable user'), + text: this.user.enabled ? t('settings', 'Disable account') : t('settings', 'Enable account'), action: this.enableDisableUser, }, ] @@ -586,8 +586,8 @@ export default { value: this.currentManager ? this.currentManager.id : '', }) } catch (error) { - // TRANSLATORS This string describes a manager in the context of an organization - showError(t('setting', 'Failed to update user manager')) + // TRANSLATORS This string describes a line manager in the context of an organization + showError(t('setting', 'Failed to update line manager')) console.error(error) } finally { this.loading.manager = false diff --git a/apps/settings/src/components/Users/UserRowActions.vue b/apps/settings/src/components/Users/UserRowActions.vue index b135f80cf7b..a01bb868c7a 100644 --- a/apps/settings/src/components/Users/UserRowActions.vue +++ b/apps/settings/src/components/Users/UserRowActions.vue @@ -22,7 +22,7 @@ --> <template> - <NcActions :aria-label="t('settings', 'Toggle user actions menu')" + <NcActions :aria-label="t('settings', 'Toggle account actions menu')" :disabled="disabled" :inline="1"> <NcActionButton :data-cy-user-list-action-toggle-edit="`${edit}`" diff --git a/apps/settings/src/components/Users/UserSettingsDialog.vue b/apps/settings/src/components/Users/UserSettingsDialog.vue index 79f7d72c5d5..26659e85b5e 100644 --- a/apps/settings/src/components/Users/UserSettingsDialog.vue +++ b/apps/settings/src/components/Users/UserSettingsDialog.vue @@ -23,7 +23,7 @@ <template> <NcAppSettingsDialog :open.sync="isModalOpen" :show-navigation="true" - :name="t('settings', 'User management settings')"> + :name="t('settings', 'Account management settings')"> <NcAppSettingsSection id="visibility-settings" :name="t('settings', 'Visibility')"> <NcCheckboxRadioSwitch type="switch" @@ -34,7 +34,7 @@ <NcCheckboxRadioSwitch type="switch" data-test="showUserBackend" :checked.sync="showUserBackend"> - {{ t('settings', 'Show user backend') }} + {{ t('settings', 'Show account backend') }} </NcCheckboxRadioSwitch> <NcCheckboxRadioSwitch type="switch" data-test="showStoragePath" @@ -54,7 +54,7 @@ data-test="sendWelcomeMail" :checked.sync="sendWelcomeMail" :disabled="loadingSendMail"> - {{ t('settings', 'Send welcome email to new users') }} + {{ t('settings', 'Send welcome email to new accounts') }} </NcCheckboxRadioSwitch> </NcAppSettingsSection> diff --git a/apps/settings/src/constants/AccountPropertyConstants.js b/apps/settings/src/constants/AccountPropertyConstants.js index 04367fde811..eb35482fb32 100644 --- a/apps/settings/src/constants/AccountPropertyConstants.js +++ b/apps/settings/src/constants/AccountPropertyConstants.js @@ -180,14 +180,14 @@ export const SCOPE_PROPERTY_ENUM = Object.freeze({ name: SCOPE_ENUM.FEDERATED, displayName: t('settings', 'Federated'), tooltip: t('settings', 'Only synchronize to trusted servers'), - tooltipDisabled: t('settings', 'Not available as federation has been disabled for your account, contact your system administrator if you have any questions'), + tooltipDisabled: t('settings', 'Not available as federation has been disabled for your account, contact your system administration if you have any questions'), iconClass: 'icon-contacts-dark', }, [SCOPE_ENUM.PUBLISHED]: { name: SCOPE_ENUM.PUBLISHED, displayName: t('settings', 'Published'), tooltip: t('settings', 'Synchronize to trusted servers and the global and public address book'), - tooltipDisabled: t('settings', 'Not available as publishing user specific data to the lookup server is not allowed, contact your system administrator if you have any questions'), + tooltipDisabled: t('settings', 'Not available as publishing account specific data to the lookup server is not allowed, contact your system administration if you have any questions'), iconClass: 'icon-link', }, }) diff --git a/apps/settings/src/constants/ProfileConstants.js b/apps/settings/src/constants/ProfileConstants.js index f9fd3d26fb7..f2b831bc496 100644 --- a/apps/settings/src/constants/ProfileConstants.js +++ b/apps/settings/src/constants/ProfileConstants.js @@ -41,7 +41,7 @@ export const VISIBILITY_PROPERTY_ENUM = Object.freeze({ }, [VISIBILITY_ENUM.SHOW_USERS_ONLY]: { name: VISIBILITY_ENUM.SHOW_USERS_ONLY, - label: t('settings', 'Show to logged in users only'), + label: t('settings', 'Show to logged in accounts only'), }, [VISIBILITY_ENUM.HIDE]: { name: VISIBILITY_ENUM.HIDE, diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue index dc17b9f9362..1975dc9acf0 100644 --- a/apps/settings/src/views/Users.vue +++ b/apps/settings/src/views/Users.vue @@ -23,9 +23,9 @@ <template> <Fragment> <NcContent app-name="settings"> - <NcAppNavigation :aria-label="t('settings', 'User management')"> + <NcAppNavigation :aria-label="t('settings', 'Account management')"> <NcAppNavigationNew button-id="new-user-button" - :text="t('settings','New user')" + :text="t('settings','New account')" @click="showNewUserMenu" @keyup.enter="showNewUserMenu" @keyup.space="showNewUserMenu"> @@ -37,7 +37,7 @@ <template #list> <NcAppNavigationItem id="everyone" :exact="true" - :name="t('settings', 'Active users')" + :name="t('settings', 'Active accounts')" :to="{ name: 'users' }"> <template #icon> <AccountGroup :size="20" /> @@ -117,7 +117,7 @@ <template #footer> <ul class="app-navigation-entry__settings"> - <NcAppNavigationItem :name="t('settings', 'User management settings')" + <NcAppNavigationItem :name="t('settings', 'Account management settings')" @click="isDialogOpen = true"> <template #icon> <Cog :size="20" /> @@ -214,13 +214,13 @@ export default { computed: { pageHeading() { if (this.selectedGroupDecoded === null) { - return t('settings', 'Active users') + return t('settings', 'Active accounts') } const matchHeading = { admin: t('settings', 'Admins'), - disabled: t('settings', 'Disabled users'), + disabled: t('settings', 'Disabled accounts'), } - return matchHeading[this.selectedGroupDecoded] ?? t('settings', 'User group: {group}', { group: this.selectedGroupDecoded }) + return matchHeading[this.selectedGroupDecoded] ?? t('settings', 'Account group: {group}', { group: this.selectedGroupDecoded }) }, showConfig() { diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php index 649178c15d1..1b912d3d904 100644 --- a/apps/settings/templates/help.php +++ b/apps/settings/templates/help.php @@ -12,7 +12,7 @@ } ?> href="<?php print_unescaped($_['urlUserDocs']); ?>"> <span class="help-list__text"> - <?php p($l->t('User documentation')); ?> + <?php p($l->t('Account documentation')); ?> </span> </a> </li> @@ -25,7 +25,7 @@ } ?> href="<?php print_unescaped($_['urlAdminDocs']); ?>"> <span class="help-list__text"> - <?php p($l->t('Administrator documentation')); ?> + <?php p($l->t('Administration documentation')); ?> </span> </a> </li> diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index 3e8b373c738..3d418740963 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -148,7 +148,7 @@ $mail_sendmailmode = [ print_unescaped(' class="hidden"'); } ?>> <label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label> - <input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" + <input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Login'))?>" value="<?php p($_['mail_smtpname']) ?>" /> <input type="text" name="mail_smtppassword" id="mail_smtppassword" autocomplete="off" placeholder="<?php p($l->t('SMTP Password'))?>" value="<?php p($_['mail_smtppassword']) ?>" /> diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php index bfa89fbc0b4..3918d4b5fa9 100644 --- a/apps/settings/tests/Controller/MailSettingsControllerTest.php +++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php @@ -171,7 +171,7 @@ class MailSettingsControllerTest extends \Test\TestCase { // Ensure that it fails when no mail address has been specified $response = $this->mailController->sendTestMail(); $this->assertSame(Http::STATUS_BAD_REQUEST, $response->getStatus()); - $this->assertSame('You need to set your user email before being able to send test emails. Go to for that.', $response->getData()); + $this->assertSame('You need to set your account email before being able to send test emails. Go to for that.', $response->getData()); // If no exception is thrown it should work $this->config diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php index 5c7d182d436..d4ab5c10692 100644 --- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php +++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php @@ -262,7 +262,7 @@ class NewUserMailHelperTest extends TestCase { <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> <tr style="padding:0;text-align:left;vertical-align:top"> <th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> - <p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your username is: john</p> + <p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your Login is: john</p> </th> <th class="expander" style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> </tr> @@ -363,7 +363,7 @@ Welcome aboard Welcome to your TestCloud account, you can add, protect, and share your data. -Your username is: john +Your Login is: john Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken @@ -498,7 +498,7 @@ EOF; <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> <tr style="padding:0;text-align:left;vertical-align:top"> <th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> - <p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your username is: john</p> + <p style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:center">Your Login is: john</p> </th> <th class="expander" style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th> </tr> @@ -599,7 +599,7 @@ Welcome aboard John Doe Welcome to your TestCloud account, you can add, protect, and share your data. -Your username is: john +Your Login is: john Go to TestCloud: https://example.com/ diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 60b7f20b88d..1c7b716e1e4 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -116,8 +116,8 @@ class ShareByMailProvider implements IShareProvider { */ $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 the account %2$s'; + $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); } diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue index d674d024b2c..a39ecfee99c 100644 --- a/apps/sharebymail/src/components/AdminSettings.vue +++ b/apps/sharebymail/src/components/AdminSettings.vue @@ -22,7 +22,7 @@ <template> <NcSettingsSection :name="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)"> diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index 84f38bb17d3..e6f90ec44f7 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -3,8 +3,8 @@ xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> <id>systemtags</id> <name>Collaborative tags</name> - <summary>Collaborative tagging functionality which shares tags among users.</summary> - <description>Collaborative tagging functionality which shares tags among users. Great for teams. + <summary>Collaborative tagging functionality which shares tags among people.</summary> + <description>Collaborative tagging functionality which shares tags among people. Great for teams. (If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)</description> <version>1.19.0</version> <licence>agpl</licence> diff --git a/apps/systemtags/openapi.json b/apps/systemtags/openapi.json index 691717c6484..e27985c441d 100644 --- a/apps/systemtags/openapi.json +++ b/apps/systemtags/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "systemtags", "version": "0.0.1", - "description": "Collaborative tagging functionality which shares tags among users.", + "description": "Collaborative tagging functionality which shares tags among people.", "license": { "name": "agpl" } diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue index 36e9b822b19..ad9aa175feb 100644 --- a/apps/updatenotification/src/components/UpdateNotification.vue +++ b/apps/updatenotification/src/components/UpdateNotification.vue @@ -42,7 +42,7 @@ <template v-if="!isWebUpdaterRecommended && updaterEnabled && webUpdaterEnabled"> <h3 class="warning"> - {{ t('updatenotification', 'Please note that the web updater is not recommended with more than 100 users! Please use the command line updater instead!') }} + {{ t('updatenotification', 'Please note that the web updater is not recommended with more than 100 accounts! Please use the command line updater instead!') }} </h3> </template> @@ -233,7 +233,7 @@ export default { }, noteDelayedStableString() { - return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}') + return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}') .replace('{link}', '<a href="https://nextcloud.com/release-channels/">https://nextcloud.com/release-channels/</a>') }, diff --git a/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php b/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php index 8b6bf859142..2cf3b700b01 100644 --- a/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php +++ b/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php @@ -54,7 +54,7 @@ class LdapInvalidUuids implements ISetupCheck { && count($this->groupMapping->getList(0, 1, true)) === 0) { return SetupResult::success($this->l10n->t('None found')); } else { - return SetupResult::warning($this->l10n->t('Invalid UUIDs of LDAP users or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.')); + return SetupResult::warning($this->l10n->t('Invalid UUIDs of LDAP accounts or groups have been found. Please review your "Override UUID detection" settings in the Expert part of the LDAP configuration and use "occ ldap:update-uuid" to update them.')); } } } diff --git a/apps/weather_status/appinfo/info.xml b/apps/weather_status/appinfo/info.xml index cdc28262442..0fe007dec02 100644 --- a/apps/weather_status/appinfo/info.xml +++ b/apps/weather_status/appinfo/info.xml @@ -5,7 +5,7 @@ <name>Weather status</name> <summary>Weather status in your dashboard</summary> <description><![CDATA[Weather status integrated in the Dashboard app. - User's position can be automatically determined or manually defined. A 6 hours forecast is then displayed. + The geographic location can be automatically determined or manually defined. A 6 hours forecast is then displayed. This status can also be integrated in other places like the Calendar app.]]></description> <version>1.9.0</version> <licence>agpl</licence> diff --git a/apps/workflowengine/src/components/Checks/request.js b/apps/workflowengine/src/components/Checks/request.js index 9f33bac6676..e04ed1b9c93 100644 --- a/apps/workflowengine/src/components/Checks/request.js +++ b/apps/workflowengine/src/components/Checks/request.js @@ -59,7 +59,7 @@ const RequestChecks = [ }, { class: 'OCA\\WorkflowEngine\\Check\\UserGroupMembership', - name: t('workflowengine', 'User group membership'), + name: t('workflowengine', 'Group membership'), operators: [ { operator: 'is', name: t('workflowengine', 'is member of') }, { operator: '!is', name: t('workflowengine', 'is not member of') }, |