Merge branch 'stable29' into backport/45098/stable29backport/45098/stable29

47 files changed, 142 insertions, 112 deletions

diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php
index 3e4dfbcabd1..ff6ac0a0928 100644
--- a/apps/dav/composer/composer/autoload_classmap.php
+++ b/apps/dav/composer/composer/autoload_classmap.php
@@ -265,7 +265,7 @@ return array(
     'OCA\\DAV\\Events\\SubscriptionUpdatedEvent' => $baseDir . '/../lib/Events/SubscriptionUpdatedEvent.php',
     'OCA\\DAV\\Exception\\ServerMaintenanceMode' => $baseDir . '/../lib/Exception/ServerMaintenanceMode.php',
     'OCA\\DAV\\Exception\\UnsupportedLimitOnInitialSyncException' => $baseDir . '/../lib/Exception/UnsupportedLimitOnInitialSyncException.php',
-    'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php',
+    'OCA\\DAV\\Files\\ErrorPagePlugin' => $baseDir . '/../lib/Files/ErrorPagePlugin.php',
     'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php',
     'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php',
     'OCA\\DAV\\Files\\LazySearchBackend' => $baseDir . '/../lib/Files/LazySearchBackend.php',
diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php
index 23feaf5227a..00d90a532fb 100644
--- a/apps/dav/composer/composer/autoload_static.php
+++ b/apps/dav/composer/composer/autoload_static.php
@@ -280,7 +280,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Events\\SubscriptionUpdatedEvent' => __DIR__ . '/..' . '/../lib/Events/SubscriptionUpdatedEvent.php',
         'OCA\\DAV\\Exception\\ServerMaintenanceMode' => __DIR__ . '/..' . '/../lib/Exception/ServerMaintenanceMode.php',
         'OCA\\DAV\\Exception\\UnsupportedLimitOnInitialSyncException' => __DIR__ . '/..' . '/../lib/Exception/UnsupportedLimitOnInitialSyncException.php',
-        'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php',
+        'OCA\\DAV\\Files\\ErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/ErrorPagePlugin.php',
         'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php',
         'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php',
         'OCA\\DAV\\Files\\LazySearchBackend' => __DIR__ . '/..' . '/../lib/Files/LazySearchBackend.php',
diff --git a/apps/dav/l10n/ast.js b/apps/dav/l10n/ast.js
index 5f298baa291..b702cbe7ccc 100644
--- a/apps/dav/l10n/ast.js
+++ b/apps/dav/l10n/ast.js
@@ -21,7 +21,7 @@ OC.L10N.register(
     "You unshared calendar {calendar} from {user}" : "Dexesti de compartir el calendariu «{calendar}» con «{user}»",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dexó de compartir el calendariu «{calendar}» con «{user}»",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} dexó de compartir el calendariu «{calendar}» con sigo",
-    "You shared calendar {calendar} with group {group}" : "Compartiesti'l calendariu «{calendar}» col grupu «{gorup}»",
+    "You shared calendar {calendar} with group {group}" : "Compartiesti'l calendariu «{calendar}» col grupu «{group}»",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió'l calendariu «{calendar}» col grupu «{group}»",
     "You unshared calendar {calendar} from group {group}" : "Dexesti de compartir el calendariu «{calendar}» col grupu «{group}»",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} dexó de compartir el calendariu «{calendar}» col grupu «{group}»",
diff --git a/apps/dav/l10n/ast.json b/apps/dav/l10n/ast.json
index 63fcc3046e8..f931346fbcd 100644
--- a/apps/dav/l10n/ast.json
+++ b/apps/dav/l10n/ast.json
@@ -19,7 +19,7 @@
     "You unshared calendar {calendar} from {user}" : "Dexesti de compartir el calendariu «{calendar}» con «{user}»",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dexó de compartir el calendariu «{calendar}» con «{user}»",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} dexó de compartir el calendariu «{calendar}» con sigo",
-    "You shared calendar {calendar} with group {group}" : "Compartiesti'l calendariu «{calendar}» col grupu «{gorup}»",
+    "You shared calendar {calendar} with group {group}" : "Compartiesti'l calendariu «{calendar}» col grupu «{group}»",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió'l calendariu «{calendar}» col grupu «{group}»",
     "You unshared calendar {calendar} from group {group}" : "Dexesti de compartir el calendariu «{calendar}» col grupu «{group}»",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} dexó de compartir el calendariu «{calendar}» col grupu «{group}»",
diff --git a/apps/dav/l10n/ca.js b/apps/dav/l10n/ca.js
index 58a4f06c44f..48e8f3476b3 100644
--- a/apps/dav/l10n/ca.js
+++ b/apps/dav/l10n/ca.js
@@ -24,13 +24,13 @@ OC.L10N.register(
     "You shared calendar {calendar} with group {group}" : "Heu compartit el calendari {calendar} amb el grup {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} ha compartit el calendari {calendar} amb el grup {group}",
     "You unshared calendar {calendar} from group {group}" : "Heu deixat de compartir el calendari {calendar} amb el grup {group}",
-    "{actor} unshared calendar {calendar} from group {group}" : "{actor} ha deixat de compartir el calendari {calendar} amb el grup {grup}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} ha deixat de compartir el calendari {calendar} amb el grup {group}",
     "Untitled event" : "Esdeveniment sense títol",
     "{actor} created event {event} in calendar {calendar}" : "{actor} ha creat l'esdeveniment {event} al calendari {calendar}",
     "You created event {event} in calendar {calendar}" : "Heu creat l'esdeveniment {event} al calendari {calendar}",
-    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {event} del calendari {calendar}",
     "You deleted event {event} from calendar {calendar}" : "Heu suprimit l'esdeveniment {event} del calendari {calendar}",
-    "{actor} updated event {event} in calendar {calendar}" : "{actor} ha actualitzat l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} ha actualitzat l'esdeveniment {event} del calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} del calendari {calendar}",
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} ha desplaçat l'esdeveniment {event} del calendari {sourceCalendar} al calendari {targetCalendar}",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Heu desplaçat l'esdeveniment {event} del calendari {sourceCalendar} al calendari {targetCalendar}",
diff --git a/apps/dav/l10n/ca.json b/apps/dav/l10n/ca.json
index 728f7d9a163..57e91b36e25 100644
--- a/apps/dav/l10n/ca.json
+++ b/apps/dav/l10n/ca.json
@@ -22,13 +22,13 @@
     "You shared calendar {calendar} with group {group}" : "Heu compartit el calendari {calendar} amb el grup {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} ha compartit el calendari {calendar} amb el grup {group}",
     "You unshared calendar {calendar} from group {group}" : "Heu deixat de compartir el calendari {calendar} amb el grup {group}",
-    "{actor} unshared calendar {calendar} from group {group}" : "{actor} ha deixat de compartir el calendari {calendar} amb el grup {grup}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} ha deixat de compartir el calendari {calendar} amb el grup {group}",
     "Untitled event" : "Esdeveniment sense títol",
     "{actor} created event {event} in calendar {calendar}" : "{actor} ha creat l'esdeveniment {event} al calendari {calendar}",
     "You created event {event} in calendar {calendar}" : "Heu creat l'esdeveniment {event} al calendari {calendar}",
-    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {event} del calendari {calendar}",
     "You deleted event {event} from calendar {calendar}" : "Heu suprimit l'esdeveniment {event} del calendari {calendar}",
