Repository: owncloud/ocis
Pull request #6259 (2023-05-09 10:30:56)

Omitempty givenName attribute when create user #5431
<!--
Thanks for submitting a change to ownCloud!

This is the bug tracker for the oCIS component. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines

For fixing potential security issues please see https://owncloud.org/security/

To make it possible for us to get your change reviewed and merged please carefully fill out the requested information below.

Please note that any kind of change needs first be submitted to the master branch which holds the next version of oCIS.

Please set the following labels:

- Set label "Status:Needs-Review" for review or "Status:In-Progress" if the PR still has open tasks.
- Assignment: assign to self
- Reviewers: pick at least one
-->

## Description
<!--- Describe your changes in detail -->

## Related Issue
<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->
- Fixes [<issue_link>](https://github.com/owncloud/ocis/issues/5431)


## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->
- test environment: local, curl
- test case 1: 
```bash 
curl -k -X 'POST' -u admin:admin  'https://localhost:9200/graph/v1.0/users' --data '{ "onPremisesSamAccountName": "test1", "displayName":"test1", "mail":"test1@test.test"}' | jq .

{
  "displayName": "test1",
  "id": "681dca41-b674-49f6-84c2-5ebf48b92851",
  "mail": "test1@test.test",
  "onPremisesSamAccountName": "test1",
  "surname": "test1",
  "userType": "Member"
}
```

## Screenshots (if appropriate):

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Technical debt
- [ ] Tests only (no source changes)

## Checklist:
<!-- Tick the checkboxes when done. -->
<!-- Raise documentation ticket in owncloud.github.io/ -->
- [ ] Code changes
- [ ] Unit tests added
- [ ] Acceptance tests added
- [ ] Documentation ticket raised: <link> 



Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2e3ee8df8..3704f87f27a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3442,7 +3442,7 @@ The following sections list the changes for 2.0.0.
 
 The following sections list the changes for 1.20.0.
 
-[1.20.0]: https://github.com/owncloud/ocis/compare/v1.19.1...v1.20.0
+[1.20.0]: https://github.com/owncloud/ocis/compare/v1.19.0...v1.20.0
 
 ## Summary
 
@@ -3610,28 +3610,11 @@ The following sections list the changes for 1.20.0.
    Group member remove
 
    https://github.com/owncloud/ocis/pull/3467
-# Changelog for [1.19.1] (2022-03-29)
-
-The following sections list the changes for 1.19.1.
-
-[1.19.1]: https://github.com/owncloud/ocis/compare/v1.19.0...v1.19.1
-
-## Summary
-
-* Bugfix - Return correct special item urls: [#3419](https://github.com/owncloud/ocis/pull/3419)
-
-## Details
-
-* Bugfix - Return correct special item urls: [#3419](https://github.com/owncloud/ocis/pull/3419)
-
-   URLs for Special items (space image, readme) were broken.
-
-   https://github.com/owncloud/ocis/pull/3419
 # Changelog for [1.19.0] (2022-03-29)
 
 The following sections list the changes for 1.19.0.
 
-[1.19.0]: https://github.com/owncloud/ocis/compare/v1.18.0...v1.19.0
+[1.19.0]: https://github.com/owncloud/ocis/compare/v1.19.1...v1.19.0
 
 ## Summary
 
@@ -3800,6 +3783,23 @@ The following sections list the changes for 1.19.0.
    https://github.com/owncloud/ocis/pull/3291
    https://github.com/owncloud/ocis/pull/3375
    https://github.com/owncloud/web/releases/tag/v5.3.0
+# Changelog for [1.19.1] (2022-03-29)
+
+The following sections list the changes for 1.19.1.
+
+[1.19.1]: https://github.com/owncloud/ocis/compare/v1.18.0...v1.19.1
+
+## Summary
+
+* Bugfix - Return correct special item urls: [#3419](https://github.com/owncloud/ocis/pull/3419)
+
+## Details
+
+* Bugfix - Return correct special item urls: [#3419](https://github.com/owncloud/ocis/pull/3419)
+
+   URLs for Special items (space image, readme) were broken.
+
+   https://github.com/owncloud/ocis/pull/3419
 # Changelog for [1.18.0] (2022-03-03)
 
 The following sections list the changes for 1.18.0.
diff --git a/changelog/unreleased/fix-omitempty-givenName.md b/changelog/unreleased/fix-omitempty-givenName.md
new file mode 100644
index 00000000000..08ae5157a9a
--- /dev/null
+++ b/changelog/unreleased/fix-omitempty-givenName.md
@@ -0,0 +1,6 @@
+Bugfix: Fix the empty string givenName attribute when creating user
+
+Omitempty givenName attribute when creating user
+
+https://github.com/owncloud/ocis/issues/5431
+https://github.com/owncloud/ocis/pull/6259
diff --git a/services/graph/pkg/identity/ldap.go b/services/graph/pkg/identity/ldap.go
index 6920a43f4cf..c64eaab9a4a 100644
--- a/services/graph/pkg/identity/ldap.go
+++ b/services/graph/pkg/identity/ldap.go
@@ -784,7 +784,6 @@ func (i *LDAP) createUserModelFromLDAP(e *ldap.Entry) *libregraph.User {
 	if err != nil {
 		i.logger.Warn().Str("dn", e.DN).Str(i.userAttributeMap.id, e.GetAttributeValue(i.userAttributeMap.id)).Msg("Invalid User. Cannot convert UUID")
 	}
-	givenName := e.GetEqualFoldAttributeValue(i.userAttributeMap.givenName)
 	surname := e.GetEqualFoldAttributeValue(i.userAttributeMap.surname)
 
 	if id != "" && opsan != "" {
@@ -793,7 +792,7 @@ func (i *LDAP) createUserModelFromLDAP(e *ldap.Entry) *libregraph.User {
 			Mail:                     pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.mail)),
 			OnPremisesSamAccountName: &opsan,
 			Id:                       &id,
-			GivenName:                &givenName,
+			GivenName:                pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.givenName)),
 			Surname:                  &surname,
 			UserType:                 pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.userType)),
 			AccountEnabled:           booleanOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.accountEnabled)),
