diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php index 94a46bbce785e..9501c8b954c14 100644 --- a/apps/comments/lib/Notification/Notifier.php +++ b/apps/comments/lib/Notification/Notifier.php @@ -123,7 +123,7 @@ public function prepare(INotification $notification, string $languageCode): INot ]; if ($isDeletedActor) { - $subject = $l->t('You were mentioned on "{file}", in a comment by a user that has since been deleted'); + $subject = $l->t('You were mentioned on "{file}", in a comment by an account that has since been deleted'); } else { $subject = $l->t('{user} mentioned you in a comment on "{file}"'); $subjectParameters['user'] = [ diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php index 9281bb99fe873..e94f0686f18e2 100644 --- a/apps/comments/tests/Unit/Notification/NotifierTest.php +++ b/apps/comments/tests/Unit/Notification/NotifierTest.php @@ -211,7 +211,7 @@ public function testPrepareSuccess() { public function testPrepareSuccessDeletedUser() { $fileName = 'Gre\'thor.odp'; - $message = 'You were mentioned on "Gre\'thor.odp", in a comment by a user that has since been deleted'; + $message = 'You were mentioned on "Gre\'thor.odp", in a comment by an account that has since been deleted'; /** @var Node|MockObject $node */ $node = $this->createMock(Node::class); @@ -255,7 +255,7 @@ public function testPrepareSuccessDeletedUser() { $this->notification ->expects($this->once()) ->method('setRichSubject') - ->with('You were mentioned on "{file}", in a comment by a user that has since been deleted', $this->anything()) + ->with('You were mentioned on "{file}", in a comment by an account that has since been deleted', $this->anything()) ->willReturnSelf(); $this->notification ->expects($this->once()) diff --git a/apps/contactsinteraction/appinfo/info.xml b/apps/contactsinteraction/appinfo/info.xml index 0760d9b3626f0..4edaf402e08e2 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"> contactsinteraction Contacts Interaction - Manages interaction between users and contacts - Collect data about user and contacts interactions and provide an address book for the data + Manages interaction between accounts and contacts + Collect data about accounts and contacts interactions and provide an address book for the data 1.10.0 agpl Christoph Wurst diff --git a/apps/dashboard/appinfo/info.xml b/apps/dashboard/appinfo/info.xml index b5b739014ad34..b4f2000123c77 100644 --- a/apps/dashboard/appinfo/info.xml +++ b/apps/dashboard/appinfo/info.xml @@ -6,7 +6,7 @@ Dashboard app +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.]]> 7.9.0 agpl diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php index a2e7378f32de1..5ab99c34b7942 100644 --- a/apps/dav/lib/Controller/OutOfOfficeController.php +++ b/apps/dav/lib/Controller/OutOfOfficeController.php @@ -57,7 +57,7 @@ public function __construct( } /** - * Get the currently configured out-of-office data of a user. + * Get the currently configured out-of-office data of a user * * @param string $userId The user id to get out-of-office data for. * @return DataResponse|DataResponse diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json index a0df1cedd16fd..6200fbafb4f90 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 627788391426e..b39e5671da1f0 100644 --- a/apps/dav/src/views/Availability.vue +++ b/apps/dav/src/views/Availability.vue @@ -1,7 +1,7 @@