-    "{actor} updated event {event} in calendar {calendar}" : "{actor} ha actualitzat l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} ha actualitzat l'esdeveniment {event} del calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} del calendari {calendar}",
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} ha desplaçat l'esdeveniment {event} del calendari {sourceCalendar} al calendari {targetCalendar}",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Heu desplaçat l'esdeveniment {event} del calendari {sourceCalendar} al calendari {targetCalendar}",
diff --git a/apps/dav/l10n/da.js b/apps/dav/l10n/da.js
index 942cb73b0e6..a4d5730c70b 100644
--- a/apps/dav/l10n/da.js
+++ b/apps/dav/l10n/da.js
@@ -35,7 +35,7 @@ OC.L10N.register(
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} flyttede begivenhed {event} fra kalender {sourceCalendar} til kalender {targetCalendar}",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Du flyttede begivenhed {event} fra kalender {sourceCalendar} til kalender {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} gendannede begivenhed {event} i kalender {calendar}",
-    "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {begivenhed} i kalender {kalender}",
+    "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {event} i kalender {calendar}",
     "Busy" : "Optaget",
     "{actor} created to-do {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
     "You created to-do {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
@@ -47,8 +47,8 @@ OC.L10N.register(
     "You solved to-do {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
     "{actor} reopened to-do {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
-    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} flyttede opgave {event} fra liste {sourceCalendar} til liste {targetCalendar}",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du flyttede opgave {event} fra liste {sourceCalendar} til liste {targetCalendar}",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} flyttede opgave {todo} fra liste {sourceCalendar} til liste {targetCalendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du flyttede opgave {todo} fra liste {sourceCalendar} til liste {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter og opgaver",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
diff --git a/apps/dav/l10n/da.json b/apps/dav/l10n/da.json
index 3657acc6b58..d2263fdcad5 100644
--- a/apps/dav/l10n/da.json
+++ b/apps/dav/l10n/da.json
@@ -33,7 +33,7 @@
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} flyttede begivenhed {event} fra kalender {sourceCalendar} til kalender {targetCalendar}",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Du flyttede begivenhed {event} fra kalender {sourceCalendar} til kalender {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} gendannede begivenhed {event} i kalender {calendar}",
-    "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {begivenhed} i kalender {kalender}",
+    "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {event} i kalender {calendar}",
     "Busy" : "Optaget",
     "{actor} created to-do {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
     "You created to-do {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
@@ -45,8 +45,8 @@
     "You solved to-do {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
     "{actor} reopened to-do {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
-    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} flyttede opgave {event} fra liste {sourceCalendar} til liste {targetCalendar}",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du flyttede opgave {event} fra liste {sourceCalendar} til liste {targetCalendar}",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} flyttede opgave {todo} fra liste {sourceCalendar} til liste {targetCalendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du flyttede opgave {todo} fra liste {sourceCalendar} til liste {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter og opgaver",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js
index 2eb5572f7e1..737adba14ed 100644
--- a/apps/dav/l10n/de.js
+++ b/apps/dav/l10n/de.js
@@ -212,6 +212,7 @@ OC.L10N.register(
     "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
     "Failed to write file contents: %1$s" : "Fehler beim Schreiben des Dateiinhaltes: %1$s",
     "File not found: %1$s" : "Datei nicht gefunden: %1$s",
+    "Invalid target path" : "Ungültiger Ziel-Pfad",
     "System is in maintenance mode." : "Das System befindet sich im Wartungsmodus.",
     "Upgrade needed" : "Aktualisierung erforderlich",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Dein %s muss konfiguriert werden, um HTTPS zusammen mit CalDAV und CardDAV unter iOS/macOS nutzen zu können.",
diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json
index 878a0d1fdd9..71966bcd3fb 100644
--- a/apps/dav/l10n/de.json
+++ b/apps/dav/l10n/de.json
@@ -210,6 +210,7 @@
     "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
     "Failed to write file contents: %1$s" : "Fehler beim Schreiben des Dateiinhaltes: %1$s",
     "File not found: %1$s" : "Datei nicht gefunden: %1$s",
+    "Invalid target path" : "Ungültiger Ziel-Pfad",
     "System is in maintenance mode." : "Das System befindet sich im Wartungsmodus.",
     "Upgrade needed" : "Aktualisierung erforderlich",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Dein %s muss konfiguriert werden, um HTTPS zusammen mit CalDAV und CardDAV unter iOS/macOS nutzen zu können.",
diff --git a/apps/dav/l10n/es.js b/apps/dav/l10n/es.js
index d5dab2ce3d1..5092422edf8 100644
--- a/apps/dav/l10n/es.js
+++ b/apps/dav/l10n/es.js
@@ -15,7 +15,7 @@ OC.L10N.register(
     "You shared calendar {calendar} as public link" : "Has compartido el calendario {calendar} con un enlace público",
     "You removed public link for calendar {calendar}" : "Has eliminado el enlace público al calendario {calendar}",
     "{actor} shared calendar {calendar} with you" : "{actor} compartió el calendario {calendar} con usted",
-    "You shared calendar {calendar} with {user}" : "Usted compartió el calendario {calendar} con {usuario}",
+    "You shared calendar {calendar} with {user}" : "Usted compartió el calendario {calendar} con {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from you" : "{actor} dejó de compartir el calendario {calendar} con usted",
     "You unshared calendar {calendar} from {user}" : "Usted dejó de compartir el calendario {calendar} de {user}",
@@ -120,7 +120,7 @@ OC.L10N.register(
     "Last" : "Última",
     "Contacts" : "Contactos",
     "{actor} created address book {addressbook}" : "{actor} ha creado la libreta de direcciones {addressbook}",
-    "You created address book {addressbook}" : "Has creado la libreta de direcciones {adressbook}",
+    "You created address book {addressbook}" : "Has creado la libreta de direcciones {addressbook}",
     "{actor} deleted address book {addressbook}" : "{actor} ha eliminado la libreta de direcciones {addressbook}",
     "You deleted address book {addressbook}" : "Has eliminado la libreta de direcciones {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} ha actualizado la libreta de direcciones {addressbook}",
diff --git a/apps/dav/l10n/es.json b/apps/dav/l10n/es.json
index 50c8f56c65c..cec872c26ac 100644
--- a/apps/dav/l10n/es.json
+++ b/apps/dav/l10n/es.json
@@ -13,7 +13,7 @@
     "You shared calendar {calendar} as public link" : "Has compartido el calendario {calendar} con un enlace público",
     "You removed public link for calendar {calendar}" : "Has eliminado el enlace público al calendario {calendar}",
     "{actor} shared calendar {calendar} with you" : "{actor} compartió el calendario {calendar} con usted",
-    "You shared calendar {calendar} with {user}" : "Usted compartió el calendario {calendar} con {usuario}",
+    "You shared calendar {calendar} with {user}" : "Usted compartió el calendario {calendar} con {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from you" : "{actor} dejó de compartir el calendario {calendar} con usted",
     "You unshared calendar {calendar} from {user}" : "Usted dejó de compartir el calendario {calendar} de {user}",
@@ -118,7 +118,7 @@
     "Last" : "Última",
     "Contacts" : "Contactos",
     "{actor} created address book {addressbook}" : "{actor} ha creado la libreta de direcciones {addressbook}",
-    "You created address book {addressbook}" : "Has creado la libreta de direcciones {adressbook}",
+    "You created address book {addressbook}" : "Has creado la libreta de direcciones {addressbook}",
     "{actor} deleted address book {addressbook}" : "{actor} ha eliminado la libreta de direcciones {addressbook}",
     "You deleted address book {addressbook}" : "Has eliminado la libreta de direcciones {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} ha actualizado la libreta de direcciones {addressbook}",
diff --git a/apps/dav/l10n/es_EC.js b/apps/dav/l10n/es_EC.js
index 6cf3712ea47..ebfedb61a7a 100644
--- a/apps/dav/l10n/es_EC.js
+++ b/apps/dav/l10n/es_EC.js
@@ -20,7 +20,7 @@ OC.L10N.register(
     "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
     "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {calendar} con él mismo",
     "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
     "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
diff --git a/apps/dav/l10n/es_EC.json b/apps/dav/l10n/es_EC.json
index e69f1fd2589..3f86c46f372 100644
--- a/apps/dav/l10n/es_EC.json
+++ b/apps/dav/l10n/es_EC.json
@@ -18,7 +18,7 @@
     "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
     "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {calendar} con él mismo",
     "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
     "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
diff --git a/apps/dav/l10n/es_MX.js b/apps/dav/l10n/es_MX.js
index 84653771fd6..e4e43cf6cdd 100644
--- a/apps/dav/l10n/es_MX.js
+++ b/apps/dav/l10n/es_MX.js
@@ -20,7 +20,7 @@ OC.L10N.register(
     "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
     "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {calendar} con él mismo",
     "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
     "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
@@ -138,7 +138,7 @@ OC.L10N.register(
     "Fourth Last" : "Ante antepenúltimo",
     "Contacts" : "Contactos",
     "{actor} created address book {addressbook}" : "{actor} creó la libreta de direcciones {addressbook}",
-    "You created address book {addressbook}" : "Ha creado la libreta de direcciones {adressbook}",
+    "You created address book {addressbook}" : "Ha creado la libreta de direcciones {addressbook}",
     "{actor} deleted address book {addressbook}" : "{actor} eliminó la libreta de direcciones {addressbook}",
     "You deleted address book {addressbook}" : "Ha eliminado la libreta de direcciones {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} actualizó la libreta de direcciones {addressbook}",
diff --git a/apps/dav/l10n/es_MX.json b/apps/dav/l10n/es_MX.json
index ce1449b904f..f9d582fae10 100644
--- a/apps/dav/l10n/es_MX.json
+++ b/apps/dav/l10n/es_MX.json
@@ -18,7 +18,7 @@
     "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
     "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {calendar} con él mismo",
     "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
     "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
@@ -136,7 +136,7 @@
     "Fourth Last" : "Ante antepenúltimo",
     "Contacts" : "Contactos",
     "{actor} created address book {addressbook}" : "{actor} creó la libreta de direcciones {addressbook}",
-    "You created address book {addressbook}" : "Ha creado la libreta de direcciones {adressbook}",
+    "You created address book {addressbook}" : "Ha creado la libreta de direcciones {addressbook}",
     "{actor} deleted address book {addressbook}" : "{actor} eliminó la libreta de direcciones {addressbook}",
     "You deleted address book {addressbook}" : "Ha eliminado la libreta de direcciones {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} actualizó la libreta de direcciones {addressbook}",
diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js
index f16b4d9aa61..38190f7c18e 100644
--- a/apps/dav/l10n/fr.js
+++ b/apps/dav/l10n/fr.js
@@ -194,7 +194,7 @@ OC.L10N.register(
     "You updated contact {card} in address book {addressbook}" : "Vous avez mis à jour le contact {card} dans le carnet d'adresses {addressbook}",
     "A <strong>contact</strong> or <strong>address book</strong> was modified" : "Un <strong>contact</strong> ou <strong>carnet d'adresses</strong> a été modifié",
     "Accounts" : "Comptes",
-    "System address book which holds all accounts" : "Annuaire système qui regroupe tous les comptes",
+    "System address book which holds all accounts" : "Carnet d'adresses système qui regroupe tous les comptes",
     "File is not updatable: %1$s" : "Ce fichier ne peut pas être mis à jour : %1$s",
     "Could not write to final file, canceled by hook" : "Impossible d'écrire dans le fichier final, annulé par le hook",
     "Could not write file contents" : "Impossible d'écrire le contenu du fichier",
@@ -222,7 +222,7 @@ OC.L10N.register(
     "Due on %s by %s" : "Echéance le %s pour %s",
     "Due on %s" : "Echéance le %s",
     "DAV system address book" : "Carnet d'adresses système DAV",
-    "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses du système.",
+    "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses système.",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "La synchronisation du carnet d'adresses système DAV n'a pas encore été effectuée car votre instance a plus de 1 000 utilisateurs ou parce qu'une erreur est survenue. Merci de l'exécuter manuellement en tapant la commande \"occ dav:sync-system-addressbook\".",
     "WebDAV endpoint" : "Point de terminaison WebDAV",
     "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Impossible de vérifier si votre serveur web est correctement configuré pour permettre la synchronisation de fichiers via WebDAV. Veuillez vérifier manuellement.",
diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json
index acaa565f16a..4e5a13571bc 100644
--- a/apps/dav/l10n/fr.json
+++ b/apps/dav/l10n/fr.json
@@ -192,7 +192,7 @@
     "You updated contact {card} in address book {addressbook}" : "Vous avez mis à jour le contact {card} dans le carnet d'adresses {addressbook}",
     "A <strong>contact</strong> or <strong>address book</strong> was modified" : "Un <strong>contact</strong> ou <strong>carnet d'adresses</strong> a été modifié",
     "Accounts" : "Comptes",
-    "System address book which holds all accounts" : "Annuaire système qui regroupe tous les comptes",
+    "System address book which holds all accounts" : "Carnet d'adresses système qui regroupe tous les comptes",
     "File is not updatable: %1$s" : "Ce fichier ne peut pas être mis à jour : %1$s",
     "Could not write to final file, canceled by hook" : "Impossible d'écrire dans le fichier final, annulé par le hook",
     "Could not write file contents" : "Impossible d'écrire le contenu du fichier",
@@ -220,7 +220,7 @@
     "Due on %s by %s" : "Echéance le %s pour %s",
     "Due on %s" : "Echéance le %s",
     "DAV system address book" : "Carnet d'adresses système DAV",
-    "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses du système.",
+    "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses système.",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "La synchronisation du carnet d'adresses système DAV n'a pas encore été effectuée car votre instance a plus de 1 000 utilisateurs ou parce qu'une erreur est survenue. Merci de l'exécuter manuellement en tapant la commande \"occ dav:sync-system-addressbook\".",
     "WebDAV endpoint" : "Point de terminaison WebDAV",
     "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Impossible de vérifier si votre serveur web est correctement configuré pour permettre la synchronisation de fichiers via WebDAV. Veuillez vérifier manuellement.",
diff --git a/apps/dav/l10n/ga.js b/apps/dav/l10n/ga.js
index f47b373b5e1..df50e09c838 100644
--- a/apps/dav/l10n/ga.js
+++ b/apps/dav/l10n/ga.js
@@ -48,7 +48,7 @@ OC.L10N.register(
     "{actor} reopened to-do {todo} in list {calendar}" : "D'athoscail {actor} to-do {todo} sa liosta {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "D'oscail tú to-do {todo} sa liosta {calendar}",
     "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog {actor} {todo} ó liosta {sourceCalendar} chun {targetCalendar} a liostú",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog tú chun {todo} a dhéanamh ón liosta {source Calendar} go dtí an liosta {target Calendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog tú chun {todo} a dhéanamh ón liosta {sourceCalendar} go dtí an liosta {targetCalendar}",
     "Calendar, contacts and tasks" : "Féilire, teagmhálacha agus tascanna",
     "A <strong>calendar</strong> was modified" : "Athraíodh <strong>calendar</strong>  ",
     "A calendar <strong>event</strong> was modified" : "Athraíodh féilire <strong>event</strong>  ",
diff --git a/apps/dav/l10n/ga.json b/apps/dav/l10n/ga.json
index d2a7a9b2dd7..f8d754c457b 100644
--- a/apps/dav/l10n/ga.json
+++ b/apps/dav/l10n/ga.json
@@ -46,7 +46,7 @@
     "{actor} reopened to-do {todo} in list {calendar}" : "D'athoscail {actor} to-do {todo} sa liosta {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "D'oscail tú to-do {todo} sa liosta {calendar}",
     "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog {actor} {todo} ó liosta {sourceCalendar} chun {targetCalendar} a liostú",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog tú chun {todo} a dhéanamh ón liosta {source Calendar} go dtí an liosta {target Calendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Bhog tú chun {todo} a dhéanamh ón liosta {sourceCalendar} go dtí an liosta {targetCalendar}",
     "Calendar, contacts and tasks" : "Féilire, teagmhálacha agus tascanna",
     "A <strong>calendar</strong> was modified" : "Athraíodh <strong>calendar</strong>  ",
     "A calendar <strong>event</strong> was modified" : "Athraíodh féilire <strong>event</strong>  ",
diff --git a/apps/dav/l10n/gl.js b/apps/dav/l10n/gl.js
index 6531e8cee94..63203abc0e0 100644
--- a/apps/dav/l10n/gl.js
+++ b/apps/dav/l10n/gl.js
@@ -33,7 +33,7 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vde. actualizou o evento {event} no calendario {calendar}",
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendario {sourceCalendar} ao calendario {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Moveu o evento {evento} do calendario {sourceCalendar} ao calendario {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Moveu o evento {event} do calendario {sourceCalendar} ao calendario {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Restaurou o evento {event} do calendario {calendar}",
     "Busy" : "Ocupado",
diff --git a/apps/dav/l10n/gl.json b/apps/dav/l10n/gl.json
index 29d6936322d..4cd7978334d 100644
--- a/apps/dav/l10n/gl.json
+++ b/apps/dav/l10n/gl.json
@@ -31,7 +31,7 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vde. actualizou o evento {event} no calendario {calendar}",
     "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendario {sourceCalendar} ao calendario {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Moveu o evento {evento} do calendario {sourceCalendar} ao calendario {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Moveu o evento {event} do calendario {sourceCalendar} ao calendario {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Restaurou o evento {event} do calendario {calendar}",
     "Busy" : "Ocupado",
diff --git a/apps/dav/l10n/hr.js b/apps/dav/l10n/hr.js
index 1d4f4d9200f..0399a414f65 100644
--- a/apps/dav/l10n/hr.js
+++ b/apps/dav/l10n/hr.js
@@ -21,7 +21,7 @@ OC.L10N.register(
     "You unshared calendar {calendar} from {user}" : "Više ne dijelite kalendar {calendar} s {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} više ne dijeli kalendar {calendar} s {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} više ne dijeli kalendar {calendar} sam sa sobom",
-    "You shared calendar {calendar} with group {group}" : "Podijelili ste kalendar {kalendar} s grupom {group}",
+    "You shared calendar {calendar} with group {group}" : "Podijelili ste kalendar {calendar} s grupom {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} dijeli kalendar {calendar} s grupom {group}",
     "You unshared calendar {calendar} from group {group}" : "Više ne dijelite kalendar {calendar} s grupom {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} više ne dijeli kalendar {calendar} s grupom {group}",
diff --git a/apps/dav/l10n/hr.json b/apps/dav/l10n/hr.json
index 9686e89c7c0..a3b41038c8c 100644
--- a/apps/dav/l10n/hr.json
+++ b/apps/dav/l10n/hr.json
@@ -19,7 +19,7 @@
     "You unshared calendar {calendar} from {user}" : "Više ne dijelite kalendar {calendar} s {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} više ne dijeli kalendar {calendar} s {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} više ne dijeli kalendar {calendar} sam sa sobom",
-    "You shared calendar {calendar} with group {group}" : "Podijelili ste kalendar {kalendar} s grupom {group}",
+    "You shared calendar {calendar} with group {group}" : "Podijelili ste kalendar {calendar} s grupom {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} dijeli kalendar {calendar} s grupom {group}",
     "You unshared calendar {calendar} from group {group}" : "Više ne dijelite kalendar {calendar} s grupom {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} više ne dijeli kalendar {calendar} s grupom {group}",
diff --git a/apps/dav/l10n/is.js b/apps/dav/l10n/is.js
index 28a0ec073ff..f80aab08bae 100644
--- a/apps/dav/l10n/is.js
+++ b/apps/dav/l10n/is.js
@@ -32,8 +32,8 @@ OC.L10N.register(
     "You deleted event {event} from calendar {calendar}" : "Þú eyddir atburðinum {event} úr dagatalinu {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} uppfærði atburðinn {event} í dagatalinu {calendar}",
     "You updated event {event} in calendar {calendar}" : "Þú uppfærðir atburðinn {event} í dagatalinu {calendar}",
-    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} færði atburðinn {event} úr dagatalinu {calendar} yfir í dagatalið {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Þú færðir atburðinn {event} úr dagatalinu {calendar} yfir í dagatalið {targetCalendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} færði atburðinn {event} úr dagatalinu {sourceCalendar} yfir í dagatalið {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Þú færðir atburðinn {event} úr dagatalinu {sourceCalendar} yfir í dagatalið {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} endurheimti atburðinn {event} í dagatalinu {calendar}",
     "You restored event {event} of calendar {calendar}" : "Þú endurheimtir atburðinn {event} í dagatalinu {calendar}",
     "Busy" : "Upptekið",
diff --git a/apps/dav/l10n/is.json b/apps/dav/l10n/is.json
index d3da8d8c7e3..f6dcc240618 100644
--- a/apps/dav/l10n/is.json
+++ b/apps/dav/l10n/is.json
@@ -30,8 +30,8 @@
     "You deleted event {event} from calendar {calendar}" : "Þú eyddir atburðinum {event} úr dagatalinu {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} uppfærði atburðinn {event} í dagatalinu {calendar}",
     "You updated event {event} in calendar {calendar}" : "Þú uppfærðir atburðinn {event} í dagatalinu {calendar}",
-    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} færði atburðinn {event} úr dagatalinu {calendar} yfir í dagatalið {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Þú færðir atburðinn {event} úr dagatalinu {calendar} yfir í dagatalið {targetCalendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} færði atburðinn {event} úr dagatalinu {sourceCalendar} yfir í dagatalið {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Þú færðir atburðinn {event} úr dagatalinu {sourceCalendar} yfir í dagatalið {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} endurheimti atburðinn {event} í dagatalinu {calendar}",
     "You restored event {event} of calendar {calendar}" : "Þú endurheimtir atburðinn {event} í dagatalinu {calendar}",
     "Busy" : "Upptekið",
diff --git a/apps/dav/l10n/it.js b/apps/dav/l10n/it.js
index 44ab48d9a87..2064081778d 100644
--- a/apps/dav/l10n/it.js
+++ b/apps/dav/l10n/it.js
@@ -122,10 +122,10 @@ OC.L10N.register(
     "{actor} updated address book {addressbook}" : "{actor} ha aggiornato la rubrica {addressbook}",
     "You updated address book {addressbook}" : "Hai aggiornato la rubrica {addressbook}",
     "{actor} shared address book {addressbook} with you" : "{actor} ha condiviso la rubrica {addressbook} con te",
-    "You shared address book {addressbook} with {user}" : "Hai condiviso la rubrica {addressbook} con {actor}",
+    "You shared address book {addressbook} with {user}" : "Hai condiviso la rubrica {addressbook} con {user}",
     "{actor} shared address book {addressbook} with {user}" : "{actor} ha condiviso la rubrica {addressbook} con {user}",
     "{actor} unshared address book {addressbook} from you" : "{actor} ha eliminato la condivisione della rubrica {addressbook} con te",
-    "You unshared address book {addressbook} from {user}" : "Hai eliminato la condivisione della rubrica {addressbook} con {actor}",
+    "You unshared address book {addressbook} from {user}" : "Hai eliminato la condivisione della rubrica {addressbook} con {user}",
     "{actor} unshared address book {addressbook} from {user}" : "{actor} ha eliminato la condivisone della rubrica {addressbook} da {user}",
     "{actor} unshared address book {addressbook} from themselves" : "{actor} ha eliminato la condivisone della rubrica {addressbook} da se stesso",
     "You shared address book {addressbook} with group {group}" : "Hai condiviso la rubrica {addressbook} con il gruppo {group}",
diff --git a/apps/dav/l10n/it.json b/apps/dav/l10n/it.json
index fd8acbd5655..174a5466722 100644
--- a/apps/dav/l10n/it.json
+++ b/apps/dav/l10n/it.json
@@ -120,10 +120,10 @@
     "{actor} updated address book {addressbook}" : "{actor} ha aggiornato la rubrica {addressbook}",
     "You updated address book {addressbook}" : "Hai aggiornato la rubrica {addressbook}",
     "{actor} shared address book {addressbook} with you" : "{actor} ha condiviso la rubrica {addressbook} con te",
-    "You shared address book {addressbook} with {user}" : "Hai condiviso la rubrica {addressbook} con {actor}",
+    "You shared address book {addressbook} with {user}" : "Hai condiviso la rubrica {addressbook} con {user}",
     "{actor} shared address book {addressbook} with {user}" : "{actor} ha condiviso la rubrica {addressbook} con {user}",
     "{actor} unshared address book {addressbook} from you" : "{actor} ha eliminato la condivisione della rubrica {addressbook} con te",
-    "You unshared address book {addressbook} from {user}" : "Hai eliminato la condivisione della rubrica {addressbook} con {actor}",
+    "You unshared address book {addressbook} from {user}" : "Hai eliminato la condivisione della rubrica {addressbook} con {user}",
     "{actor} unshared address book {addressbook} from {user}" : "{actor} ha eliminato la condivisone della rubrica {addressbook} da {user}",
     "{actor} unshared address book {addressbook} from themselves" : "{actor} ha eliminato la condivisone della rubrica {addressbook} da se stesso",
     "You shared address book {addressbook} with group {group}" : "Hai condiviso la rubrica {addressbook} con il gruppo {group}",
diff --git a/apps/dav/l10n/nb.js b/apps/dav/l10n/nb.js
index 5670d45ea04..9d2b649c709 100644
--- a/apps/dav/l10n/nb.js
+++ b/apps/dav/l10n/nb.js
@@ -187,7 +187,7 @@ OC.L10N.register(
     "You shared address book {addressbook} with group {group}" : "Du delte adresseboken {addressbook} med gruppen {group}",
     "{actor} shared address book {addressbook} with group {group}" : "{actor} delte adresseboken {addressbook} med gruppen {group}",
     "You unshared address book {addressbook} from group {group}" : "Du har opphevde deling av adresseboken {addressbook} med gruppen {group}",
-    "{actor} unshared address book {addressbook} from group {group}" : "{actor} opphevde deling av adresseboken {addressbook} med gruppen {gruppe}",
+    "{actor} unshared address book {addressbook} from group {group}" : "{actor} opphevde deling av adresseboken {addressbook} med gruppen {group}",
     "{actor} created contact {card} in address book {addressbook}" : "{actor} opprettet kontakten {card} i adresseboken {addressbook}",
     "You created contact {card} in address book {addressbook}" : "Du opprettet kontakten {card} i adresseboken {addressbook}",
     "{actor} deleted contact {card} from address book {addressbook}" : "{actor} slettet kontakten {card} i adresseboken {addressbook}",
diff --git a/apps/dav/l10n/nb.json b/apps/dav/l10n/nb.json
index 7357e2ab7f4..48619c77daa 100644
--- a/apps/dav/l10n/nb.json
+++ b/apps/dav/l10n/nb.json
@@ -185,7 +185,7 @@
     "You shared address book {addressbook} with group {group}" : "Du delte adresseboken {addressbook} med gruppen {group}",
     "{actor} shared address book {addressbook} with group {group}" : "{actor} delte adresseboken {addressbook} med gruppen {group}",
     "You unshared address book {addressbook} from group {group}" : "Du har opphevde deling av adresseboken {addressbook} med gruppen {group}",
-    "{actor} unshared address book {addressbook} from group {group}" : "{actor} opphevde deling av adresseboken {addressbook} med gruppen {gruppe}",
+    "{actor} unshared address book {addressbook} from group {group}" : "{actor} opphevde deling av adresseboken {addressbook} med gruppen {group}",
     "{actor} created contact {card} in address book {addressbook}" : "{actor} opprettet kontakten {card} i adresseboken {addressbook}",
     "You created contact {card} in address book {addressbook}" : "Du opprettet kontakten {card} i adresseboken {addressbook}",
     "{actor} deleted contact {card} from address book {addressbook}" : "{actor} slettet kontakten {card} i adresseboken {addressbook}",
diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js
index 452dbe702cd..57563f696c4 100644
--- a/apps/dav/l10n/nl.js
+++ b/apps/dav/l10n/nl.js
@@ -113,7 +113,7 @@ OC.L10N.register(
     "{actor} deleted address book {addressbook}" : "{actor} verwijdede adresboek {addressbook}",
     "You deleted address book {addressbook}" : "Je verwijderde adresboek  {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} wijzigde adresboek {addressbook}",
-    "You updated address book {addressbook}" : "Je wijzigde adresboek  {addressbook}",
+    "You updated address book {addressbook}" : "Je wijzigde adresboek {addressbook}",
     "{actor} shared address book {addressbook} with you" : "{actor} deelde adresboek {addressbook} met jou",
     "You shared address book {addressbook} with {user}" : "Jij deelde adresboek {addressbook} met {user}",
     "{actor} shared address book {addressbook} with {user}" : "{actor} deelde adresboek {addressbook} met {user}",
@@ -121,7 +121,7 @@ OC.L10N.register(
     "You unshared address book {addressbook} from {user}" : "Je stopte met delen adresboek {addressbook} van {user}",
     "{actor} unshared address book {addressbook} from {user}" : " stopte met delen adresboek {addressbook} van {user}",
     "{actor} unshared address book {addressbook} from themselves" : "{actor} stopte het delen van het adresboek {addressbook} van zichzelf",
-    "You shared address book {addressbook} with group {group}" : "Je deelde adresboek {addressbook } met groep {group}",
+    "You shared address book {addressbook} with group {group}" : "Je deelde adresboek {addressbook} met groep {group}",
     "{actor} shared address book {addressbook} with group {group}" : "{actor} deelde adresboek {addressbook} met groep {group}",
     "You unshared address book {addressbook} from group {group}" : "Je stopte het delen van adresboek {addressbook} van groep {group}",
     "{actor} unshared address book {addressbook} from group {group}" : "{actor} stopte het delen van adresboek {addressbook} van groep {group}",
diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json
index bc040d4e19c..9ce7066f536 100644
--- a/apps/dav/l10n/nl.json
+++ b/apps/dav/l10n/nl.json
@@ -111,7 +111,7 @@
     "{actor} deleted address book {addressbook}" : "{actor} verwijdede adresboek {addressbook}",
     "You deleted address book {addressbook}" : "Je verwijderde adresboek  {addressbook}",
     "{actor} updated address book {addressbook}" : "{actor} wijzigde adresboek {addressbook}",
-    "You updated address book {addressbook}" : "Je wijzigde adresboek  {addressbook}",
+    "You updated address book {addressbook}" : "Je wijzigde adresboek {addressbook}",
     "{actor} shared address book {addressbook} with you" : "{actor} deelde adresboek {addressbook} met jou",
     "You shared address book {addressbook} with {user}" : "Jij deelde adresboek {addressbook} met {user}",
     "{actor} shared address book {addressbook} with {user}" : "{actor} deelde adresboek {addressbook} met {user}",
@@ -119,7 +119,7 @@
     "You unshared address book {addressbook} from {user}" : "Je stopte met delen adresboek {addressbook} van {user}",
     "{actor} unshared address book {addressbook} from {user}" : " stopte met delen adresboek {addressbook} van {user}",
     "{actor} unshared address book {addressbook} from themselves" : "{actor} stopte het delen van het adresboek {addressbook} van zichzelf",
-    "You shared address book {addressbook} with group {group}" : "Je deelde adresboek {addressbook } met groep {group}",
+    "You shared address book {addressbook} with group {group}" : "Je deelde adresboek {addressbook} met groep {group}",
     "{actor} shared address book {addressbook} with group {group}" : "{actor} deelde adresboek {addressbook} met groep {group}",
     "You unshared address book {addressbook} from group {group}" : "Je stopte het delen van adresboek {addressbook} van groep {group}",
     "{actor} unshared address book {addressbook} from group {group}" : "{actor} stopte het delen van adresboek {addressbook} van groep {group}",
diff --git a/apps/dav/l10n/ru.js b/apps/dav/l10n/ru.js
index 74487d3e568..67913c0e83a 100644
--- a/apps/dav/l10n/ru.js
+++ b/apps/dav/l10n/ru.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Description: %s" : "Описание: %s",
     "Where: %s" : "Где: %s",
     "%1$s via %2$s" : "%1$s через %2$s",
+    "Could not generate next recurrence statement" : "Не удалось сгенерировать следующий оператор повторения",
     "Cancelled: %1$s" : "Событие отменено: %1$s",
     "\"%1$s\" has been canceled" : "Событие «%1$s» отменено",
     "Re: %1$s" : "Re: %1$s",
@@ -89,6 +90,7 @@ OC.L10N.register(
     "When:" : "Когда:",
     "Location:" : "Местонахождение:",
     "Link:" : "Ссылка:",
+    "Occurring:" : "Происходит:",
     "Accept" : "Принять",
     "Decline" : "Отклонить",
     "More options …" : "Дополнительные параметры…",
@@ -113,6 +115,10 @@ OC.L10N.register(
     "November" : "Ноябрь",
     "December" : "Декабрь",
     "First" : "Первый",
+    "Second" : "Второй",
+    "Third" : "Третий",
+    "Fourth" : "Четвертый",
+    "Fifty" : "Пятый",
     "Last" : "Последний",
     "Contacts" : "Контакты",
     "{actor} created address book {addressbook}" : "{actor} создал(а) адресную книгу «{addressbook}»",
@@ -156,6 +162,7 @@ OC.L10N.register(
     "Failed to unlink: %1$s" : "Не удалось разорвать связь: %1$s",
     "Failed to write file contents: %1$s" : "Не удалось записать содержимое файла: %1$s",
     "File not found: %1$s" : "Файл не найден: %1$s",
+    "Invalid target path" : "Неверный целевой путь",
     "System is in maintenance mode." : "Сервер находится в режиме обслуживания.",
     "Upgrade needed" : "Требуется обновление",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Ваш %s должен быть настроен на использование протокола HTTPS, чтобы можно было использовать CalDAV и CardDAV на iOS/macOS.",
@@ -170,13 +177,19 @@ OC.L10N.register(
     "No outstanding DAV system address book sync." : "Синхронизация системной адресной книги DAV выполнена.",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Синхронизация системной адресной книги DAV ещё не запущена, поскольку в этом экземпляре более 1000 пользователей или произошла ошибка. Перезапустите синхронизацию вручную используя команду «occ dav:sync-system-addressbook».",
     "WebDAV endpoint" : "точка подключения WebDAV",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Не удалось проверить, правильно ли настроен ваш веб-сервер, чтобы разрешить синхронизацию файлов через WebDAV. Пожалуйста, проверьте вручную.",
     "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Веб-сервер ещё не настроен должным образом для синхронизации файлов: похоже, что не работоспособен интерфейс WebDAV.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Ваш веб-сервер настроен должным образом, чтобы обеспечить синхронизацию файлов через WebDAV.",
     "Migrated calendar (%1$s)" : "Перенос календаря (%1$s)",
     "Calendars including events, details and attendees" : "Календари, в том числе события, подробные сведения и участники",
     "Contacts and groups" : "Контакты и группы",
     "WebDAV" : "WebDAV",
     "First day" : "Первый день",
     "Last day (inclusive)" : "Последний день (включительно)",
+    "Out of office replacement (optional)" : "Замена вне офиса (по желанию)",
+    "Name of the replacement" : "Название заменяющего устройства",
+    "No results." : "Неверный целевой путь.",
+    "Start typing." : "Начать печатать.",
     "Short absence status" : "Краткий статус отсутствия",
     "Long absence Message" : "Длинное сообщение об отсутствии",
     "Save" : "Сохранить",
diff --git a/apps/dav/l10n/ru.json b/apps/dav/l10n/ru.json
index 82eeb83f902..b2c55d3ea1b 100644
--- a/apps/dav/l10n/ru.json
+++ b/apps/dav/l10n/ru.json
@@ -70,6 +70,7 @@
     "Description: %s" : "Описание: %s",
     "Where: %s" : "Где: %s",
     "%1$s via %2$s" : "%1$s через %2$s",
+    "Could not generate next recurrence statement" : "Не удалось сгенерировать следующий оператор повторения",
     "Cancelled: %1$s" : "Событие отменено: %1$s",
     "\"%1$s\" has been canceled" : "Событие «%1$s» отменено",
     "Re: %1$s" : "Re: %1$s",
@@ -87,6 +88,7 @@
     "When:" : "Когда:",
     "Location:" : "Местонахождение:",
     "Link:" : "Ссылка:",
+    "Occurring:" : "Происходит:",
     "Accept" : "Принять",
     "Decline" : "Отклонить",
     "More options …" : "Дополнительные параметры…",
@@ -111,6 +113,10 @@
     "November" : "Ноябрь",
     "December" : "Декабрь",
     "First" : "Первый",
+    "Second" : "Второй",
+    "Third" : "Третий",
+    "Fourth" : "Четвертый",
+    "Fifty" : "Пятый",
     "Last" : "Последний",
     "Contacts" : "Контакты",
     "{actor} created address book {addressbook}" : "{actor} создал(а) адресную книгу «{addressbook}»",
@@ -154,6 +160,7 @@
     "Failed to unlink: %1$s" : "Не удалось разорвать связь: %1$s",
     "Failed to write file contents: %1$s" : "Не удалось записать содержимое файла: %1$s",
     "File not found: %1$s" : "Файл не найден: %1$s",
+    "Invalid target path" : "Неверный целевой путь",
     "System is in maintenance mode." : "Сервер находится в режиме обслуживания.",
     "Upgrade needed" : "Требуется обновление",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Ваш %s должен быть настроен на использование протокола HTTPS, чтобы можно было использовать CalDAV и CardDAV на iOS/macOS.",
@@ -168,13 +175,19 @@
     "No outstanding DAV system address book sync." : "Синхронизация системной адресной книги DAV выполнена.",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Синхронизация системной адресной книги DAV ещё не запущена, поскольку в этом экземпляре более 1000 пользователей или произошла ошибка. Перезапустите синхронизацию вручную используя команду «occ dav:sync-system-addressbook».",
     "WebDAV endpoint" : "точка подключения WebDAV",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Не удалось проверить, правильно ли настроен ваш веб-сервер, чтобы разрешить синхронизацию файлов через WebDAV. Пожалуйста, проверьте вручную.",
     "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Веб-сервер ещё не настроен должным образом для синхронизации файлов: похоже, что не работоспособен интерфейс WebDAV.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Ваш веб-сервер настроен должным образом, чтобы обеспечить синхронизацию файлов через WebDAV.",
     "Migrated calendar (%1$s)" : "Перенос календаря (%1$s)",
     "Calendars including events, details and attendees" : "Календари, в том числе события, подробные сведения и участники",
     "Contacts and groups" : "Контакты и группы",
     "WebDAV" : "WebDAV",
     "First day" : "Первый день",
     "Last day (inclusive)" : "Последний день (включительно)",
+    "Out of office replacement (optional)" : "Замена вне офиса (по желанию)",
+    "Name of the replacement" : "Название заменяющего устройства",
+    "No results." : "Неверный целевой путь.",
+    "Start typing." : "Начать печатать.",
     "Short absence status" : "Краткий статус отсутствия",
     "Long absence Message" : "Длинное сообщение об отсутствии",
     "Save" : "Сохранить",
diff --git a/apps/dav/l10n/sk.js b/apps/dav/l10n/sk.js
index 054699d762b..077297c0539 100644
--- a/apps/dav/l10n/sk.js
+++ b/apps/dav/l10n/sk.js
@@ -47,8 +47,8 @@ OC.L10N.register(
     "You solved to-do {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v zozname {calendar}",
     "{actor} reopened to-do {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v zozname {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v zozname {calendar}",
-    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} presunul udalosť {event} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Presunuli ste udalosť {event} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} presunul udalosť {todo} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Presunuli ste udalosť {todo} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendár, kontakty a úlohy",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendár</strong> bol upravený",
     "A calendar <strong>event</strong> was modified" : "<strong>Udalosť</strong> v kalendári bola upravená",
diff --git a/apps/dav/l10n/sk.json b/apps/dav/l10n/sk.json
index 6cc2058136e..a22ef5d1c9b 100644
--- a/apps/dav/l10n/sk.json
+++ b/apps/dav/l10n/sk.json
@@ -45,8 +45,8 @@
     "You solved to-do {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v zozname {calendar}",
     "{actor} reopened to-do {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v zozname {calendar}",
     "You reopened to-do {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v zozname {calendar}",
-    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} presunul udalosť {event} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
-    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Presunuli ste udalosť {event} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} presunul udalosť {todo} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Presunuli ste udalosť {todo} zo zoznamu {sourceCalendar} do zoznamu {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendár, kontakty a úlohy",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendár</strong> bol upravený",
     "A calendar <strong>event</strong> was modified" : "<strong>Udalosť</strong> v kalendári bola upravená",
diff --git a/apps/dav/l10n/sv.js b/apps/dav/l10n/sv.js
index e3bbba8ad8b..3cc41fb3934 100644
--- a/apps/dav/l10n/sv.js
+++ b/apps/dav/l10n/sv.js
@@ -135,7 +135,7 @@ OC.L10N.register(
     "{actor} created contact {card} in address book {addressbook}" : "{actor} skapade kontakten {card} i adressboken {addressbook}",
     "You created contact {card} in address book {addressbook}" : "Du skapade kontakten {card} i adressboken {addressbook}",
     "{actor} deleted contact {card} from address book {addressbook}" : "{actor} tog bort kontakten {card} från adressboken {addressbook}",
-    "You deleted contact {card} from address book {addressbook}" : "Du tog bort kontakten {©ard} från adressboken {addressbook}",
+    "You deleted contact {card} from address book {addressbook}" : "Du tog bort kontakten {card} från adressboken {addressbook}",
     "{actor} updated contact {card} in address book {addressbook}" : "{actor} uppdaterade kontakten {card} i adressboken {addressbook}",
     "You updated contact {card} in address book {addressbook}" : "Du uppdaterade kontakten {card} i adressboken {addressbook}",
     "A <strong>contact</strong> or <strong>address book</strong> was modified" : "En <strong>kontakt</strong> eller <strong>adressbok</strong> ändrades",
diff --git a/apps/dav/l10n/sv.json b/apps/dav/l10n/sv.json
index b6f68a51d07..56a72ce1ec1 100644
--- a/apps/dav/l10n/sv.json
+++ b/apps/dav/l10n/sv.json
@@ -133,7 +133,7 @@
     "{actor} created contact {card} in address book {addressbook}" : "{actor} skapade kontakten {card} i adressboken {addressbook}",
     "You created contact {card} in address book {addressbook}" : "Du skapade kontakten {card} i adressboken {addressbook}",
     "{actor} deleted contact {card} from address book {addressbook}" : "{actor} tog bort kontakten {card} från adressboken {addressbook}",
-    "You deleted contact {card} from address book {addressbook}" : "Du tog bort kontakten {©ard} från adressboken {addressbook}",
+    "You deleted contact {card} from address book {addressbook}" : "Du tog bort kontakten {card} från adressboken {addressbook}",
     "{actor} updated contact {card} in address book {addressbook}" : "{actor} uppdaterade kontakten {card} i adressboken {addressbook}",
     "You updated contact {card} in address book {addressbook}" : "Du uppdaterade kontakten {card} i adressboken {addressbook}",
     "A <strong>contact</strong> or <strong>address book</strong> was modified" : "En <strong>kontakt</strong> eller <strong>adressbok</strong> ändrades",
diff --git a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
index 6a8cb3f0f59..ccb6d91ffef 100644
--- a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
@@ -430,7 +430,7 @@ class FilesReportPlugin extends ServerPlugin {
 
 		$results = [];
 		foreach ($fileIds as $fileId) {
-			$entry = $folder->getFirstNodeById($fileId);
+			$entry = $folder->getFirstNodeById((int)$fileId);
 			if ($entry) {
 				$results[] = $this->wrapNode($entry);
 			}
diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php
index 2b77dc08e8d..7fa69867086 100644
--- a/apps/dav/lib/Connector/Sabre/Node.php
+++ b/apps/dav/lib/Connector/Sabre/Node.php
@@ -421,7 +421,7 @@ abstract class Node implements \Sabre\DAV\INode {
 		return $this->node;
 	}
 
-	protected function sanitizeMtime($mtimeFromRequest) {
+	protected function sanitizeMtime(string $mtimeFromRequest): int {
 		return MtimeSanitizer::sanitizeMtime($mtimeFromRequest);
 	}
 }
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index 3b3c10e58cd..c415b49b58d 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -34,7 +34,7 @@ namespace OCA\DAV\Connector\Sabre;
 use OCA\DAV\AppInfo\PluginManager;
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
 use OCA\DAV\DAV\ViewOnlyPlugin;
-use OCA\DAV\Files\BrowserErrorPagePlugin;
+use OCA\DAV\Files\ErrorPagePlugin;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Folder;
 use OCP\Files\Mount\IMountManager;
@@ -121,9 +121,7 @@ class ServerFactory {
 			$server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
 		}
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
-			$server->addPlugin(new BrowserErrorPagePlugin());
-		}
+		$server->addPlugin(new ErrorPagePlugin($this->request, $this->config));
 
 		// wait with registering these until auth is handled and the filesystem is setup
 		$server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
diff --git a/apps/dav/lib/Files/BrowserErrorPagePlugin.php b/apps/dav/lib/Files/ErrorPagePlugin.php
index eccae8afdd5..d918da4fab3 100644
--- a/apps/dav/lib/Files/BrowserErrorPagePlugin.php
+++ b/apps/dav/lib/Files/ErrorPagePlugin.php
@@ -24,17 +24,22 @@
  */
 namespace OCA\DAV\Files;
 
-use OC\AppFramework\Http\Request;
 use OC_Template;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\IConfig;
 use OCP\IRequest;
 use Sabre\DAV\Exception;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 
-class BrowserErrorPagePlugin extends ServerPlugin {
-	/** @var Server */
-	private $server;
+class ErrorPagePlugin extends ServerPlugin {
+	private ?Server $server = null;
+
+	public function __construct(
+		private IRequest $request,
+		private IConfig $config,
+	) {
+	}
 
 	/**
 	 * This initializes the plugin.
@@ -43,35 +48,12 @@ class BrowserErrorPagePlugin extends ServerPlugin {
 	 * addPlugin is called.
 	 *
 	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
 	 */
-	public function initialize(Server $server) {
+	public function initialize(Server $server): void {
 		$this->server = $server;
 		$server->on('exception', [$this, 'logException'], 1000);
 	}
 
-	/**
-	 * @param IRequest $request
-	 * @return bool
-	 */
-	public static function isBrowserRequest(IRequest $request) {
-		if ($request->getMethod() !== 'GET') {
-			return false;
-		}
-		return $request->isUserAgent([
-			Request::USER_AGENT_IE,
-			Request::USER_AGENT_MS_EDGE,
-			Request::USER_AGENT_CHROME,
-			Request::USER_AGENT_FIREFOX,
-			Request::USER_AGENT_SAFARI,
-		]);
-	}
-
-	/**
-	 * @param \Throwable $ex
-	 */
 	public function logException(\Throwable $ex): void {
 		if ($ex instanceof Exception) {
 			$httpCode = $ex->getHTTPCode();
@@ -82,7 +64,7 @@ class BrowserErrorPagePlugin extends ServerPlugin {
 		}
 		$this->server->httpResponse->addHeaders($headers);
 		$this->server->httpResponse->setStatus($httpCode);
-		$body = $this->generateBody($httpCode);
+		$body = $this->generateBody($ex, $httpCode);
 		$this->server->httpResponse->setBody($body);
 		$csp = new ContentSecurityPolicy();
 		$this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy());
@@ -93,18 +75,32 @@ class BrowserErrorPagePlugin extends ServerPlugin {
 	 * @codeCoverageIgnore
 	 * @return bool|string
 	 */
-	public function generateBody(int $httpCode) {
-		$request = \OC::$server->getRequest();
-
-		$templateName = 'exception';
-		if ($httpCode === 403 || $httpCode === 404) {
-			$templateName = (string)$httpCode;
+	public function generateBody(\Throwable $ex, int $httpCode): mixed {
+		if ($this->acceptHtml()) {
+			$templateName = 'exception';
+			$renderAs = 'guest';
+			if ($httpCode === 403 || $httpCode === 404) {
+				$templateName = (string)$httpCode;
+			}
+		} else {
+			$templateName = 'xml_exception';
+			$renderAs = null;
+			$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
 		}
 
-		$content = new OC_Template('core', $templateName, 'guest');
+		$debug = $this->config->getSystemValueBool('debug', false);
+
+		$content = new OC_Template('core', $templateName, $renderAs);
 		$content->assign('title', $this->server->httpResponse->getStatusText());
-		$content->assign('remoteAddr', $request->getRemoteAddress());
-		$content->assign('requestID', $request->getId());
+		$content->assign('remoteAddr', $this->request->getRemoteAddress());
+		$content->assign('requestID', $this->request->getId());
+		$content->assign('debugMode', $debug);
+		$content->assign('errorClass', get_class($ex));
+		$content->assign('errorMsg', $ex->getMessage());
+		$content->assign('errorCode', $ex->getCode());
+		$content->assign('file', $ex->getFile());
+		$content->assign('line', $ex->getLine());
+		$content->assign('exception', $ex);
 		return $content->fetchPage();
 	}
 
@@ -115,4 +111,14 @@ class BrowserErrorPagePlugin extends ServerPlugin {
 		$this->server->sapi->sendResponse($this->server->httpResponse);
 		exit();
 	}
+
+	private function acceptHtml(): bool {
+		foreach (explode(',', $this->request->getHeader('Accept')) as $part) {
+			$subparts = explode(';', $part);
+			if (str_ends_with($subparts[0], '/html')) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
index 98be4e41917..168f17bab8a 100644
--- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
+++ b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
@@ -154,7 +154,7 @@ class AppleProvisioningPlugin extends ServerPlugin {
 		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
 
 		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
+		$body = vsprintf($xmlSkeleton, array_map(function (string $v) {
 			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
 		}, [
 			$description,
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index bb73e46ffb7..72bb43a2c40 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -73,7 +73,7 @@ use OCA\DAV\DAV\PublicAuth;
 use OCA\DAV\DAV\ViewOnlyPlugin;
 use OCA\DAV\Events\SabrePluginAddEvent;
 use OCA\DAV\Events\SabrePluginAuthInitEvent;
-use OCA\DAV\Files\BrowserErrorPagePlugin;
+use OCA\DAV\Files\ErrorPagePlugin;
 use OCA\DAV\Files\LazySearchBackend;
 use OCA\DAV\Profiler\ProfilerPlugin;
 use OCA\DAV\Provisioning\Apple\AppleProvisioningPlugin;
@@ -247,9 +247,7 @@ class Server {
 			$this->server->addPlugin(new FakeLockerPlugin());
 		}
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
+		$this->server->addPlugin(new ErrorPagePlugin($this->request, \OC::$server->getConfig()));
 
 		$lazySearchBackend = new LazySearchBackend();
 		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml
index cf4fcde251f..388d9df8413 100644
--- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml
@@ -2712,7 +2712,7 @@
 					<callback>prepostcondition</callback>
 					<arg>
 						<name>error</name>
-						<value>{DAV:}valid-sync-token</value>
+						<value>{http://sabredav.org/ns}exception</value>
 					</arg>
 					<arg>
 						<name>ignoreextras</name>
diff --git a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/ErrorPagePluginTest.php
index b6ec05afd78..3c87574e8d2 100644
--- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
+++ b/apps/dav/tests/unit/DAV/ErrorPagePluginTest.php
@@ -23,11 +23,11 @@
  */
 namespace OCA\DAV\Tests\unit\DAV;
 
-use OCA\DAV\Files\BrowserErrorPagePlugin;
+use OCA\DAV\Files\ErrorPagePlugin;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\HTTP\Response;
 
-class BrowserErrorPagePluginTest extends \Test\TestCase {
+class ErrorPagePluginTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesExceptions
@@ -35,8 +35,8 @@ class BrowserErrorPagePluginTest extends \Test\TestCase {
 	 * @param $exception
 	 */
 	public function test($expectedCode, $exception): void {
-		/** @var BrowserErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */
-		$plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->setMethods(['sendResponse', 'generateBody'])->getMock();
+		/** @var ErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */
+		$plugin = $this->getMockBuilder(ErrorPagePlugin::class)->disableOriginalConstructor()->setMethods(['sendResponse', 'generateBody'])->getMock();
 		$plugin->expects($this->once())->method('generateBody')->willReturn(':boom:');
 		$plugin->expects($this->once())->method('sendResponse');
 		/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject $server */
diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
index d39aec0915e..662c4896a9e 100644
--- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
+++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
@@ -78,9 +78,9 @@ class AssemblyStreamTest extends \Test\TestCase {
 		$tonofnodes = [];
 		$tonofdata = "";
 		for ($i = 0; $i < 101; $i++) {
-			$thisdata = rand(0, 100); // variable length and content
+			$thisdata = random_int(0, 100); // variable length and content
 			$tonofdata .= $thisdata;
-			array_push($tonofnodes, $this->buildNode($i, $thisdata));
+			$tonofnodes[] = $this->buildNode((string)$i, (string)$thisdata);
 		}
 
 		return[