diff --git a/services/notifications/pkg/email/l10n/locale/ca/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/ca/LC_MESSAGES/notifications.po
index 4f4f218d789..f2dbcd5a5db 100644
--- a/services/notifications/pkg/email/l10n/locale/ca/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/ca/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-21 00:34+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Arnau Morancho, 2023\n"
 "Language-Team: Catalan (https://app.transifex.com/owncloud-org/teams/6149/ca/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "Clica aquí per verificar: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Clica aquí per visualitzar: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Bones {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Bones {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Bones {SpaceGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "Incripció a '{SpaceName}' ha caducat el {ExpiredAt}"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "Compartir a '{ShareFolder}' caducat el {ExpiredAt}"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Encara que aquesta inscripció hagi caducat, podria seguir tenint accés a través d'altres comparticions i/o espais inscrit."
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Encara que aquesta compartició ha estat cancel·lada, podria seguir tenint accés a través d'altres comparticions i/o espais inscrits."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} ha compartit \"{ShareFolder}\" amb tu."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} comparteix \"{ShareFolder}\" amb tu"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} l'ha invitat a unir-se a \"{SpaceName}\"."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "Podria seguir tenint accés a través d'altres grups o d'incripció directa."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} l'invita a unir-se {SpaceName}"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} l'ha eliminat de {SpaceName}"
diff --git a/services/notifications/pkg/email/l10n/locale/de/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/de/LC_MESSAGES/notifications.po
index cb4a3ea2d8e..8197a606925 100644
--- a/services/notifications/pkg/email/l10n/locale/de/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/de/LC_MESSAGES/notifications.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-21 00:34+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: hurradieweltgehtunter <florian@owncloud.com>, 2023\n"
 "Language-Team: German (https://app.transifex.com/owncloud-org/teams/6149/de/)\n"
@@ -23,46 +23,46 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "Zum Überprüfen hier klicken: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Zum Ansehen hier klicken: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Hallo {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Hallo {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Hallo {ShareGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "Die Mitgliedschaft für '{SpaceName}' ist am {ExpiredAt} abgelaufen."
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "Die Freigabe für '{ShareFolder}' ist am {ExpiredAt} abgelaufen."
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Über eventuelle weitere Freigaben oder Space-Mitgliedschaften kann der Zugriff trotzdem weiterhin möglich sein."
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Über eventuelle weitere Freigaben oder Space-Mitgliedschaften kann der Zugriff trotzdem weiterhin möglich sein."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} hat \"{ShareFolder}\" mit Ihnen geteilt."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} hat \"{ShareFolder}\" mit Ihnen geteilt"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} hat Sie eingeladen, dem Space \"{SpaceName}\" beizutreten."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "Über eventuelle weitere Freigaben oder Space-Mitgliedschaften kann der Zugriff trotzdem weiterhin möglich sein."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} hat Sie eingeladen, dem Space {SpaceName} beizutreten."
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} hat Sie aus dem Space {SpaceName} entfernt."
diff --git a/services/notifications/pkg/email/l10n/locale/de_DE/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/de_DE/LC_MESSAGES/notifications.po
index 9a115f834f9..a434807bea9 100644
--- a/services/notifications/pkg/email/l10n/locale/de_DE/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/de_DE/LC_MESSAGES/notifications.po
@@ -2,118 +2,101 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Edith Parzefall, 2023
-# 
+#
 #, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
-"PO-Revision-Date: 2023-04-19 11:11+0000\n"
-"Last-Translator: Edith Parzefall, 2023\n"
-"Language-Team: German (Germany) (https://app.transifex.com/owncloud-org/teams/6149/de_DE/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
-msgid "Click here to check it: {ShareLink}"
-msgstr "Hier klicken, um zu prüfen: {ShareLink}"
-
-#. ShareCreated email template, resolves via {{ .CallToAction }}
-#. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
-msgid "Click here to view it: {ShareLink}"
-msgstr "Zum Ansehen hier klicken: {ShareLink}"
-
-#. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
-msgid "Hello {ShareGrantee}"
-msgstr "Hallo {ShareGrantee}"
-
-#. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
-msgid "Hello {ShareGrantee},"
-msgstr "Hallo {ShareGrantee},"
-
-#. SharedSpace email template, resolves via {{ .Greeting }}
-#. UnsharedSpace email template, resolves via {{ .Greeting }}
-#. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
-msgid "Hello {SpaceGrantee},"
-msgstr "Hallo {ShareGrantee},"
-
-#. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
-msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
-msgstr "Mitgliedschaft in '{SpaceName}' abgelaufen am {ExpiredAt}"
-
-#. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
-msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
-msgstr "Freigabe für '{ShareFolder}' abgelaufen am {ExpiredAt}"
-
-#. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
-msgid ""
-"Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
-"\n"
-"Even though this membership has expired you still might have access through other shares and/or space memberships"
-msgstr ""
-"Die Mitgliedschaft im Space {SpaceName} ist am {ExpiredAt} abgelaufen.\n"
-"\n"
-"Trotzdem haben Sie möglicherweise noch Zugriff durch andere Freigaben oder Space-Mitgliedschaften."
-
-#. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
-msgid ""
-"Your share to {ShareFolder} has expired at {ExpiredAt}\n"
-"\n"
-"Even though this share has been revoked you still might have access through other shares and/or space memberships."
-msgstr ""
-"Ihre Freigabe für {ShareFolder} ist am {ExpiredAt} abgelaufen.\n"
-"\n"
-"Obwohl die Freigabe zurückgezogen wurde, haben Sie vielleicht noch Zugriff durch andere Freigaben oder Space-Mitgliedschaften.."
-
-#. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
-msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
-msgstr "{ShareSharer} hat \"{ShareFolder}\" mit Ihnen geteilt."
-
-#. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
-msgid "{ShareSharer} shared '{ShareFolder}' with you"
-msgstr "{ShareSharer} hat \"{ShareFolder}\" mit Ihnen geteilt."
-
-#. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
-msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
-msgstr "{SpaceSharer} hat Sie in den Space \"{SpaceName}\" eingeladen."
-
-#. UnsharedSpace email template, resolves via {{ .MessageBody }}
+msgid   ""
+msgstr  "Project-Id-Version: \n"
+        "Report-Msgid-Bugs-To: EMAIL\n"
+        "POT-Creation-Date: 2023-04-14 16:58+0200\n"
+        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <LL@li.org>\n"
+        "Language: \n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=CHARSET\n"
+        "Content-Transfer-Encoding: 8bit\n"
+
+#. UnsharedSpace email template, CallToAction field
 #: pkg/email/templates.go:57
