Merge pull request #53101 from nextcloud/backport/52897/stable31

Author: skjnldsv

apps/settings/src/components/GroupListItem.vue

@@ -13,7 +13,7 @@
 				</h2>
 				<NcNoteCard type="warning"
 					show-alert>
-					{{ t('settings', 'You are about to remove the group "{group}". The accounts will NOT be deleted.', { group: name }) }}
+					{{ t('settings', 'You are about to delete the group "{group}". The accounts will NOT be deleted.', { group: name }) }}
 				</NcNoteCard>
 				<div class="modal__button-row">
 					<NcButton type="secondary"
@@ -62,7 +62,7 @@
 					<template #icon>
 						<Delete :size="20" />
 					</template>
-					{{ t('settings', 'Remove group') }}
+					{{ t('settings', 'Delete group') }}
 				</NcActionButton>
 			</template>
 		</NcAppNavigationItem>
@@ -179,7 +179,7 @@ export default {
 				await this.$store.dispatch('removeGroup', this.id)
 				this.showRemoveGroupModal = false
 			} catch (error) {
-				showError(t('settings', 'Failed to remove group "{group}"', { group: this.name }))
+				showError(t('settings', 'Failed to delete group "{group}"', { group: this.name }))
 			}
 		},
 	},

cypress/e2e/settings/users_groups.cy.ts

@@ -139,8 +139,8 @@ describe('Settings: Delete an empty group', { testIsolation: false }, () => {
 	})
 
 	it('can delete the group', () => {
-		// The "Remove group" action in the actions menu is shown and clicked
-		cy.get('.action-item__popper button').contains('Remove group').should('exist').click({ force: true })
+		// The "Delete group" action in the actions menu is shown and clicked
+		cy.get('.action-item__popper button').contains('Delete group').should('exist').click({ force: true })
 		// And confirmation dialog accepted
 		cy.get('.modal-container button').contains('Confirm').click({ force: true })
 
@@ -190,8 +190,8 @@ describe('Settings: Delete a non empty group', () => {
 			.find('button.action-item__menutoggle')
 			.click({ force: true })
 
-		// The "Remove group" action in the actions menu is shown and clicked
-		cy.get('.action-item__popper button').contains('Remove group').should('exist').click({ force: true })
+		// The "Delete group" action in the actions menu is shown and clicked
+		cy.get('.action-item__popper button').contains('Delete group').should('exist').click({ force: true })
 		// And confirmation dialog accepted
 		cy.get('.modal-container button').contains('Confirm').click({ force: true })