-msgid ""
-"{SpaceSharer} has removed you from \"{SpaceName}\".\n"
-"\n"
-"You might still have access through your other groups or direct membership."
-msgstr ""
-"{SpaceSharer} hat Sie aus dem Space \"{SpaceName}\" entfernt.\n"
-"\n"
-"Sie haben möglicherweise noch Zugriff durch andere Gruppen oder direkte Mitgliedschaft."
-
-#. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
-msgid "{SpaceSharer} invited you to join {SpaceName}"
-msgstr "{SpaceSharer} hat Sie in den Space {SpaceName} eingeladen."
-
-#. UnsharedSpace email template, Subject field (resolves directly)
+msgid   "Click here to check it: {ShareLink}"
+msgstr  ""
+
+#. ShareCreated email template, CallToAction field
+#. SharedSpace email template, CallToAction field
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
+msgid   "Click here to view it: {ShareLink}"
+msgstr  ""
+
+#. ShareCreated email template, Greeting field
+#: pkg/email/templates.go:14
+msgid   "Hello {ShareGrantee}"
+msgstr  ""
+
+#. ShareExpired email template, Greeting field
+#: pkg/email/templates.go:26
+msgid   "Hello {ShareGrantee},"
+msgstr  ""
+
+#. SharedSpace email template, Greeting field
+#. UnsharedSpace email template, Greeting field
+#. MembershipExpired email template, Greeting field
+#: pkg/email/templates.go:39 pkg/email/templates.go:51 pkg/email/templates.go:65
+msgid   "Hello {SpaceGrantee},"
+msgstr  ""
+
+#. MembershipExpired email template, Subject field
+#: pkg/email/templates.go:63
+msgid   "Membership of '{SpaceName}' expired at {ExpiredAt}"
+msgstr  ""
+
+#. ShareExpired email template, Subject field
+#: pkg/email/templates.go:24
+msgid   "Share to '{ShareFolder}' expired at {ExpiredAt}"
+msgstr  ""
+
+#. MembershipExpired email template, Message field
+#: pkg/email/templates.go:67
+msgid   "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
+        "\n"
+        "Even though this membership has expired you still might have access through other shares and/or space memberships"
+msgstr  ""
+
+#. ShareExpired email template, Message field
+#: pkg/email/templates.go:28
+msgid   "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
+        "\n"
+        "Even though this share has been revoked you still might have access through other shares and/or space memberships."
+msgstr  ""
+
+#. ShareCreated email template, Message field
+#: pkg/email/templates.go:16
+msgid   "{ShareSharer} has shared \"{ShareFolder}\" with you."
+msgstr  ""
+
+#. ShareCreated email template, Subject field
+#: pkg/email/templates.go:12
+msgid   "{ShareSharer} shared '{ShareFolder}' with you"
+msgstr  ""
+
+#. SharedSpace email template, Message field
+#: pkg/email/templates.go:41
+msgid   "{SpaceSharer} has invited you to join \"{SpaceName}\"."
+msgstr  ""
+
+#. UnsharedSpace email template, Message field
 #: pkg/email/templates.go:53
-msgid "{SpaceSharer} removed you from {SpaceName}"
-msgstr "{SpaceSharer} hat Sie aus dem Space {SpaceName} entfernt."
+msgid   "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
+        "\n"
+        "You might still have access through your other groups or direct membership."
+msgstr  ""
+
+#. SharedSpace email template, Subject field
+#: pkg/email/templates.go:37
+msgid   "{SpaceSharer} invited you to join {SpaceName}"
+msgstr  ""
+
+#. UnsharedSpace email template, Subject field
+#: pkg/email/templates.go:49
+msgid   "{SpaceSharer} removed you from {SpaceName}"
+msgstr  ""
+
diff --git a/services/notifications/pkg/email/l10n/locale/en_GB/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/en_GB/LC_MESSAGES/notifications.po
index 54eb1a2826c..8b46559ada4 100644
--- a/services/notifications/pkg/email/l10n/locale/en_GB/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/en_GB/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-05-01 00:16+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2023\n"
 "Language-Team: English (United Kingdom) (https://app.transifex.com/owncloud-org/teams/6149/en_GB/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "Click here to check it: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Click here to view it: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Hello {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Hello {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Hello {SpaceGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "Membership of '{SpaceName}' expired at {ExpiredAt}"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "Share to '{ShareFolder}' expired at {ExpiredAt}"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Even though this membership has expired you still might have access through other shares and/or space memberships"
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Even though this share has been revoked you still might have access through other shares and/or space memberships."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} has shared \"{ShareFolder}\" with you."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} shared '{ShareFolder}' with you"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "You might still have access through your other groups or direct membership."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} invited you to join {SpaceName}"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} removed you from {SpaceName}"
diff --git a/services/notifications/pkg/email/l10n/locale/es/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/es/LC_MESSAGES/notifications.po
index 415a3ba9090..dbad9551808 100644
--- a/services/notifications/pkg/email/l10n/locale/es/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/es/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-20 04:03+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Juan Carlos Garrote, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/owncloud-org/teams/6149/es/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "Click aquí para comprobarlo: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Click aquí para verlo: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Hola {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Hola {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Hola {SpaceGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "La membresía de '{SpaceName}' caducó en {ExpiredAt}"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "La compartición a '{ShareFolder}' caducó en {ExpiredAt}"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Aunque esta membresía ha caducado, aún puedes tener acceso a través de otras comparticiones y/o membresías al space"
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Aunque esta compartición ha sido anulada, aún puedes tener acceso a través de otras comparticiones y/o membresías al space."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} ha compartido \"{ShareFolder}\" contigo."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} compartió '{ShareFolder}' contigo"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} te ha invitado a unirte a \"{SpaceName}\"."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "Aún puedes tener acceso a través de tus otros grupos o membresía directa."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} te invitó a unirte a {SpaceName}"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} te eliminó de {SpaceName}"
diff --git a/services/notifications/pkg/email/l10n/locale/ko/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/ko/LC_MESSAGES/notifications.po
index 7c8fbeb1c20..5721f9ae650 100644
--- a/services/notifications/pkg/email/l10n/locale/ko/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/ko/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-23 00:34+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Hugo Blackwood, 2023\n"
 "Language-Team: Korean (https://app.transifex.com/owncloud-org/teams/6149/ko/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "여기를 클릭하여 확인: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "여기를 클릭하여 보기: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "안녕하세요, {ShareGrantee} 님"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "안녕하세요, {ShareGrantee} 님,"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "안녕하세요, {SpaceGrantee} 님,"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "'{SpaceName}' 멤버십이 {ExpiredAt} 일자에 만료됨"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "'{ShareFolder}' 공유가 {ExpiredAt} 일자에 만료됨"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "멤버십이 만료되더라도 다른 공유 및/또는 스페이스 멤버십에 접근이 가능할 수도 있습니다."
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "멤버십이 만료되더라도 다른 공유 및/또는 스페이스 멤버십에 접근이 가능할 수도 있습니다."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} 님이 \"{ShareFolder}\" 폴더를 나와 공유했습니다."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} 님이 \"{ShareFolder}\" 폴더를 나와 공유함"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} 님이 \"{SpaceName}\" 스페이스에 나를 초대했습니다."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "다른 그룹 또는 직접 멤버십을 통해 접근이 가능할 수도 있습니다."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} 님이 {SpaceName} 스페이스에 나를 초대함"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} 님이 {SpaceName} 스페이스에서 나를 제거함"
diff --git a/services/notifications/pkg/email/l10n/locale/pt_BR/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/pt_BR/LC_MESSAGES/notifications.po
index 8ddfe42afb8..a395e8b5865 100644
--- a/services/notifications/pkg/email/l10n/locale/pt_BR/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/pt_BR/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-27 00:19+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>, 2023\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/owncloud-org/teams/6149/pt_BR/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr "Clique aqui para conferir: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Clique aqui para visualizá-lo: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Olá {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Olá {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Olá {SpaceGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "A assinatura de '{SpaceName}' expirou em {ExpiredAt}"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "Compartilhar em '{ShareFolder}' expirou em {ExpiredAt}"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Mesmo que esta assinatura tenha expirado, você ainda pode ter acesso por meio de outros compartilhamentos e/ou assinaturas de espaço"
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Mesmo que este compartilhamento tenha sido revogado, você ainda pode ter acesso por meio de outros compartilhamentos e/ou associações de espaço."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} compartilhou \"{ShareFolder}\" com você."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} compartilhou '{ShareFolder}' com você"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} convidou você para participar de \"{SpaceName}\"."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "Você ainda pode ter acesso por meio de outros grupos ou associação direta."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} convidou você para participar de {SpaceName}"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} removeu você de {SpaceName}"
diff --git a/services/notifications/pkg/email/l10n/locale/ru/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/ru/LC_MESSAGES/notifications.po
index ea3a6c26adc..ee12d025599 100644
--- a/services/notifications/pkg/email/l10n/locale/ru/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/ru/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-05-04 00:25+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Roman Perekhod, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/owncloud-org/teams/6149/ru/)\n"
@@ -69,7 +69,7 @@ msgid ""
 msgstr ""
 "Срок действия вашего членства в пространстве {SpaceName} истёк {ExpiredAt}\n"
 "\n"
-"Несмотря на то, что срок действия членства истёк, у вас все еще может быть доступ через другие общие ресурсы и/или членство в пространстве."
+"Несмотря на то, что срок действия этого членства истёк, у вас все еще может быть доступ через другие общие ресурсы и/или членство в пространстве."
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
 #: pkg/email/templates.go:30
diff --git a/services/notifications/pkg/email/l10n/locale/sq/LC_MESSAGES/notifications.po b/services/notifications/pkg/email/l10n/locale/sq/LC_MESSAGES/notifications.po
index 6490d645f39..bb8c2163987 100644
--- a/services/notifications/pkg/email/l10n/locale/sq/LC_MESSAGES/notifications.po
+++ b/services/notifications/pkg/email/l10n/locale/sq/LC_MESSAGES/notifications.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-04-23 00:34+0000\n"
 "PO-Revision-Date: 2023-04-19 11:11+0000\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>, 2023\n"
 "Language-Team: Albanian (https://app.transifex.com/owncloud-org/teams/6149/sq/)\n"
@@ -22,46 +22,46 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. UnsharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:61
+#: pkg/email/templates.go:57
 msgid "Click here to check it: {ShareLink}"
 msgstr ""
 
 #. ShareCreated email template, resolves via {{ .CallToAction }}
 #. SharedSpace email template, resolves via {{ .CallToAction }}
-#: pkg/email/templates.go:19 pkg/email/templates.go:46
+#: pkg/email/templates.go:18 pkg/email/templates.go:43
 msgid "Click here to view it: {ShareLink}"
 msgstr "Klikoni këtu që ta shihni: {ShareLink}"
 
 #. ShareCreated email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:15
+#: pkg/email/templates.go:14
 msgid "Hello {ShareGrantee}"
 msgstr "Tungjatjeta {ShareGrantee}"
 
 #. ShareExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:28
+#: pkg/email/templates.go:26
 msgid "Hello {ShareGrantee},"
 msgstr "Tungjatjeta {ShareGrantee},"
 
 #. SharedSpace email template, resolves via {{ .Greeting }}
 #. UnsharedSpace email template, resolves via {{ .Greeting }}
 #. MembershipExpired email template, resolves via {{ .Greeting }}
-#: pkg/email/templates.go:42 pkg/email/templates.go:55
-#: pkg/email/templates.go:70
+#: pkg/email/templates.go:39 pkg/email/templates.go:51
+#: pkg/email/templates.go:65
 msgid "Hello {SpaceGrantee},"
 msgstr "Tungjatjeta {SpaceGrantee},"
 
 #. MembershipExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:68
+#: pkg/email/templates.go:63
 msgid "Membership of '{SpaceName}' expired at {ExpiredAt}"
 msgstr "Anëtarësia në '{SpaceName}' skadoi më {ExpiredAt}"
 
 #. ShareExpired email template, Subject field (resolves directly)
-#: pkg/email/templates.go:26
+#: pkg/email/templates.go:24
 msgid "Share to '{ShareFolder}' expired at {ExpiredAt}"
 msgstr "Pjesa te “{ShareFolder}” skadoi më {ExpiredAt}"
 
 #. MembershipExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:72
+#: pkg/email/templates.go:67
 msgid ""
 "Your membership of space {SpaceName} has expired at {ExpiredAt}\n"
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Edhe pse kjo anëtarësi ka skaduar, mundet që ende të keni hyrje në të përmes ndarjesh dhe/ose anëtarësish hapësirash të tjera"
 
 #. ShareExpired email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:30
+#: pkg/email/templates.go:28
 msgid ""
 "Your share to {ShareFolder} has expired at {ExpiredAt}\n"
 "\n"
@@ -83,22 +83,22 @@ msgstr ""
 "Edhe pse kjo pjesë është shfuqizuar, mundet që ende të keni hyrje në të përmes ndarjesh dhe/ose anëtarësish hapësirash të tjera."
 
 #. ShareCreated email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:17
+#: pkg/email/templates.go:16
 msgid "{ShareSharer} has shared \"{ShareFolder}\" with you."
 msgstr "{ShareSharer} ka ndarë “{ShareFolder}” me ju."
 
 #. ShareCreated email template, Subject field (resolves directly)
-#: pkg/email/templates.go:13
+#: pkg/email/templates.go:12
 msgid "{ShareSharer} shared '{ShareFolder}' with you"
 msgstr "{ShareSharer} ndau “{ShareFolder}” me ju"
 
 #. SharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:44
+#: pkg/email/templates.go:41
 msgid "{SpaceSharer} has invited you to join \"{SpaceName}\"."
 msgstr "{SpaceSharer} ju ka ftuar të merrni pjesë në “{SpaceName}”."
 
 #. UnsharedSpace email template, resolves via {{ .MessageBody }}
-#: pkg/email/templates.go:57
+#: pkg/email/templates.go:53
 msgid ""
 "{SpaceSharer} has removed you from \"{SpaceName}\".\n"
 "\n"
@@ -109,11 +109,11 @@ msgstr ""
 "Mundet që ende të keni hyrje në të përmes grupeve tuaja të tjera, ose anëtarësimi të drejtpërdrejtë."
 
 #. SharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:40
+#: pkg/email/templates.go:37
 msgid "{SpaceSharer} invited you to join {SpaceName}"
 msgstr "{SpaceSharer} ju ftoi të merrni pjesë në {SpaceName}"
 
 #. UnsharedSpace email template, Subject field (resolves directly)
-#: pkg/email/templates.go:53
+#: pkg/email/templates.go:49
 msgid "{SpaceSharer} removed you from {SpaceName}"
 msgstr "{SpaceSharer} ju hoqi nga {SpaceName}"
diff --git a/services/userlog/pkg/service/l10n/locale/bg_BG/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/bg_BG/LC_MESSAGES/userlog.po
index 7b3c456f2ce..9c14bdcd7b4 100644
--- a/services/userlog/pkg/service/l10n/locale/bg_BG/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/bg_BG/LC_MESSAGES/userlog.po
@@ -11,61 +11,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-24 00:59+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Martin Zhekov <martin03staff@gmail.com>, 2023\n"
-"Language-Team: Bulgarian (Bulgaria) (https://app.transifex.com/owncloud-org/teams/6149/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/owncloud-org/teams/6149/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:34
 msgid "Access to Space {space} lost"
 msgstr "Достъпът до пространството {space} е изгубен"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:49
 msgid "Access to {resource} expired"
 msgstr "Достъпът до {resource} е изтекъл"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr ""
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:33
 msgid "Membership expired"
 msgstr "Срокът на членство е изтекъл"
 
-#: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr ""
-
-#: pkg/service/templates.go:24
+#: pkg/service/templates.go:18
 msgid "Removed from Space"
 msgstr "Премахнато от пространството"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:38
 msgid "Resource shared"
 msgstr "Ресурсът е споделен"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:43
 msgid "Resource unshared"
 msgstr "Ресурсът не е споделен"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:48
 msgid "Share expired"
 msgstr "Срокът на споделяне е изтекъл"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:28
 msgid "Space deleted"
 msgstr "Пространството е изтрито"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:23
 msgid "Space disabled"
 msgstr "Пространството е деактивирано"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:13
 msgid "Space shared"
 msgstr "Пространството е споделено"
 
@@ -77,26 +69,26 @@ msgstr ""
 msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
 msgstr ""
 
-#: pkg/service/templates.go:20
+#: pkg/service/templates.go:14
 msgid "{user} added you to Space {space}"
 msgstr "{user} ви добави в пространството {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:29
 msgid "{user} deleted Space {space}"
 msgstr "{user} изтри пространство {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:24
 msgid "{user} disabled Space {space}"
 msgstr "{user} деактивира пространството {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:19
 msgid "{user} removed you from Space {space}"
 msgstr "{user} ви премахна от пространството {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:39
 msgid "{user} shared {resource} with you"
 msgstr "{user} сподели {resource} с вас"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:44
 msgid "{user} unshared {resource} with you"
 msgstr "{user} прекрати споделянето на {resource} с вас"
diff --git a/services/userlog/pkg/service/l10n/locale/de/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/de/LC_MESSAGES/userlog.po
index e3f54762d7a..f84b1d47860 100644
--- a/services/userlog/pkg/service/l10n/locale/de/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/de/LC_MESSAGES/userlog.po
@@ -5,102 +5,82 @@
 # 
 # Translators:
 # Michael Barz <mbarz@owncloud.com>, 2023
-# hurradieweltgehtunter <florian@owncloud.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-15 09:23+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
-"Last-Translator: hurradieweltgehtunter <florian@owncloud.com>, 2023\n"
-"Language-Team: German (https://app.transifex.com/owncloud-org/teams/6149/de/)\n"
+"Last-Translator: Michael Barz <mbarz@owncloud.com>, 2023\n"
+"Language-Team: German (https://www.transifex.com/owncloud-org/teams/6149/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
-msgstr "Ihr Zugriff auf Space {space} ist abgelaufen."
+msgstr "Der Zugriff zu dem Space {space} wurde entfernt"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
-msgstr "Ihr Zugriff auf {resource} ist abgelaufen."
+msgstr "Der Zugriff auf {resource} ist abgelaufen"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr ""
-"Datei {resource} wurde gelöscht, weil sie gegen die Richtlinien verstößt."
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Mitgliedschaft abgelaufen"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr "Verstoß gegen Richtlinien"
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
-msgstr "Sie wurden aus einem Space entfernt"
+msgstr "Aus dem Space entfernt"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
-msgstr "Neue Freigabe"
+msgstr "Ressource geteilt"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
-msgstr "Freigabe entfernt"
+msgstr "Resource nicht mehr geteilt"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Freigabe abgelaufen"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Space gelöscht"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Space deaktiviert"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Space freigegeben"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr "Virus gefunden"
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr ""
-"In {resource} wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen.\n"
-"Grund: {virus}"
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
-msgstr "{user} hat Sie zu Space {space} hinzugefügt"
+msgstr "{user} hat Sie zum Space {space} hinzugefügt"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
-msgstr "{user} hat Space {space} gelöscht"
+msgstr "{user} hat den Space {space} gelöscht"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
-msgstr "{user} hat Space {space} deaktiviert"
+msgstr "{user} hat den Space {space} deaktiviert"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
-msgstr "{user} hat Sie aus Space {space} entfernt."
+msgstr "{user} hat Sie aus dem Space {space} entfernt"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} hat {resource} mit Ihnen geteilt"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
-msgstr "{user} hat die Freigabe auf {resource} für Sie aufgehoben"
+msgstr "{user} hat die Freigabe {resource} für Sie zurückgenommen"
diff --git a/services/userlog/pkg/service/l10n/locale/de_DE/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/de_DE/LC_MESSAGES/userlog.po
index e840623897c..7ec52fef64c 100644
--- a/services/userlog/pkg/service/l10n/locale/de_DE/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/de_DE/LC_MESSAGES/userlog.po
@@ -4,7 +4,6 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Michael Barz <mbarz@owncloud.com>, 2023
 # Edith Parzefall, 2023
 # 
 #, fuzzy
@@ -12,93 +11,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-15 23:03+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Edith Parzefall, 2023\n"
-"Language-Team: German (Germany) (https://app.transifex.com/owncloud-org/teams/6149/de_DE/)\n"
+"Language-Team: German (Germany) (https://www.transifex.com/owncloud-org/teams/6149/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "Der Zugriff zu dem Space {space} wurde entfernt"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Der Zugriff auf {resource} ist abgelaufen"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr ""
-"Datei {resource} wurde gelöscht, weil sie gegen Bestimmungen verstößt."
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Mitgliedschaft abgelaufen"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr "Bestimmungen erzwungen"
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "Aus dem Space entfernt"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Ressource geteilt"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "Resource nicht mehr geteilt"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Freigabe abgelaufen"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Space gelöscht"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Space deaktiviert"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Space freigegeben"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr "Virus gefunden"
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr "Virus in {resource} gefunden. Upload nicht möglich. Virus: {virus}"
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} hat Sie zum Space {space} hinzugefügt"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} hat den Space {space} gelöscht"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
 msgstr "{user} hat den Space {space} deaktiviert"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} hat Sie aus dem Space {space} entfernt"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} hat {resource} mit Ihnen geteilt"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
 msgstr "{user} hat die Freigabe {resource} für Sie zurückgenommen"
diff --git a/services/userlog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/userlog.po
index a1430600fa9..4b686745e2a 100644
--- a/services/userlog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/userlog.po
@@ -11,92 +11,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-19 00:04+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2023\n"
-"Language-Team: English (United Kingdom) (https://app.transifex.com/owncloud-org/teams/6149/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/owncloud-org/teams/6149/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "Access to Space {space} lost"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Access to {resource} expired"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr ""
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Membership expired"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr ""
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "Removed from Space"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Resource shared"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "Resource unshared"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Share expired"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Space deleted"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Space disabled"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Space shared"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr ""
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr ""
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} added you to Space {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} deleted Space {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
 msgstr "{user} disabled Space {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} removed you from Space {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} shared {resource} with you"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
 msgstr "{user} unshared {resource} with you"
diff --git a/services/userlog/pkg/service/l10n/locale/es/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/es/LC_MESSAGES/userlog.po
index 7ea2c43d185..4dc3219d2bb 100644
--- a/services/userlog/pkg/service/l10n/locale/es/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/es/LC_MESSAGES/userlog.po
@@ -11,93 +11,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-18 00:05+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Juan Carlos Garrote, 2023\n"
-"Language-Team: Spanish (https://app.transifex.com/owncloud-org/teams/6149/es/)\n"
+"Language-Team: Spanish (https://www.transifex.com/owncloud-org/teams/6149/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "Acceso al Space {space} perdido"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Acceso a {resource} expirado"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr "El archivo {resource} ha sido eliminado porque viola las políticas"
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Membresía expirada"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr "Políticas forzadas"
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "Eliminado del Space"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Recurso compartido"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "Recurso no compartido"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "La compartición del recurso expiró"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Space eliminado"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Space deshabilitado"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Space compartido"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr "Virus encontrado"
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr ""
-"Virus encontrado en {resource}. La subida no ha sido posible. Virus: {virus}"
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} te añadió al Space {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} eliminó el Space {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
 msgstr "{user} deshabilitó el Space {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} te eliminó del Space {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} compartió {resource} contigo"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
 msgstr "{user} dejó de compartir {resource} contigo"
diff --git a/services/userlog/pkg/service/l10n/locale/es_AR/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/es_AR/LC_MESSAGES/userlog.po
index 023b9192f51..11cf70e15cf 100644
--- a/services/userlog/pkg/service/l10n/locale/es_AR/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/es_AR/LC_MESSAGES/userlog.po
@@ -11,92 +11,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-17 00:42+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Toli Bal <tolicapo@gmail.com>, 2023\n"
-"Language-Team: Spanish (Argentina) (https://app.transifex.com/owncloud-org/teams/6149/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/owncloud-org/teams/6149/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "Acceso al espacio {space} perdido"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Acceso a {resource} expirado"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr ""
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Membresía expirada"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr ""
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "Quitado del Espacio"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Recurso compartido"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "Recurso privado"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Compartido expirado"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Espacio eliminado"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Espacio deshabilitado"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Espacio compartido"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr ""
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr ""
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} Te ha añadido al Espacio {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} eliminado del Espacio {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
 msgstr "{user} desactivado del Espacio {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} te ha quitado del Espacio {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} ha compartido {resource} contigo"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
 msgstr "{user} ha bloqueado tu acceso a {resource}"
diff --git a/services/userlog/pkg/service/l10n/locale/ko/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/ko/LC_MESSAGES/userlog.po
index 6b2fa9ef042..c0af8c4a5b8 100644
--- a/services/userlog/pkg/service/l10n/locale/ko/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/ko/LC_MESSAGES/userlog.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-25 01:02+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Hugo Blackwood, 2023\n"
-"Language-Team: Korean (https://app.transifex.com/owncloud-org/teams/6149/ko/)\n"
+"Language-Team: Korean (https://www.transifex.com/owncloud-org/teams/6149/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +31,7 @@ msgstr "{resource} 접근 권한 만료됨"
 
 #: pkg/service/templates.go:15
 msgid "File {resource} was deleted because it violates the policies"
-msgstr "정책을 위반하여 {resource} 파일이 삭제됨"
+msgstr ""
 
 #: pkg/service/templates.go:39
 msgid "Membership expired"
@@ -39,7 +39,7 @@ msgstr "멤버십 만료됨"
 
 #: pkg/service/templates.go:14
 msgid "Policies enforced"
-msgstr "정책 강제 중"
+msgstr ""
 
 #: pkg/service/templates.go:24
 msgid "Removed from Space"
diff --git a/services/userlog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/userlog.po
index 86829e3c5c9..31a706c0e9b 100644
--- a/services/userlog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/userlog.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-25 01:02+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>, 2023\n"
-"Language-Team: Portuguese (Brazil) (https://app.transifex.com/owncloud-org/teams/6149/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/owncloud-org/teams/6149/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +31,7 @@ msgstr "Access to {resource} expired"
 
 #: pkg/service/templates.go:15
 msgid "File {resource} was deleted because it violates the policies"
-msgstr "O arquivo {resource} foi excluído porque violar as políticas"
+msgstr ""
 
 #: pkg/service/templates.go:39
 msgid "Membership expired"
@@ -39,7 +39,7 @@ msgstr "Membership expired"
 
 #: pkg/service/templates.go:14
 msgid "Policies enforced"
-msgstr "Políticas aplicadas"
+msgstr ""
 
 #: pkg/service/templates.go:24
 msgid "Removed from Space"
diff --git a/services/userlog/pkg/service/l10n/locale/ru/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/ru/LC_MESSAGES/userlog.po
index 24a2639abb6..2504ed06761 100644
--- a/services/userlog/pkg/service/l10n/locale/ru/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/ru/LC_MESSAGES/userlog.po
@@ -5,99 +5,82 @@
 # 
 # Translators:
 # Aidos Kakimzhanov <aidos.kakimzhan@gmail.com>, 2023
-# Viktor Scharf, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-15 23:03+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
-"Last-Translator: Viktor Scharf, 2023\n"
-"Language-Team: Russian (https://app.transifex.com/owncloud-org/teams/6149/ru/)\n"
+"Last-Translator: Aidos Kakimzhanov <aidos.kakimzhan@gmail.com>, 2023\n"
+"Language-Team: Russian (https://www.transifex.com/owncloud-org/teams/6149/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "Доступ к пространству {scope} потерян"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Срок действия доступа к {resource} истек"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr "Файл {resource} был удален, в связи с нарушением правил использования"
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Срок действия членства истек"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr "Соблюдение правил"
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "Удалено из Пространство"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Общий ресурс"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "Ресурс не используется"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Срок действия совместного доступа истек"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Пространство удалено"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Пространство отключено"
 
-#: pkg/service/templates.go:19
-msgid "Space shared"
-msgstr "Общее пространство"
-
 #: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr "Найден вирус"
+msgid "Space shared"
+msgstr "Общий пространство"
 
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr "Найден вирус в {resource}. Загрузка не возможна"
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} добавил вас в Пространство {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} удалил пространство {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
-msgstr "{user} отключил пространство {space}"
+msgstr "{user} отключено пространство {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} удалил вас из Пространства {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} предоставил вам доступ к {resource}"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
-msgstr "{user} удалил доступ к {resource}"
+msgstr "{user} не поделился с вами {resource}"
diff --git a/services/userlog/pkg/service/l10n/locale/sq/LC_MESSAGES/userlog.po b/services/userlog/pkg/service/l10n/locale/sq/LC_MESSAGES/userlog.po
index 477207a3581..e194161aab9 100644
--- a/services/userlog/pkg/service/l10n/locale/sq/LC_MESSAGES/userlog.po
+++ b/services/userlog/pkg/service/l10n/locale/sq/LC_MESSAGES/userlog.po
@@ -11,93 +11,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2023-05-09 10:02+0000\n"
+"POT-Creation-Date: 2023-03-15 23:03+0000\n"
 "PO-Revision-Date: 2023-03-15 08:28+0000\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>, 2023\n"
-"Language-Team: Albanian (https://app.transifex.com/owncloud-org/teams/6149/sq/)\n"
+"Language-Team: Albanian (https://www.transifex.com/owncloud-org/teams/6149/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pkg/service/templates.go:40
+#: pkg/service/templates.go:30
 msgid "Access to Space {space} lost"
 msgstr "U humb hyrje te Hapësira {space}"
 
-#: pkg/service/templates.go:55
+#: pkg/service/templates.go:45
 msgid "Access to {resource} expired"
 msgstr "Hyrja te {resource} skadoi"
 
-#: pkg/service/templates.go:15
-msgid "File {resource} was deleted because it violates the policies"
-msgstr "Kartela {resource} u fshi, ngaqë cenonte rregullat"
-
-#: pkg/service/templates.go:39
+#: pkg/service/templates.go:29
 msgid "Membership expired"
 msgstr "Anëtarësimi skadoi"
 
 #: pkg/service/templates.go:14
-msgid "Policies enforced"
-msgstr "Rregullat u zbatuan"
-
-#: pkg/service/templates.go:24
 msgid "Removed from Space"
 msgstr "U hoq nga Hapësirë"
 
-#: pkg/service/templates.go:44
+#: pkg/service/templates.go:34
 msgid "Resource shared"
 msgstr "Burimi u nda me të tjerë"
 
-#: pkg/service/templates.go:49
+#: pkg/service/templates.go:39
 msgid "Resource unshared"
 msgstr "U hoq ndarje burimi me të tjerë"
 
-#: pkg/service/templates.go:54
+#: pkg/service/templates.go:44
 msgid "Share expired"
 msgstr "Ndarja skadoi"
 
-#: pkg/service/templates.go:34
+#: pkg/service/templates.go:24
 msgid "Space deleted"
 msgstr "Hapësira u fshi"
 
-#: pkg/service/templates.go:29
+#: pkg/service/templates.go:19
 msgid "Space disabled"
 msgstr "Hapësira u çaktivizua"
 
-#: pkg/service/templates.go:19
+#: pkg/service/templates.go:9
 msgid "Space shared"
 msgstr "Hapësira u nda me të tjerë"
 
-#: pkg/service/templates.go:9
-msgid "Virus found"
-msgstr "U gjet virus"
-
 #: pkg/service/templates.go:10
-msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"
-msgstr ""
-"U gjet virus te {resource}. Ngarkimi s’është i mundshëm. Virus: {virus}"
-
-#: pkg/service/templates.go:20
 msgid "{user} added you to Space {space}"
 msgstr "{user} ju shtoi te Hapësira {space}"
 
-#: pkg/service/templates.go:35
+#: pkg/service/templates.go:25
 msgid "{user} deleted Space {space}"
 msgstr "{user} fshiu Hapësirën {space}"
 
-#: pkg/service/templates.go:30
+#: pkg/service/templates.go:20
 msgid "{user} disabled Space {space}"
 msgstr "{user} çaktivizoi Hapësirën {space}"
 
-#: pkg/service/templates.go:25
+#: pkg/service/templates.go:15
 msgid "{user} removed you from Space {space}"
 msgstr "{user} ju hoqi nga Hapësira {space}"
 
-#: pkg/service/templates.go:45
+#: pkg/service/templates.go:35
 msgid "{user} shared {resource} with you"
 msgstr "{user} ndau {resource} me ju"
 
-#: pkg/service/templates.go:50
+#: pkg/service/templates.go:40
 msgid "{user} unshared {resource} with you"
 msgstr "{user} hoqi ndarjen e {resource} me ju"


Test patch:
diff --git a/services/graph/pkg/identity/ldap_test.go b/services/graph/pkg/identity/ldap_test.go
index d3bcf919215..3db4efc8400 100644
--- a/services/graph/pkg/identity/ldap_test.go
+++ b/services/graph/pkg/identity/ldap_test.go
@@ -308,6 +308,7 @@ func TestUpdateUser(t *testing.T) {
 		displayName              string
 		onPremisesSamAccountName string
 		accountEnabled           *bool
+		givenName                *string
 		userType                 *string
 	}
 	type args struct {
@@ -1441,7 +1442,7 @@ func TestUpdateUser(t *testing.T) {
 					DisplayName:              &tt.want.displayName,
 					OnPremisesSamAccountName: &tt.want.onPremisesSamAccountName,
 					Surname:                  &emptyString,
-					GivenName:                &emptyString,
+					GivenName:                tt.want.givenName,
 					UserType:                 tt.want.userType,
 				}