Merge pull request #28606 from nextcloud/release/22.1.1-final

22.1.1
Merge pull request #28596 from nextcloud/backport/28262/stable22
2021-08-26 15:21:22 +02:00 · 2021-08-26 14:20:09 +02:00 · 2021-08-26 13:05:47 +02:00 · 2021-08-25 12:39:11 +00:00 · 2021-08-25 13:21:41 +02:00 · 2021-08-25 09:31:58 +02:00
4517 changed files with 69113 additions and 176754 deletions
@@ -1,5 +1,5 @@
 codecov:
-  branch: stable23
+  branch: stable22
  ci:
    - drone.nextcloud.com
    - !scrutinizer-ci.com
@@ -1,4 +1,3 @@
---
 kind: pipeline
 name: checkers

@@ -145,43 +144,43 @@ trigger:
    - pull_request
    - push

-#---
-#kind: pipeline
-#name: samba
-#
-#steps:
-#- name: submodules
-#  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-#  commands:
-#    - git submodule update --init
-#- name: sqlite-php7.4-samba-native
-#  image: ghcr.io/nextcloud/continuous-integration-samba-native-php7.4:latest
-#  commands:
-#    - smbd -D -FS &
-#    - ./autotest-external.sh sqlite smb-linux
-#    - wget https://codecov.io/bash -O codecov.sh
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
-#- name: sqlite-php7.4-samba-non-native
-#  image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php7.4:latest
-#  commands:
-#    - smbd -D -FS &
-#    - ./autotest-external.sh sqlite smb-linux
-#    - wget https://codecov.io/bash -O codecov.sh
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
-#    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
-#
-#trigger:
-#  branch:
-#    - master
-#    - stable*
-#  event:
-#    - pull_request
-#    - push
+---
+kind: pipeline
+name: samba
+
+steps:
+- name: submodules
+  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
+  commands:
+    - git submodule update --init
+- name: sqlite-php7.3-samba-native
+  image: nextcloudci/samba-native-php7.3:samba-native-php7.3-1
+  commands:
+    - smbd -D -FS &
+    - ./autotest-external.sh sqlite smb-linux
+    - wget https://codecov.io/bash -O codecov.sh
+    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
+- name: sqlite-php7.3-samba-non-native
+  image: nextcloudci/samba-non-native-php7.3:samba-non-native-php7.3-1
+  commands:
+    - smbd -D -FS &
+    - ./autotest-external.sh sqlite smb-linux
+    - wget https://codecov.io/bash -O codecov.sh
+    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
+    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push

 ---
 kind: pipeline
@@ -437,42 +436,6 @@ trigger:
    - pull_request
    - push

---
-kind: pipeline
-name: mariadb10.6-php8.0
-
-steps:
- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
- name: mariadb10.6-php8.0
-  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
-
-services:
- name: cache
-  image: ghcr.io/nextcloud/continuous-integration-redis:latest
- name: mariadb
-  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: mysql8.0-php7.4
@@ -778,7 +741,6 @@ steps:
 - name: integration-capabilities_features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -804,7 +766,6 @@ steps:
 - name: integration-collaboration_features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -830,7 +791,6 @@ steps:
 - name: integration-federation_features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin
    - cd build/integration
@@ -856,7 +816,6 @@ steps:
 - name: integration-auth
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -882,7 +841,6 @@ steps:
 - name: integration-avatar
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -908,7 +866,6 @@ steps:
 - name: integration-maintenance-mode
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -934,7 +891,6 @@ steps:
 - name: integration-ratelimiting
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - ./occ config:system:set redis host --value=cache
@@ -970,7 +926,6 @@ steps:
 - name: integration-carddav
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -996,7 +951,6 @@ steps:
 - name: integration-dav-v2
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1022,7 +976,6 @@ steps:
 - name: integration-ocs-v1
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1048,7 +1001,6 @@ steps:
 - name: integration-checksums-v1
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1074,7 +1026,6 @@ steps:
 - name: integration-external-storage
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1100,7 +1051,6 @@ steps:
 - name: integration-provisioning-v1
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1126,7 +1076,6 @@ steps:
 - name: integration-tags
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1152,7 +1101,6 @@ steps:
 - name: integration-caldav
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1178,7 +1126,6 @@ steps:
 - name: integration-comments
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1204,7 +1151,6 @@ steps:
 - name: integration-comments-search
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1230,7 +1176,6 @@ steps:
 - name: integration-contacts-menu
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1256,7 +1201,6 @@ steps:
 - name: integration-favorites
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1282,7 +1226,6 @@ steps:
 - name: integration-provisioning-v2
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1308,7 +1251,6 @@ steps:
 - name: integration-webdav-related
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1334,7 +1276,6 @@ steps:
 - name: integration-sharees-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1360,7 +1301,6 @@ steps:
 - name: integration-sharees-v2-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1386,7 +1326,6 @@ steps:
 - name: integration-sharing-v1
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1412,7 +1351,6 @@ steps:
 - name: integration-sharing-v1-part2
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1438,7 +1376,6 @@ steps:
 - name: integration-sharing-v1-part3
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1466,11 +1403,10 @@ steps:
  commands:
    # JavaScript files are not used in integration tests so it is not needed to
    # build them.
-    - git clone --depth 1 --branch stable23 https://github.com/nextcloud/spreed apps/spreed
+    - git clone --depth 1 --branch stable22 https://github.com/nextcloud/spreed apps/spreed
 - name: integration-sharing-v1-video-verification
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1496,7 +1432,6 @@ steps:
 - name: integration-setup-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - cd build/integration
    - ./run.sh setup_features/setup.feature
@@ -1521,7 +1456,6 @@ steps:
 - name: integration-filesdrop-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1547,7 +1481,6 @@ steps:
 - name: integration-transfer-ownership-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1573,7 +1506,6 @@ steps:
 - name: integration-ldap-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1599,7 +1531,6 @@ steps:
 - name: integration-ldap-openldap-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - ./occ config:system:set redis host --value=cache
@@ -1641,7 +1572,6 @@ steps:
    - name: integration-ldap-openldap-uid-features
      image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
      commands:
-          - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
          - bash tests/drone-run-integration-tests.sh || exit 0
          - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
          - ./occ config:system:set redis host --value=cache
@@ -1684,7 +1614,6 @@ steps:
 - name: integration-ldap-openldap-numerical-id-features
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - ./occ config:system:set redis host --value=cache
@@ -1726,7 +1655,6 @@ steps:
 - name: integration-trashbin
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1752,7 +1680,6 @@ steps:
 - name: integration-remote-api
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -1778,7 +1705,6 @@ steps:
 - name: integration-download
  image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
  commands:
-    - curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
    - cd build/integration
@@ -2390,8 +2316,3 @@ trigger:
 #  event:
 #    - pull_request
 #    - push
---
-kind: signature
-hmac: 964c3515a08e66da50fb2657058eaafbbe88c2a43092b44d4c87f0493356f528
-
-...
@@ -13,8 +13,5 @@ module.exports = {
 	extends: ['@nextcloud'],
 	rules: {
 		'no-tabs': 'warn',
-		// TODO: make sure we fix this as this is bad vue coding style.
-		// Use proper sync modifier
-		'vue/no-mutating-props': 'warn',
-	},
+	}
 }
@@ -7,8 +7,6 @@
 /apps/comments/js/*.js.map binary
 /apps/dashboard/js/*.js binary
 /apps/dashboard/js/*.js.map binary
-/apps/dav/js/*.js binary
-/apps/dav/js/*.js.map binary
 /apps/files/js/dist/*.js binary
 /apps/files/js/dist/*.js.map binary
 /apps/files_sharing/js/dist/*.js binary
@@ -55,6 +55,24 @@ updates:


 # Main stableXX npm
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable19
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+  ignore:
+    # ignore all GitHub linguist patch updates
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
 - package-ecosystem: npm
  directory: "/"
  schedule:
@@ -91,25 +109,25 @@ updates:
    - dependency-name: "*"
      update-types: ["version-update:semver-major", "version-update:semver-minor"]

- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable22
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
 # Testing StableXX composer
+- package-ecosystem: composer
+  directory: "/build/integration"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable19
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+  ignore:
+    # ignore all GitHub linguist patch updates
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
 - package-ecosystem: composer
  directory: "/build/integration"
  schedule:
@@ -145,21 +163,3 @@ updates:
    # ignore all GitHub linguist patch updates
    - dependency-name: "*"
      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable22
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
@@ -1,30 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Pull request checks
-
-on: pull_request
-
-jobs:
-  block-merges-eol:
-    name: Block merges for EOL branches
-
-    # Only run on stableXX branches
-    if: startsWith( github.base_ref, 'stable')
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download updater config
-        run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php
-
-      - name: Set server major version environment
-        run: |
-          # retrieve version number from branch reference
-          server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p')
-          echo "server_major=$server_major" >> $GITHUB_ENV
- 
-      - name: Checking if ${{ env.server_major }} is EOL
-        run: |
-          php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol' | grep --silent -i 'false'
@@ -1,21 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Pull request checks
-
-on: pull_request
-
-jobs:
-  block-merges-during-freeze:
-    name: Block merges during feature freezes
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download version.php from ${{ github.base_ref }}
-        run: curl https://raw.githubusercontent.com/nextcloud/server/${{ github.base_ref }}/version.php --output version.php
-
-      - name: Run check
-        run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC'
@@ -1,117 +0,0 @@
-name: Compile Command
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  init:
-    runs-on: ubuntu-latest
-
-    # On pull requests and if the comment starts with `/compile`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/compile')
-
-    outputs:
-      git_path: ${{ steps.git-path.outputs.path }}
-      arg1: ${{ steps.command.outputs.arg1 }}
-      arg2: ${{ steps.command.outputs.arg2 }}
-      head_ref: ${{ steps.comment-branch.outputs.head_ref }}
-
-    steps:
-      - name: Check actor permission
-        uses: skjnldsv/check-actor-permission@e591dbfe838300c007028e1219ca82cc26e8d7c5 # v2.1
-        with:
-          require: write
-
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae # v1.4.5
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
-
-      - name: Parse command
-        uses: skjnldsv/parse-command-comment@7cef1df370a99dfd5bf896d50121390c96785db8 # v2.0
-        id: command
-
-      # Init path depending on which command is run
-      - name: Init path
-        id: git-path
-        run: |    
-          if ${{ startsWith(steps.command.outputs.arg1, '/') }}; then
-            echo "::set-output name=path::${{ github.workspace }}${{steps.command.outputs.arg1}}"
-          else
-            echo "::set-output name=path::${{ github.workspace }}${{steps.command.outputs.arg2}}"
-          fi
-
-      - name: Init branch
-        uses: xt0rted/pull-request-comment-branch@653a7d5ca8bd91d3c5cb83286063314d0b063b8e # v1.4.0
-        id: comment-branch
-    
-  process:
-    runs-on: ubuntu-latest
-    needs: init
-
-    steps:
-      - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          fetch-depth: 0
-          ref: ${{ needs.init.outputs.head_ref }}
-
-      - name: Setup git
-        run: |
-          git config --local user.email "nextcloud-command@users.noreply.github.com"
-          git config --local user.name "nextcloud-command"
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@1bdcee71fa343c46b18dc6aceffb4cd1e35209c6 # v1.2
-        id: package-engines-versions
-        with:
-          fallbackNode: '^12'
-          fallbackNpm: '^6'
-
-      - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
-          cache: npm
-
-      - name: Set up npm ${{ steps.package-engines-versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.package-engines-versions.outputs.npmVersion }}"
-
-      - name: Install dependencies & build
-        run: |
-          npm ci
-          npm run build --if-present
-
-      - name: Commit and push default
-        if: ${{ needs.init.outputs.arg1 != 'fixup' && needs.init.outputs.arg1 != 'amend' }}
-        run: |
-          git add ${{ needs.init.outputs.git_path }}
-          git commit --signoff -m 'Compile assets'
-          git push origin ${{ needs.init.outputs.head_ref }}
-
-      - name: Commit and push fixup
-        if: ${{ needs.init.outputs.arg1 == 'fixup' }}
-        run: |
-          git add ${{ needs.init.outputs.git_path }}
-          git commit --fixup=HEAD --signoff
-          git push origin ${{ needs.init.outputs.head_ref }}
-
-      - name: Commit and push amend
-        if: ${{ needs.init.outputs.arg1 == 'amend' }}
-        run: |
-          git add ${{ needs.init.outputs.git_path }}
-          git commit --amend --no-edit --signoff
-          git push --force origin ${{ needs.init.outputs.head_ref }}
-
-      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae # v1.4.5
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
@@ -1,46 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Rebase command
-
-on:
-  issue_comment:
-    types: created
-
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-
-    steps:
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae # v1.4.5
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
-
-      - name: Checkout the latest code
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@c473b716e3fcde0c6bf67416e2c2882830ad40f6 # 1.5
-        env:
-          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae # v1.4.5
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
@@ -12,18 +12,18 @@ on:
      - stable*

 jobs:
-  auto-approve-merge:
-    if: github.actor == 'dependabot[bot]'
+  auto-merge:
    runs-on: ubuntu-latest
-
    steps:
-      # Github actions bot approve
-      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
+      # Default github action approve
+      - uses: hmarr/auto-approve-action@v2
+        if: github.actor == 'dependabot[bot]'
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}

      # Nextcloud bot approve and merge request
-      - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2.6.6
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        if: github.actor == 'dependabot[bot]'
        with:
          target: minor
          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
@@ -1,20 +1,12 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
 name: Pull request checks
-
 on: pull_request

 jobs:
  commit-message-check:
    name: Block fixup and squash commits
-
    runs-on: ubuntu-latest
-
    steps:
      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@79880c36b4811fe549cfffe20233df88876024e7 # v2.2.0
+        uses: xt0rted/block-autosquash-commits-action@main
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,78 +0,0 @@
-name: FTP
-on:
-  push:
-    branches:
-      - master
-      - stable*
-    paths:
-      - 'apps/files_external/**'
-  pull_request:
-    paths:
-      - 'apps/files_external/**'
-
-env:
-  APP_NAME: files_external
-
-jobs:
-  ftp-tests:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
-        ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-
-      - name: Set up ftpd
-        run: |
-          sudo mkdir /tmp/ftp
-          sudo chown -R 0777 /tmp/ftp
-          if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e FTP_USERNAME=test -e FTP_PASSWORD=test -v /tmp/ftp:/home/test hauptmedia/proftpd; fi
-          if [[ "${{ matrix.ftpd }}" == 'vsftpd' ]]; then docker run --name ftp -d --net host -e FTP_USER=test -e FTP_PASS=test -e PASV_ADDRESS=127.0.0.1 -v /tmp/ftp:/home/vsftpd/test fauria/vsftpd; fi
-          if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp2:/home/test -v /tmp/ftp2:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit:9
-          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
-
-      - name: Set up Nextcloud
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          ./occ app:enable --force ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-      - name: smoketest ftp
-        run: |
-          php -r 'var_dump(file_put_contents("ftp://test:test@localhost/ftp.txt", "asd"));'
-          php -r 'var_dump(file_get_contents("ftp://test:test@localhost/ftp.txt"));'
-          php -r 'var_dump(mkdir("ftp://test:test@localhost/asdads"));'
-          ls -l /tmp/ftp
-      - name: PHPUnit
-        run: |
-          echo "<?php return ['run' => true,'host' => 'localhost','user' => 'test','password' => 'test', 'root' => ''];" > apps/${{ env.APP_NAME }}/tests/config.ftp.php
-          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/FtpTest.php
-      - name: ftpd logs
-        if: always()
-        run: |
-          docker logs ftp
-
-  ftp-summary:
-    runs-on: ubuntu-latest
-    needs: ftp-tests
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.ftp-tests.result != 'success' }}; then exit 1; fi
@@ -1,44 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    name: eslint
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@1e2f46e78e31476bc71ebd909105e6e033d5a6f4 # v1.1
-        id: versions
-        with:
-          fallbackNode: '^12'
-          fallbackNpm: '^6'
-
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
@@ -10,12 +10,12 @@ jobs:
    name: php${{ matrix.php-versions }} lint
    steps:
    - name: Checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@master
    - name: Set up php${{ matrix.php-versions }}
-      uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+      uses: shivammathur/setup-php@master
      with:
        php-version: ${{ matrix.php-versions }}
-        extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
        coverage: none
    - name: Lint
      run: composer run lint
@@ -25,12 +25,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@master
    - name: Set up php
-      uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+      uses: shivammathur/setup-php@master
      with:
        php-version: 7.4
-        extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
        coverage: none
        tools: cs2pr
    - name: Install dependencies
@@ -40,3 +40,25 @@ jobs:
        composer run cs:check -- --format=checkstyle | cs2pr
        composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
      shell: bash
+
+  node:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    name: eslint node${{ matrix.node-version }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
@@ -1,94 +0,0 @@
-name: Node
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  versions:
-    runs-on: ubuntu-latest
-    outputs:
-      nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
-      npmVersion: ${{ steps.versions.outputs.npmVersion }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@1e2f46e78e31476bc71ebd909105e6e033d5a6f4 # v1.1
-        id: versions
-        with:
-          fallbackNode: '^12'
-          fallbackNpm: '^6'
-
-  test:
-    runs-on: ubuntu-latest
-    needs: versions
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-
-      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ needs.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ needs.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}"
-
-      - name: Install dependencies
-        env:
-          CYPRESS_INSTALL_BINARY: 0
-          PUPPETEER_SKIP_DOWNLOAD: true
-        run: npm ci
-
-      - name: Test
-        run: npm run test
-
-  jsunit:
-    runs-on: ubuntu-latest
-    needs: versions
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-
-      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ needs.versions.outputs.nodeVersion }}
-
-      # This test requires npm6 for some reason
-      # TODO: fix this and/or move away from jsunit
-      - name: Set up npm 6
-        run: npm i -g npm@^6
-
-      - name: Test
-        run: ./autotest-js.sh
-
-  handlebars:
-    runs-on: ubuntu-latest
-    needs: versions
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-
-      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ needs.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ needs.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}"
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run compile
-        run: ./build/compile-handlebars-templates.sh
@@ -1,8 +1,3 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
 name: Node

 on:
@@ -14,39 +9,71 @@ on:

 jobs:
  build:
+
    runs-on: ubuntu-latest

-    name: node
+    strategy:
+      matrix:
+        node-version: [12.x]
+
    steps:
-      - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies & build
+      run: |
+        make clean
+        npm ci
+        npm run build --if-present
+    - name: Check webpack build changes
+      run: |
+        bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )"
+      env:
+        CI: true

-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@1e2f46e78e31476bc71ebd909105e6e033d5a6f4 # v1.1
-        id: versions
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: |
+          npm ci
+    - name: Test
+      run: npm run test
+
+  jsunit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+    - name: Test
+      run: ./autotest-js.sh
+
+  handlebars:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
        with:
-          fallbackNode: '^12'
-          fallbackNpm: '^6'
-
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
-        with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
-
-      - name: Install dependencies & build
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
        run: |
          npm ci
-          npm run build --if-present
-
-      - name: Check webpack build changes
-        run: |
-          bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1"
-
-      - name: Show changes on failure
-        if: failure()
-        run: |
-          git status
-          git --no-pager diff
+      - name: Run compile
+        run: ./build/compile-handlebars-templates.sh
@@ -8,41 +8,27 @@ on:
      - stable*

 jobs:
-  phpunit-oci:
+  phpunit-oci8:
    runs-on: ubuntu-20.04

    strategy:
+      # do not stop on another job's failure
      fail-fast: false
      matrix:
-        php-versions: [ '7.3', '7.4', '8.0' ]
+        php-versions: [ '7.4' ]
        databases: [ 'oci' ]

    name: php${{ matrix.php-versions }}-${{ matrix.databases }}

    services:
      oracle:
-        image: ghcr.io/gvenzl/oracle-xe:11
-
-        # Provide passwords and other environment variables to container
-        env:
-          ORACLE_RANDOM_PASSWORD: true
-          APP_USER: autotest
-          APP_USER_PASSWORD: owncloud
-
-        # Forward Oracle port
+        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
        ports:
-          - 1521:1521/tcp
-
-        # Provide healthcheck script options for startup
-        options: >-
-          --health-cmd healthcheck.sh
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 10
+          - "1521:1521"

    steps:
      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+        uses: actions/checkout@v2

      - name: Checkout submodules
        shell: bash
@@ -52,11 +38,11 @@ jobs:
          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pcntl,pdo_sqlite,posix,sqlite,xml,zip
-          tools: phpunit:9
+          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          tools: phpunit:8.5.2
          coverage: none

      - name: Set up Nextcloud
@@ -68,21 +54,3 @@ jobs:
      - name: PHPUnit
        working-directory: tests
        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
-
-      - name: Run repair steps
-        run: |
-          ./occ maintenance:repair --include-expensive
-
-  summary:
-    permissions:
-      contents: none
-    runs-on: ubuntu-latest
-    needs: phpunit-oci
-
-    if: always()
-
-    name: phpunit-oci-summary
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi
@@ -13,16 +13,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+        uses: actions/checkout@v2
        with:
          submodules: recursive
      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:4.9.3
+        uses: docker://vimeo/psalm-github-actions
        continue-on-error: true
        with:
          composer_ignore_platform_reqs: false
          report_file: results.sarif
      - name: Upload Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@231aa2c8a89117b126725a0e11897209b7118144 # v1.1.39
+        uses: github/codeql-action/upload-sarif@v1
        with:
          sarif_file: results.sarif
@@ -13,16 +13,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+        uses: actions/checkout@v2
        with:
          submodules: recursive
      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:4.9.3
+        uses: docker://vimeo/psalm-github-actions
        with:
          security_analysis: true
          composer_ignore_platform_reqs: false
          report_file: results.sarif
      - name: Upload Security Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@231aa2c8a89117b126725a0e11897209b7118144 # v1.1.39
+        uses: github/codeql-action/upload-sarif@v1
        with:
          sarif_file: results.sarif
@@ -1,124 +0,0 @@
-name: S3 External storage
-on:
-  push:
-    branches:
-      - master
-      - stable*
-    paths:
-      - 'apps/files_external/**'
-  pull_request:
-    paths:
-      - 'apps/files_external/**'
-
-env:
-  APP_NAME: files_external
-
-jobs:
-  s3-external-tests-minio:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
-
-    name: php${{ matrix.php-versions }}-minio
-
-    services:
-      minio:
-        env:
-          MINIO_ACCESS_KEY: minio
-          MINIO_SECRET_KEY: minio123
-        image: bitnami/minio:2021.10.6
-        ports:
-          - "9000:9000"
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit:9
-          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
-
-      - name: Set up Nextcloud
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          ./occ app:enable --force ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-      - name: PHPUnit
-        run: |
-          echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
-          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
-          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
-      - name: S3 logs
-        if: always()
-        run: |
-          docker ps -a
-          docker logs $(docker ps -aq)
-  s3-external-tests-localstack:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
-
-    name: php${{ matrix.php-versions }}-localstack
-
-    services:
-      minio:
-        env:
-          SERVICES: s3
-          DEBUG: 1
-        image: localstack/localstack:0.12.7
-        ports:
-          - "4566:4566"
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit:9
-          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
-
-      - name: Set up Nextcloud
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          ./occ app:enable --force ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-      - name: PHPUnit
-        run: |
-          echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'ignored','secret' => 'ignored', 'bucket' => 'bucket', 'port' => 4566, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
-          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
-          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
-      - name: S3 logs
-        if: always()
-        run: |
-          docker ps -a
-          docker logs $(docker ps -aq)
-
-  s3-external-summary:
-    runs-on: ubuntu-latest
-    needs: [s3-external-tests-minio, s3-external-tests-localstack]
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.s3-external-tests-minio.result != 'success' }} || ${{ needs.s3-external-tests-localstack.result != 'success' }}; then exit 1; fi
@@ -1,76 +0,0 @@
-name: S3 primary storage
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  s3-primary-tests-minio:
-    runs-on: ubuntu-20.04
-
-    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['8.0']
-        key: ['objectstore', 'objectstore_multibucket']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
-
-    services:
-      minio:
-        env:
-          MINIO_ACCESS_KEY: minio
-          MINIO_SECRET_KEY: minio123
-        image: bitnami/minio:2021.12.29
-        ports:
-          - "9000:9000"
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit:9
-          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
-
-      - name: Set up Nextcloud
-        run: |
-          mkdir data
-          echo '<?php $CONFIG=["${{ matrix.key }}" => ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "minio", "secret" => "minio123", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php
-          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          php -f index.php
-
-      - name: Wait for S3
-        run: |
-          sleep 10
-          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
-
-      - name: PHPUnit
-        working-directory: tests
-        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
-      - name: S3 logs
-        if: always()
-        run: |
-          docker ps -a
-          docker logs $(docker ps -aq)
-
-
-  s3-primary-summary:
-    runs-on: ubuntu-latest
-    needs: [s3-primary-tests-minio]
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.s3-primary-tests-minio.result != 'success' }}; then exit 1; fi
@@ -1,78 +0,0 @@
-name: Samba Kerberos SSO
-on:
-  push:
-    branches:
-      - master
-      - stable*
-    paths:
-      - 'apps/files_external/**'
-  pull_request:
-    paths:
-      - 'apps/files_external/**'
-
-jobs:
-  smb-kerberos-tests:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-      - name: Pull images
-        run: |
-          docker pull icewind1991/samba-krb-test-dc
-          docker pull icewind1991/samba-krb-test-apache
-          docker pull icewind1991/samba-krb-test-client
-      - name: Setup AD-DC
-        run: |
-          mkdir data
-          sudo chown -R 33 data apps config
-          apps/files_external/tests/setup-krb.sh
-      - name: Set up Nextcloud
-        run: |
-          docker exec --user 33 apache ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          docker exec --user 33 apache ./occ config:system:set trusted_domains 1 --value 'httpd.domain.test'
-
-          # setup user_saml
-          docker exec --user 33 apache ./occ app:enable user_saml --force
-          docker exec --user 33 apache ./occ config:app:set user_saml type --value 'environment-variable'
-          docker exec --user 33 apache ./occ config:app:set user_saml general-uid_mapping --value REMOTE_USER
-
-          # setup external storage
-          docker exec --user 33 apache ./occ app:enable files_external --force
-          docker exec --user 33 apache ./occ files_external:create smb smb smb::kerberosapache
-          docker exec --user 33 apache ./occ files_external:config 1 host krb.domain.test
-          docker exec --user 33 apache ./occ files_external:config 1 share netlogon
-          docker exec --user 33 apache ./occ files_external:list
-      - name: Test SSO
-        run: |
-          mkdir cookies
-          chmod 0777 cookies
-
-          DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
-          docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
-            curl -c /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
-          CONTENT=$(docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
-            curl -b /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
-          echo $CONTENT
-          CONTENT=$(echo $CONTENT | tr -d '[:space:]')
-          [[ $CONTENT == "testfile" ]]
-
-
-  smb-kerberos-summary:
-    runs-on: ubuntu-latest
-    needs: smb-kerberos-tests
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.smb-kerberos-tests.result != 'success' }}; then exit 1; fi
@@ -6,7 +6,7 @@ jobs:
    static-code-analysis:
        runs-on: ubuntu-latest
        steps:
-            - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+            - uses: actions/checkout@v2
            - name: Checkout submodules
              shell: bash
              run: |
@@ -14,15 +14,15 @@ jobs:
                git submodule sync --recursive
                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
            - name: Set up php7.4
-              uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+              uses: shivammathur/setup-php@master
              with:
                php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
                coverage: none
            - name: Composer install
              run: composer i
            - name: Psalm
-              run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+              run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
            - name: Check diff
              run: git diff -- . ':!lib/composer'
            - name: Show potential changes in Psalm baseline
@@ -32,7 +32,7 @@ jobs:
    static-code-analysis-ocp:
        runs-on: ubuntu-latest
        steps:
-            - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+            - uses: actions/checkout@v2
            - name: Checkout submodules
              shell: bash
              run: |
@@ -40,15 +40,15 @@ jobs:
                git submodule sync --recursive
                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
            - name: Set up php7.4
-              uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+              uses: shivammathur/setup-php@master
              with:
                php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
                coverage: none
            - name: Composer install
              run: composer i
            - name: Psalm
-              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
            - name: Check diff
              run: git diff -- . ':!lib/composer'
            - name: Show potential changes in Psalm baseline
@@ -1,53 +1,47 @@
 name: Update Psalm baseline

 on:
-  workflow_dispatch:
  schedule:
    - cron: '5 4 * * *'

 jobs:
  update-psalm-baseline:
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-        with:
-          submodules: true
-
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
      - name: Set up php7.4
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@master
        with:
          php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none
-
      - name: Composer install
-        run: composer install
-
+        run: composer i
      - name: Psalm
        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
-        continue-on-error: true
-
-      - name: Reset composer
+      - name: Reset composer.json and composer.lock
        run: |
-          git clean -f lib/composer
-          git checkout composer.json composer.lock lib/composer
-
+          rm -rf lib/composer
+          git checkout -- composer.json composer.lock lib/composer
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672 # v3.14.0
+        uses: peter-evans/create-pull-request@v3
        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
+          token: ${{ secrets.MACHINE_USER_PAT }}
+          push-to-fork: nextcloud-pr-bot/server
          commit-message: Update psalm baseline
          committer: GitHub <noreply@github.com>
-          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
+          author: Nextcloud-PR-Bot <nextcloud-pr-bot@users.noreply.github.com>
          signoff: true
          branch: automated/noid/psalm-baseline-update
-          # Make sure we can open multiple PRs
-          branch-suffix: timestamp
          title: '[Automated] Update psalm-baseline.xml'
          body: |
            Auto-generated update psalm-baseline.xml with fixed psalm warnings
          labels: |
            automated pr
-            3. to review
-          team-reviewers: server-backend
+          reviewers: juliushaertl, artonge, kesselb
@@ -159,5 +159,3 @@ clover.xml
 tests/acceptance/vendor/

 composer.phar
-/lib/composer/bin
-/vendor-bin/**/vendor
@@ -7,10 +7,6 @@
    <IfModule mod_proxy_fcgi.c>
       SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
    </IfModule>
-    <IfModule mod_lsapi.c>
-      SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
-      RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
-    </IfModule>
  </IfModule>

  <IfModule mod_env.c>
@@ -43,21 +39,15 @@
  </IfModule>

  # Add cache control for static resources
-  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)$">
+  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico)$">
    Header set Cache-Control "max-age=15778463"
  </FilesMatch>

-  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)(\?v=.*)?$">
-    Header set Cache-Control "max-age=15778463, immutable"
-  </FilesMatch>
-
  # Let browsers cache WOFF files for a week
  <FilesMatch "\.woff2?$">
    Header set Cache-Control "max-age=604800"
  </FilesMatch>
 </IfModule>
-
-# PHP 7.x
 <IfModule mod_php7.c>
  php_value mbstring.func_overload 0
  php_value default_charset 'UTF-8'
@@ -66,31 +56,6 @@
    SetEnv htaccessWorking true
  </IfModule>
 </IfModule>
-
-# PHP 8+
-<IfModule mod_php.c>
-  php_value mbstring.func_overload 0
-  php_value default_charset 'UTF-8'
-  php_value output_buffering 0
-  <IfModule mod_env.c>
-    SetEnv htaccessWorking true
-  </IfModule>
-</IfModule>
-
-<IfModule mod_mime.c>
-  AddType image/svg+xml svg svgz
-  AddType application/wasm wasm
-  AddEncoding gzip svgz
-</IfModule>
-
-<IfModule mod_dir.c>
-  DirectoryIndex index.php index.html
-</IfModule>
-
-<IfModule pagespeed_module>
-  ModPagespeed Off
-</IfModule>
-
 <IfModule mod_rewrite.c>
  RewriteEngine on
  RewriteCond %{HTTP_USER_AGENT} DavClnt
@@ -103,6 +68,15 @@
  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
-
+<IfModule mod_mime.c>
+  AddType image/svg+xml svg svgz
+  AddEncoding gzip svgz
+</IfModule>
+<IfModule mod_dir.c>
+  DirectoryIndex index.php index.html
+</IfModule>
 AddDefaultCharset utf-8
 Options -Indexes
+<IfModule pagespeed_module>
+  ModPagespeed Off
+</IfModule>
@@ -82,7 +82,6 @@ Dan Callahan <dan.callahan@gmail.com>
 Dan Jones <dan@danneh.org>
 Daniel <daniel@mars.(none)>
 Daniel Hansson <enoch85@gmail.com>
-Daniel Kesselberg <mail@danielkesselberg.de> kesselb <mail@danielkesselberg.de>
 Daniel Köb <daniel.koeb@peony.at>
 Daniel Molkentin <daniel@molkentin.de>
 Daniele E. Domenichelli <daniele.domenichelli@gmail.com>
@@ -215,7 +214,6 @@ Lennart Rosam <lennart.rosam@medien-systempartner.de>
 Sebastian Döll <sebastian.doell@libasys.de> libasys <sebastian.doell@libasys.de>
 Lode Hoste <zillode@zillode.be>
 lolozere <laurent@chedanne.pro>
-Louis Chemineau <louis@chmn.me> Louis Chemineau <6653109+artonge@users.noreply.github.com>
 Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
 Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.com>
 Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.org>
@@ -2,14 +2,13 @@

 declare(strict_types=1);

-require_once './vendor-bin/cs-fixer/vendor/autoload.php';
+require_once './lib/composer/autoload.php';

 use Nextcloud\CodingStandard\Config;

 $config = new Config();
 $config
 	->getFinder()
-	->ignoreVCSIgnored(true)
 	->exclude('config')
 	->exclude('data')
 	->notPath('3rdparty')
@@ -1,17 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-repos:
-   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
-    hooks:
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
- repo: https://github.com/nextcloud/pre-commit-php.git
-  rev: 1.5.1
-  hooks:
-  - id: php-lint
-  - id: php-cs-fixer
-    files: \.(php)$
-    exclude: ^(config|data|composer)
-    args: []
@@ -30,7 +30,6 @@ lint-fix-watch:
 clean:
 	rm -rf apps/accessibility/js/
 	rm -rf apps/comments/js/
-	rm -rf apps/dashboard/js/
 	rm -rf apps/dav/js/
 	rm -rf apps/files/js/dist/
 	rm -rf apps/files_sharing/js/dist/
@@ -42,14 +41,12 @@ clean:
 	rm -rf apps/twofactor_backupcodes/js
 	rm -rf apps/updatenotification/js/updatenotification.*
 	rm -rf apps/user_status/js/
-	rm -rf apps/weather_status/js/
 	rm -rf apps/workflowengine/js/
 	rm -rf core/js/dist

 clean-git: clean
 	git checkout -- apps/accessibility/js/
 	git checkout -- apps/comments/js/
-	git checkout -- apps/dashboard/js/
 	git checkout -- apps/dav/js/
 	git checkout -- apps/files/js/dist/
 	git checkout -- apps/files_sharing/js/dist/
@@ -61,6 +58,5 @@ clean-git: clean
 	git checkout -- apps/twofactor_backupcodes/js
 	git checkout -- apps/updatenotification/js/updatenotification.*
 	git checkout -- apps/user_status/js/
-	git checkout -- apps/weather_status/js/
 	git checkout -- apps/workflowengine/js/
 	git checkout -- core/js/dist
@@ -1,6 +1,6 @@
 # Nextcloud Server ☁
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable23)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable23)
-[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable23/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable22)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable22)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable22/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)

 **A safe home for all your data.**
@@ -62,7 +62,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t

 We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:

-```bash
+``` bash
 # install dependencies
 make dev-setup

@@ -76,30 +76,30 @@ make watch-js
 make build-js-production
 ```

-#### Committing changes
+#### Commiting changes

 **When making changes, also commit the compiled files!**

 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.

 If you don’t have Handlebars installed yet, you can do it with this terminal command:
-```bash
+```
 sudo npm install -g handlebars
 ```

 Then inside the root folder of your local Nextcloud development installation, run this command in the terminal every time you changed a `.handlebars` file to compile it:
-```bash
+```
 ./build/compile-handlebars-templates.sh
 ```

 Before checking in JS changes, make sure to also build for production:
-```bash
+```
 make build-js-production
 ```
 Then add the compiled files for committing.

 To save some time, to only rebuild for a specific app, use the following and replace the module with the app name:
-```bash
+```
 MODULE=user_status make build-js-production
 ```

@@ -5,7 +5,7 @@
 	<name>Accessibility</name>
 	<summary>Accessibility options for nextcloud</summary>
 	<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
-	<version>1.9.0</version>
+	<version>1.7.0</version>
 	<licence>agpl</licence>
 	<author>John Molakvoæ</author>
 	<namespace>Accessibility</namespace>
@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>

 	<dependencies>
-		<nextcloud min-version="23" max-version="23"/>
+		<nextcloud min-version="22" max-version="22"/>
 	</dependencies>

 	<repair-steps>
@@ -42,75 +42,30 @@ namespace Composer\Autoload;
 */
 class ClassLoader
 {
-    /** @var ?string */
    private $vendorDir;

    // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
    private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
    private $fallbackDirsPsr4 = array();

    // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
    private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
    private $fallbackDirsPsr0 = array();

-    /** @var bool */
    private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
    private $classMap = array();
-
-    /** @var bool */
    private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
    private $missingClasses = array();
-
-    /** @var ?string */
    private $apcuPrefix;

-    /**
-     * @var self[]
-     */
    private static $registeredLoaders = array();

-    /**
-     * @param ?string $vendorDir
-     */
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
    }

-    /**
-     * @return string[]
-     */
    public function getPrefixes()
    {
        if (!empty($this->prefixesPsr0)) {
@@ -120,47 +75,28 @@ class ClassLoader
        return array();
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
    public function getPrefixesPsr4()
    {
        return $this->prefixDirsPsr4;
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
    public function getFallbackDirs()
    {
        return $this->fallbackDirsPsr0;
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
    public function getFallbackDirsPsr4()
    {
        return $this->fallbackDirsPsr4;
    }

-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
    public function getClassMap()
    {
        return $this->classMap;
    }

    /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
+     * @param array $classMap Class to filename map
     */
    public function addClassMap(array $classMap)
    {
@@ -175,11 +111,9 @@ class ClassLoader
     * Registers a set of PSR-0 directories for a given prefix, either
     * appending or prepending to the ones previously set for this prefix.
     *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
     */
    public function add($prefix, $paths, $prepend = false)
    {
@@ -222,13 +156,11 @@ class ClassLoader
     * Registers a set of PSR-4 directories for a given namespace, either
     * appending or prepending to the ones previously set for this namespace.
     *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
     *
     * @throws \InvalidArgumentException
-     *
-     * @return void
     */
    public function addPsr4($prefix, $paths, $prepend = false)
    {
@@ -272,10 +204,8 @@ class ClassLoader
     * Registers a set of PSR-0 directories for a given prefix,
     * replacing any others previously set for this prefix.
     *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
     */
    public function set($prefix, $paths)
    {
@@ -290,12 +220,10 @@ class ClassLoader
     * Registers a set of PSR-4 directories for a given namespace,
     * replacing any others previously set for this namespace.
     *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
     *
     * @throws \InvalidArgumentException
-     *
-     * @return void
     */
    public function setPsr4($prefix, $paths)
    {
@@ -315,8 +243,6 @@ class ClassLoader
     * Turns on searching the include path for class files.
     *
     * @param bool $useIncludePath
-     *
-     * @return void
     */
    public function setUseIncludePath($useIncludePath)
    {
@@ -339,8 +265,6 @@ class ClassLoader
     * that have not been registered with the class map.
     *
     * @param bool $classMapAuthoritative
-     *
-     * @return void
     */
    public function setClassMapAuthoritative($classMapAuthoritative)
    {
@@ -361,8 +285,6 @@ class ClassLoader
     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
     *
     * @param string|null $apcuPrefix
-     *
-     * @return void
     */
    public function setApcuPrefix($apcuPrefix)
    {
@@ -383,8 +305,6 @@ class ClassLoader
     * Registers this instance as an autoloader.
     *
     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
     */
    public function register($prepend = false)
    {
@@ -404,8 +324,6 @@ class ClassLoader

    /**
     * Unregisters this instance as an autoloader.
-     *
-     * @return void
     */
    public function unregister()
    {
@@ -485,11 +403,6 @@ class ClassLoader
        return self::$registeredLoaders;
    }

-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
    private function findFileWithExtension($class, $ext)
    {
        // PSR-4 lookup
@@ -561,10 +474,6 @@ class ClassLoader
 * Scope isolated include.
 *
 * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
 */
 function includeFile($file)
 {
@@ -20,27 +20,12 @@ use Composer\Semver\VersionParser;
 *
 * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
 *
- * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
+ * To require it's presence, you can require `composer-runtime-api ^2.0`
 */
 class InstalledVersions
 {
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
-     */
    private static $installed;
-
-    /**
-     * @var bool|null
-     */
    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
-     */
    private static $installedByVendor = array();

    /**
@@ -243,7 +228,7 @@ class InstalledVersions

    /**
     * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}
     */
    public static function getRootPackage()
    {
@@ -257,7 +242,7 @@ class InstalledVersions
     *
     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
     * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}
     */
    public static function getRawData()
    {
@@ -280,7 +265,7 @@ class InstalledVersions
     * Returns the raw data of all installed.php which are currently loaded for custom implementations
     *
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
     */
    public static function getAllRawData()
    {
@@ -303,7 +288,7 @@ class InstalledVersions
     * @param  array[] $data A vendor/composer/installed.php data set
     * @return void
     *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data
     */
    public static function reload($data)
    {
@@ -313,7 +298,7 @@ class InstalledVersions

    /**
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
     */
    private static function getInstalled()
    {
@@ -2,7 +2,7 @@

 // autoload_classmap.php @generated by Composer

-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;

 return array(
@@ -2,7 +2,7 @@

 // autoload_namespaces.php @generated by Composer

-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;

 return array(
@@ -2,7 +2,7 @@

 // autoload_psr4.php @generated by Composer

-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;

 return array(
@@ -23,11 +23,20 @@ class ComposerAutoloaderInitAccessibility
        }

        spl_autoload_register(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
        spl_autoload_unregister(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'));

-        require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader)();
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
+        } else {
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }

        $loader->setClassMapAuthoritative(true);
        $loader->register(true);
@@ -5,7 +5,7 @@
        'type' => 'library',
        'install_path' => __DIR__ . '/../',
        'aliases' => array(),
-        'reference' => '51f361f81a2a9b399e5d283efcd11c17a1fded73',
+        'reference' => 'fb5ee6087bfd1f4cc2f37cda7a7cab7072aaae86',
        'name' => '__root__',
        'dev' => false,
    ),
@@ -16,7 +16,7 @@
            'type' => 'library',
            'install_path' => __DIR__ . '/../',
            'aliases' => array(),
-            'reference' => '51f361f81a2a9b399e5d283efcd11c17a1fded73',
+            'reference' => 'fb5ee6087bfd1f4cc2f37cda7a7cab7072aaae86',
            'dev_requirement' => false,
        ),
    ),
@@ -21,9 +21,6 @@ $color-box-shadow: transparentize(darken($color-main-background, 70%), 0.5);
 $color-border: lighten($color-main-background, 7%);
 $color-border-dark: lighten($color-main-background, 14%);

-$image-logo: url('../../../core/img/logo/logo.svg?v=1');
-$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
-
 #app-navigation > ul > li > a:first-child,
 #app-navigation > ul > li > ul > li > a:first-child,
 #contactsmenu-menu a,
@@ -13,6 +13,3 @@
 }

 $font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-
-$image-logo: url('../../../core/img/logo/logo.svg?v=1');
-$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
@@ -20,9 +20,6 @@ $color-box-shadow: $color-main-text;
 $color-border: darken($color-main-background, 50%);
 $color-border-dark: darken($color-main-background, 50%);

-$image-logo: url('../../../core/img/logo/logo.svg?v=1');
-$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
-
 [class^='icon-'], [class*=' icon-'],
 .action,
 #appmenu li a,
@@ -61,13 +61,3 @@
 		}
 	}
 }
-
-@media (max-width: ($breakpoint-mobile / 2)) {
-	.app-settings #accessibility .preview-list .preview {
-		display: unset;
-
-		.preview-image {
-			height: 150px;
-		}
-	}
-}
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Цёмная тэма",
-    "Enable dark theme" : "Уключыць цёмную тэму",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Цёмная тэма зніжае напружанне на вочы зніжаючы яркасць. Функцыя знаходзіцца ў стадыі распрацоўкі, таму, калі ласка, паведамляйце пра ўсе знойдзеныя памылкі.",
-    "High contrast mode" : "Рэжым высокай кантраснасці",
-    "Enable high contrast mode" : "Уключыць рэжым высокай кантраснасці",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Рэжым высокай кантраснасці каб палегчыць навігацыю. Гэта паменшыць візуальную якасць, але палепшыць зразумеласць.",
-    "Dyslexia font" : "Шрыфт для людзей з дыслексіяй",
-    "Enable dyslexia font" : "Выкарыстоўваць шрыфт для людзей з дыслексіяй",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — гэта бясплатны шрыфт, распрацаваны каб паменшыць колькасць частых памылак чытання, якія выкліканы дыслексіяй,",
-    "Accessibility" : "Спецыяльныя магчымасці",
-    "Accessibility options for nextcloud" : "Налады спецыяльных магчымасцяў для Nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Налады спецыяльных магчымасцяў, якія спрашчаюць карыстанне Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Універсальны доступ вельмі важны для нас. Мы прытрымліваемся стандартам і правяраем магчымасць выкарыстоўвання нашых сэрвісаў без мышы ці з выкарыстоўваннем дапаможных праграм, такіх, як экраны дыктар. Мы стараемся цалкам адпавядаць {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 на ўзроўні AA, а разам з рэжымам высокай кантраснасці на ўзроўні AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Калі вы знайшлі нейкую праблему, не саромейцеся напісаць у {issuetracker}наш трэкер памылак{linkend}. Таксама калі вы жадаеце прыняць удзел, можаце прыяднацца да {designteam}нашай каманды дызайнераў{linkend}!"
-},
-"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);");
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Цёмная тэма",
-    "Enable dark theme" : "Уключыць цёмную тэму",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Цёмная тэма зніжае напружанне на вочы зніжаючы яркасць. Функцыя знаходзіцца ў стадыі распрацоўкі, таму, калі ласка, паведамляйце пра ўсе знойдзеныя памылкі.",
-    "High contrast mode" : "Рэжым высокай кантраснасці",
-    "Enable high contrast mode" : "Уключыць рэжым высокай кантраснасці",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Рэжым высокай кантраснасці каб палегчыць навігацыю. Гэта паменшыць візуальную якасць, але палепшыць зразумеласць.",
-    "Dyslexia font" : "Шрыфт для людзей з дыслексіяй",
-    "Enable dyslexia font" : "Выкарыстоўваць шрыфт для людзей з дыслексіяй",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — гэта бясплатны шрыфт, распрацаваны каб паменшыць колькасць частых памылак чытання, якія выкліканы дыслексіяй,",
-    "Accessibility" : "Спецыяльныя магчымасці",
-    "Accessibility options for nextcloud" : "Налады спецыяльных магчымасцяў для Nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Налады спецыяльных магчымасцяў, якія спрашчаюць карыстанне Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Універсальны доступ вельмі важны для нас. Мы прытрымліваемся стандартам і правяраем магчымасць выкарыстоўвання нашых сэрвісаў без мышы ці з выкарыстоўваннем дапаможных праграм, такіх, як экраны дыктар. Мы стараемся цалкам адпавядаць {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 на ўзроўні AA, а разам з рэжымам высокай кантраснасці на ўзроўні AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Калі вы знайшлі нейкую праблему, не саромейцеся напісаць у {issuetracker}наш трэкер памылак{linkend}. Таксама калі вы жадаеце прыняць удзел, можаце прыяднацца да {designteam}нашай каманды дызайнераў{linkend}!"
-},"pluralForm" :"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);"
-}
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Προσβασιμότητα",
    "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η  πρόσβαση  από όλους είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
@@ -11,7 +11,7 @@
    "Accessibility" : "Προσβασιμότητα",
    "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η  πρόσβαση  από όλους είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,13 +3,13 @@ OC.L10N.register(
    {
    "Dark theme" : "Tema oscuro",
    "Enable dark theme" : "Activar tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro para facilitar la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro para facilitar la navegación reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que por favor, comunique cualquier problema que encuentre.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Activar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para facilitar la navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
    "Dyslexia font" : "Tipo de letra para dislexia",
    "Enable dyslexia font" : "Activa tipo de letra para dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra libre diseñada para reducir algunos de los errores de lectura comunes causados por la dislexia.",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra/fuente libre diseñado para reducir algunos de los errores de lectura comunes causados por la dislexia.",
    "Accessibility" : "Accesibilidad",
    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ofrece múltiples opciones de accesibilidad para facilitarte el uso de Nextcloud",
@@ -1,13 +1,13 @@
 { "translations": {
    "Dark theme" : "Tema oscuro",
    "Enable dark theme" : "Activar tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro para facilitar la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro para facilitar la navegación reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que por favor, comunique cualquier problema que encuentre.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Activar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para facilitar la navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
    "Dyslexia font" : "Tipo de letra para dislexia",
    "Enable dyslexia font" : "Activa tipo de letra para dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra libre diseñada para reducir algunos de los errores de lectura comunes causados por la dislexia.",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra/fuente libre diseñado para reducir algunos de los errores de lectura comunes causados por la dislexia.",
    "Accessibility" : "Accesibilidad",
    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ofrece múltiples opciones de accesibilidad para facilitarte el uso de Nextcloud",
@@ -1,14 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilitar el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro facilita la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de contraste alto",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste facilita tu navegación. La calidad visual puede ser menor pero se incrementa la claridad.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente para personas con dislexia",
-    "Accessibility options for nextcloud" : "Opciones de acceso para nexcloud"
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,12 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilitar el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro facilita la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de contraste alto",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste facilita tu navegación. La calidad visual puede ser menor pero se incrementa la claridad.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente para personas con dislexia",
-    "Accessibility options for nextcloud" : "Opciones de acceso para nexcloud"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilitar el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro facilita la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de contraste alto",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste facilita tu navegación. La calidad visual puede ser menor pero se incrementa la claridad.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente para personas con dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra libre diseñada para reducir algunos de los errores de lectura comunes causados por la dislexia.",
-    "Accessibility" : "Accesibilidad",
-    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Provee múltiples opciones de accesibilidad para facilitar tu uso de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo sea utilizable inclusive sin ratón, y con software de asistencia como lectores de pantalla. Buscamos cumplir con las {guidelines}Guías de Accesibilidad de Contenido Web{linkend} 2.1 sobre nivel AA, incluso sobre nivel AAA para el tema de alto contraste.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentras cualquier problema, no dudes en reportarlo en {issuetracker}nuestra lista de errores{linkend}. Y si deseas involucrarte, ¡únete a {designteam}nuestro equipo de diseño{linkend}!"
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilitar el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tema oscuro facilita la navegación, reduciendo el brillo y la luminosidad. Aún se encuentra en desarrollo, así que, por favor, comunique cualquier problema que encuentre.",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de contraste alto",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste facilita tu navegación. La calidad visual puede ser menor pero se incrementa la claridad.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente para personas con dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra libre diseñada para reducir algunos de los errores de lectura comunes causados por la dislexia.",
-    "Accessibility" : "Accesibilidad",
-    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Provee múltiples opciones de accesibilidad para facilitar tu uso de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo sea utilizable inclusive sin ratón, y con software de asistencia como lectores de pantalla. Buscamos cumplir con las {guidelines}Guías de Accesibilidad de Contenido Web{linkend} 2.1 sobre nivel AA, incluso sobre nivel AAA para el tema de alto contraste.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentras cualquier problema, no dudes en reportarlo en {issuetracker}nuestra lista de errores{linkend}. Y si deseas involucrarte, ¡únete a {designteam}nuestro equipo de diseño{linkend}!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "accessibility",
    {
-    "Dark theme" : "Tema Oscuro",
+    "Dark theme" : "Tema oscuro",
    "Enable dark theme" : "Habilitar tema oscuro",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para ayudar a tus ojos al reducir el brillo y luminosidad en general. Todavía está bajo desarrollo, así que por favor reporta cualquier problema que pudieras encontrar.",
    "High contrast mode" : "Modo de alto contraste",
@@ -1,5 +1,5 @@
 { "translations": {
-    "Dark theme" : "Tema Oscuro",
+    "Dark theme" : "Tema oscuro",
    "Enable dark theme" : "Habilitar tema oscuro",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para ayudar a tus ojos al reducir el brillo y luminosidad en general. Todavía está bajo desarrollo, así que por favor reporta cualquier problema que pudieras encontrar.",
    "High contrast mode" : "Modo de alto contraste",
@@ -3,12 +3,10 @@ OC.L10N.register(
    {
    "Dark theme" : "Tume teema",
    "Enable dark theme" : "Luba tume teema",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tume teema vähedab koormust sinu silmadele, vähendades ekraani eredust. See funktsionaalsus on hetkel arendamisel, palun andke sellega seotud probleemidest meile teada.",
    "High contrast mode" : "Kõrge kontrastsusega režiim",
    "Enable high contrast mode" : "Lubage kõrge kontrastsusega režiim.",
    "Dyslexia font" : "Düsleksia font",
    "Enable dyslexia font" : "Luba düsleksia font",
-    "Accessibility" : "Ligipääsetavus",
-    "Accessibility options for nextcloud" : "Ligipääsetavuse valikud Nextcloudis"
+    "Accessibility" : "Ligipääsetavus"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,12 +1,10 @@
 { "translations": {
    "Dark theme" : "Tume teema",
    "Enable dark theme" : "Luba tume teema",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tume teema vähedab koormust sinu silmadele, vähendades ekraani eredust. See funktsionaalsus on hetkel arendamisel, palun andke sellega seotud probleemidest meile teada.",
    "High contrast mode" : "Kõrge kontrastsusega režiim",
    "Enable high contrast mode" : "Lubage kõrge kontrastsusega režiim.",
    "Dyslexia font" : "Düsleksia font",
    "Enable dyslexia font" : "Luba düsleksia font",
-    "Accessibility" : "Ligipääsetavus",
-    "Accessibility options for nextcloud" : "Ligipääsetavuse valikud Nextcloudis"
+    "Accessibility" : "Ligipääsetavus"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -6,14 +6,11 @@ OC.L10N.register(
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "یک زمینه تیره برای راحتی چشم‌های شما با کاهش روی‌هم‌رفته درخشندگی و روشنایی. این امکان هنوز در حال توسعه می‌باشد، بنابراین در صورت مشاهده هرگونه ایراد، آن را گزارش کنید.",
    "High contrast mode" : "حالت با کنتراست بالا",
    "Enable high contrast mode" : "فعالسازی حالت کنتراست بالا",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش، اما وضوح افزایش می‌یابد.",
-    "Dyslexia font" : "فونت خوانش‌پریشی یا دیسلکسیا",
-    "Enable dyslexia font" : "فونت خوانش‌پریشی فعال شود",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "اُپن‌دیسلکسیک یک فونت/طرح حروف رایگان است که برای کاهش برخی از خطاهای معمول در خواندن ناشی از خوانش‌پریشی طراحی شده‌است.",
-    "Accessibility" : "قابلیت دسترس‌پذیری",
-    "Accessibility options for nextcloud" : "گزینه‌های دسترس‌پذیری برای نکست‌کلود",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "گزینه‌های متعدد دسترس‌پذیری برای تسهیل کار شما در نکست‌کلود را فراهم می‌سازد.",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "دسترسی جهانی برای ما بسیار مهم است. ما از استانداردهای وب پیروی می‌کنیم و دقیت می‌کنیم تا همه چیز بدون موش‌واره و نرم‌افزارهای کمکی مانند صفحه‌خوان‌ها نیز قابل استفاده باشند. هدف ما این است که مطابق با دستورالعمل {guidelines}راهنماهای دسترس‌پذیری محتوا تحت وب{linkend} نسخه 2.1 در سطح AA، و حتی با زمینه کنتراست بالا در سطح AAA باشیم.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "اگر مشکلی پیدا کردید، از گزارش آنها در {issuetracker}در دنبال‌کننده مشکلات ما{linked} دریغ نکنید. و اگر می‌خواهید مشارکت داشته باشید، به {designteam}تیم طراحی ما{linkend} بپیوندید!"
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش می یابد اما وضوح افزایش می یابد.",
+    "Dyslexia font" : "فونت Dyslexia",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "اپن دیسلکسیک یک فونت و نمایه رایگان است که طراحی شده برای خواندن بعضی ایراد های دیسلکسیا",
+    "Accessibility" : "در دسترس بودن",
+    "Accessibility options for nextcloud" : "امکان در دسترس بودن برای نکس کلود",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "امکان دسترسی امکانات از چند مسیر برای کار کردن راحت تر شما با نکست کلود قرارداده شده است."
 },
 "nplurals=2; plural=(n > 1);");
@@ -4,14 +4,11 @@
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "یک زمینه تیره برای راحتی چشم‌های شما با کاهش روی‌هم‌رفته درخشندگی و روشنایی. این امکان هنوز در حال توسعه می‌باشد، بنابراین در صورت مشاهده هرگونه ایراد، آن را گزارش کنید.",
    "High contrast mode" : "حالت با کنتراست بالا",
    "Enable high contrast mode" : "فعالسازی حالت کنتراست بالا",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش، اما وضوح افزایش می‌یابد.",
-    "Dyslexia font" : "فونت خوانش‌پریشی یا دیسلکسیا",
-    "Enable dyslexia font" : "فونت خوانش‌پریشی فعال شود",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "اُپن‌دیسلکسیک یک فونت/طرح حروف رایگان است که برای کاهش برخی از خطاهای معمول در خواندن ناشی از خوانش‌پریشی طراحی شده‌است.",
-    "Accessibility" : "قابلیت دسترس‌پذیری",
-    "Accessibility options for nextcloud" : "گزینه‌های دسترس‌پذیری برای نکست‌کلود",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "گزینه‌های متعدد دسترس‌پذیری برای تسهیل کار شما در نکست‌کلود را فراهم می‌سازد.",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "دسترسی جهانی برای ما بسیار مهم است. ما از استانداردهای وب پیروی می‌کنیم و دقیت می‌کنیم تا همه چیز بدون موش‌واره و نرم‌افزارهای کمکی مانند صفحه‌خوان‌ها نیز قابل استفاده باشند. هدف ما این است که مطابق با دستورالعمل {guidelines}راهنماهای دسترس‌پذیری محتوا تحت وب{linkend} نسخه 2.1 در سطح AA، و حتی با زمینه کنتراست بالا در سطح AAA باشیم.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "اگر مشکلی پیدا کردید، از گزارش آنها در {issuetracker}در دنبال‌کننده مشکلات ما{linked} دریغ نکنید. و اگر می‌خواهید مشارکت داشته باشید، به {designteam}تیم طراحی ما{linkend} بپیوندید!"
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش می یابد اما وضوح افزایش می یابد.",
+    "Dyslexia font" : "فونت Dyslexia",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "اپن دیسلکسیک یک فونت و نمایه رایگان است که طراحی شده برای خواندن بعضی ایراد های دیسلکسیا",
+    "Accessibility" : "در دسترس بودن",
+    "Accessibility options for nextcloud" : "امکان در دسترس بودن برای نکس کلود",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "امکان دسترسی امکانات از چند مسیر برای کار کردن راحت تر شما با نکست کلود قرارداده شده است."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -6,7 +6,7 @@ OC.L10N.register(
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un thème sombre pour soulager vos yeux en réduisant la luminosité générale. Il est encore en cours de développement, veuillez donc nous signaler les problèmes que vous pourriez rencontrer.",
    "High contrast mode" : "Thème à contraste élevé",
    "Enable high contrast mode" : "Activer le thème à contraste élevé",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la lisibilité sera améliorée.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la clarté sera améliorée.",
    "Dyslexia font" : "Police pour dyslexiques",
    "Enable dyslexia font" : "Activer la police pour dyslexiques",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est une police de caractères libre conçue pour atténuer certaines des erreurs de lecture courantes causées par la dyslexie.",
@@ -4,7 +4,7 @@
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un thème sombre pour soulager vos yeux en réduisant la luminosité générale. Il est encore en cours de développement, veuillez donc nous signaler les problèmes que vous pourriez rencontrer.",
    "High contrast mode" : "Thème à contraste élevé",
    "Enable high contrast mode" : "Activer le thème à contraste élevé",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la lisibilité sera améliorée.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la clarté sera améliorée.",
    "Dyslexia font" : "Police pour dyslexiques",
    "Enable dyslexia font" : "Activer la police pour dyslexiques",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est une police de caractères libre conçue pour atténuer certaines des erreurs de lecture courantes causées par la dyslexie.",
@@ -6,14 +6,11 @@ OC.L10N.register(
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "समग्र चमक और चमक को कम करके अपनी आंखों को आराम देने के लिए एक अंधेरे विषय। यह अभी भी विकास के अधीन है, इसलिए कृपया कोई भी समस्या की रिपोर्ट करें।",
    "High contrast mode" : "उच्च व्यतिरेक मोड",
    "Enable high contrast mode" : "उच्च व्यतिरेक मोड सक्षम करें",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "आपके नेविगेशन को आसान बनाने के लिए एक उच्च कंट्रास्ट मोड। दृश्य गुणवत्ता कम हो जाएगी लेकिन स्पष्टता बढ़ जाएगी।",
    "Dyslexia font" : "डिस्लेक्सिया फ़ॉन्ट",
    "Enable dyslexia font" : "डिस्लेक्सिया फ़ॉन्ट सक्षम करें",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "ओपन डिस्लेक्सिया एक फ्री टाइपफेस / फॉन्ट है जिसे डिस्लेक्सिया के कारण पढ़ने वाली कुछ सामान्य त्रुटियों को कम करने के लिए डिज़ाइन किया गया है।",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic एक फ्री टाइपफेस / फॉन्ट है जिसे डिस्लेक्सिया के कारण पढ़ने वाली कुछ सामान्य त्रुटियों को कम करने के लिए डिज़ाइन किया गया है।",
    "Accessibility" : "सरल उपयोग",
    "Accessibility options for nextcloud" : "Nextcloud के लिए पहुंच विकल्प",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Nextcloud के अपने उपयोग को आसान बनाने के लिए कई पहुँच विकल्प प्रदान करता है",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "सार्वभौमिक पहुंच हमारे लिए बहुत महत्वपूर्ण है। हम वेब मानकों का पालन करते हैं और माउस के बिना भी सब कुछ प्रयोग करने योग्य बनाने के लिए जांच करते हैं, और सहायक सॉफ़्टवेयर जैसे स्क्रीनरीडर। हमारा लक्ष्य एए स्तर पर {दिशानिर्देश}वेब सामग्री एक्सेसिबिलिटी दिशानिर्देश{लिंकेंड} 2.1 का अनुपालन करना है, यहां तक कि एएए स्तर पर भी उच्च कंट्रास्ट थीम के साथ।",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "यदि आपको कोई समस्या मिलती है, तो उन्हें {issuetracker}हमारे समस्या ट्रैकर{linkend} पर रिपोर्ट करने में संकोच न करें। और अगर आप इसमें शामिल होना चाहते हैं, तो {designteam}हमारी डिज़ाइन टीम{linkend} में शामिल हों!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Nextcloud के अपने उपयोग को आसान बनाने के लिए कई पहुँच विकल्प प्रदान करता है"
 },
 "nplurals=2; plural=(n != 1);");
@@ -4,14 +4,11 @@
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "समग्र चमक और चमक को कम करके अपनी आंखों को आराम देने के लिए एक अंधेरे विषय। यह अभी भी विकास के अधीन है, इसलिए कृपया कोई भी समस्या की रिपोर्ट करें।",
    "High contrast mode" : "उच्च व्यतिरेक मोड",
    "Enable high contrast mode" : "उच्च व्यतिरेक मोड सक्षम करें",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "आपके नेविगेशन को आसान बनाने के लिए एक उच्च कंट्रास्ट मोड। दृश्य गुणवत्ता कम हो जाएगी लेकिन स्पष्टता बढ़ जाएगी।",
    "Dyslexia font" : "डिस्लेक्सिया फ़ॉन्ट",
    "Enable dyslexia font" : "डिस्लेक्सिया फ़ॉन्ट सक्षम करें",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "ओपन डिस्लेक्सिया एक फ्री टाइपफेस / फॉन्ट है जिसे डिस्लेक्सिया के कारण पढ़ने वाली कुछ सामान्य त्रुटियों को कम करने के लिए डिज़ाइन किया गया है।",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic एक फ्री टाइपफेस / फॉन्ट है जिसे डिस्लेक्सिया के कारण पढ़ने वाली कुछ सामान्य त्रुटियों को कम करने के लिए डिज़ाइन किया गया है।",
    "Accessibility" : "सरल उपयोग",
    "Accessibility options for nextcloud" : "Nextcloud के लिए पहुंच विकल्प",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Nextcloud के अपने उपयोग को आसान बनाने के लिए कई पहुँच विकल्प प्रदान करता है",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "सार्वभौमिक पहुंच हमारे लिए बहुत महत्वपूर्ण है। हम वेब मानकों का पालन करते हैं और माउस के बिना भी सब कुछ प्रयोग करने योग्य बनाने के लिए जांच करते हैं, और सहायक सॉफ़्टवेयर जैसे स्क्रीनरीडर। हमारा लक्ष्य एए स्तर पर {दिशानिर्देश}वेब सामग्री एक्सेसिबिलिटी दिशानिर्देश{लिंकेंड} 2.1 का अनुपालन करना है, यहां तक कि एएए स्तर पर भी उच्च कंट्रास्ट थीम के साथ।",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "यदि आपको कोई समस्या मिलती है, तो उन्हें {issuetracker}हमारे समस्या ट्रैकर{linkend} पर रिपोर्ट करने में संकोच न करें। और अगर आप इसमें शामिल होना चाहते हैं, तो {designteam}हमारी डिज़ाइन टीम{linkend} में शामिल हों!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Nextcloud के अपने उपयोग को आसान बनाने के लिए कई पहुँच विकल्प प्रदान करता है"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -10,7 +10,7 @@ OC.L10N.register(
    "Dyslexia font" : "Font disleksia",
    "Enable dyslexia font" : "Aktifkan fon disleksia",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic adalah typeface/font gratis yang didesain untuk mengurangi kesalahan membaca oleh penderita disleksia",
-    "Accessibility" : "Aksesbilitas",
+    "Accessibility" : "aksesbilitas",
    "Accessibility options for nextcloud" : "Opsi aksesibilitas untuk nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Menyediakan beberapa opsi aksesibilitas untuk memudahkan Anda menggunakan Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Akses universal sangat penting bagi kami. Kami mengikuti standar web dan memeriksa agar semua dapat digunakan, bahkan saat tanpa menggunakan tetikus, dan lainnya seperti perangkat lunak pembantu pembaca layar. Kami bertujuan untuk mematuhi {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 pada tingkat AA, dengan tema kontras tinggi bahkan pada tingkat AAA.",
@@ -8,7 +8,7 @@
    "Dyslexia font" : "Font disleksia",
    "Enable dyslexia font" : "Aktifkan fon disleksia",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic adalah typeface/font gratis yang didesain untuk mengurangi kesalahan membaca oleh penderita disleksia",
-    "Accessibility" : "Aksesbilitas",
+    "Accessibility" : "aksesbilitas",
    "Accessibility options for nextcloud" : "Opsi aksesibilitas untuk nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Menyediakan beberapa opsi aksesibilitas untuk memudahkan Anda menggunakan Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Akses universal sangat penting bagi kami. Kami mengikuti standar web dan memeriksa agar semua dapat digunakan, bahkan saat tanpa menggunakan tetikus, dan lainnya seperti perangkat lunak pembantu pembaca layar. Kami bertujuan untuk mematuhi {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 pada tingkat AA, dengan tema kontras tinggi bahkan pada tingkat AAA.",
@@ -1,18 +1,16 @@
 OC.L10N.register(
    "accessibility",
    {
-    "Dark theme" : "Tumšais motīvs",
+    "Dark theme" : "Tumšs motīvs",
    "Enable dark theme" : "Iespējot tumšo motīvu",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumšais motīvs atslogo Tavas acis samazinot kopējo atspīdumu un spilgtumu. Tas joprojām atrodas izstrādes režīmā, tādēļ dod ziņu par jebkurām atrastajām problēmām.",
    "High contrast mode" : "Augsta kontrasta režīms",
    "Enable high contrast mode" : "Iespējot augsta kontrasta režīmu",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Augsta kontrasta režīms atvieglo navigāciju. Vizuālā kvalitāte tiks samazināta, bet skaidrība paaugstināsies.",
    "Dyslexia font" : "Dislektisks fonts",
-    "Enable dyslexia font" : "Iespējot disleksijas fontu",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ir bezmaksas fonts, kas veidots, lai mazinātu tipiskākos lasīšanas traucējumus, ko izraisa disleksija.",
    "Accessibility" : "Pieejamība",
    "Accessibility options for nextcloud" : "nextcloud Pieejamības uzstādījumi",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Piedāvā vairākus pieejamības uzstādījumus, kas atvieglo Nextcloud lietošanu.",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universāla pieejamība mums ir ļoti svarīga. Mēs sekojam tīmekļa standartiem un panākam ka visu var lietot arī bez datorpeles, un palīgprogrammatūras, kā ekrāna lasītāja. Mēs mērķējam uz būšanu piekāpīgi ar {vadlīnijām}Tīmekļa satura pieejamības vadlīnijas{piesaistīts} 2.1 uz AA līmeņa, ar augsta kontrasta režīmu pat AAA līmenī"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Piedāvā vairākus pieejamības uzstādījumus, kas atvieglo Nextcloud lietošanu."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
@@ -1,16 +1,14 @@
 { "translations": {
-    "Dark theme" : "Tumšais motīvs",
+    "Dark theme" : "Tumšs motīvs",
    "Enable dark theme" : "Iespējot tumšo motīvu",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumšais motīvs atslogo Tavas acis samazinot kopējo atspīdumu un spilgtumu. Tas joprojām atrodas izstrādes režīmā, tādēļ dod ziņu par jebkurām atrastajām problēmām.",
    "High contrast mode" : "Augsta kontrasta režīms",
    "Enable high contrast mode" : "Iespējot augsta kontrasta režīmu",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Augsta kontrasta režīms atvieglo navigāciju. Vizuālā kvalitāte tiks samazināta, bet skaidrība paaugstināsies.",
    "Dyslexia font" : "Dislektisks fonts",
-    "Enable dyslexia font" : "Iespējot disleksijas fontu",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ir bezmaksas fonts, kas veidots, lai mazinātu tipiskākos lasīšanas traucējumus, ko izraisa disleksija.",
    "Accessibility" : "Pieejamība",
    "Accessibility options for nextcloud" : "nextcloud Pieejamības uzstādījumi",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Piedāvā vairākus pieejamības uzstādījumus, kas atvieglo Nextcloud lietošanu.",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universāla pieejamība mums ir ļoti svarīga. Mēs sekojam tīmekļa standartiem un panākam ka visu var lietot arī bez datorpeles, un palīgprogrammatūras, kā ekrāna lasītāja. Mēs mērķējam uz būšanu piekāpīgi ar {vadlīnijām}Tīmekļa satura pieejamības vadlīnijas{piesaistīts} 2.1 uz AA līmeņa, ar augsta kontrasta režīmu pat AAA līmenī"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Piedāvā vairākus pieejamības uzstādījumus, kas atvieglo Nextcloud lietošanu."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
@@ -1,14 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "गडद थीम",
-    "Enable dark theme" : "गडद थीम सुरु करा",
-    "High contrast mode" : "अतीविरोधाभासी पद्धत",
-    "Enable high contrast mode" : "अतीविरोधाभासी पद्धत सुरु करा",
-    "Dyslexia font" : "डिस्लेक्सिया फॉन्ट",
-    "Enable dyslexia font" : "डिस्लेक्सिया फॉन्ट सुरु करा",
-    "Accessibility" : "सुलभता",
-    "Accessibility options for nextcloud" : "नेक्सटक्लाउडसाठी सुलभता पर्याय",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "तुमच्या नेक्सटक्लाउडच्या सहज वापराकरीता विविध सुलभता पर्याय देते"
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,12 +0,0 @@
-{ "translations": {
-    "Dark theme" : "गडद थीम",
-    "Enable dark theme" : "गडद थीम सुरु करा",
-    "High contrast mode" : "अतीविरोधाभासी पद्धत",
-    "Enable high contrast mode" : "अतीविरोधाभासी पद्धत सुरु करा",
-    "Dyslexia font" : "डिस्लेक्सिया फॉन्ट",
-    "Enable dyslexia font" : "डिस्लेक्सिया फॉन्ट सुरु करा",
-    "Accessibility" : "सुलभता",
-    "Accessibility options for nextcloud" : "नेक्सटक्लाउडसाठी सुलभता पर्याय",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "तुमच्या नेक्सटक्लाउडच्या सहज वापराकरीता विविध सुलभता पर्याय देते"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -4,7 +4,7 @@ OC.L10N.register(
    "Dark theme" : "Mørkt tema",
    "Enable dark theme" : "Aktiver mørkt tema",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Et mørkt tema for å lette på øynene ved å redusere lysstyrken. Den er fortsatt under utvikling, vennligst rapporter feilene som du finner.",
-    "High contrast mode" : "Høykontrastmodus",
+    "High contrast mode" : "Høykontrast-modus",
    "Enable high contrast mode" : "Aktiver høy kontrast",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "En høykontrast modus for å få en lettere navigasjon. Den visuelle kvaliteten vil bli reusert men klarheten vil bli økt.",
    "Dyslexia font" : "Dysleksi skrifttype",
@@ -2,7 +2,7 @@
    "Dark theme" : "Mørkt tema",
    "Enable dark theme" : "Aktiver mørkt tema",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Et mørkt tema for å lette på øynene ved å redusere lysstyrken. Den er fortsatt under utvikling, vennligst rapporter feilene som du finner.",
-    "High contrast mode" : "Høykontrastmodus",
+    "High contrast mode" : "Høykontrast-modus",
    "Enable high contrast mode" : "Aktiver høy kontrast",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "En høykontrast modus for å få en lettere navigasjon. Den visuelle kvaliteten vil bli reusert men klarheten vil bli økt.",
    "Dyslexia font" : "Dysleksi skrifttype",
@@ -3,17 +3,12 @@ OC.L10N.register(
    {
    "Dark theme" : "Tèma fosc",
    "Enable dark theme" : "Activar lo tèma fosc",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tèma escur per solaçar vòstres uèlhs en redusissent la luminositat globala. Es encara en òbra, doncas mercés de senhalar quina que siá avaria que vesètz.",
    "High contrast mode" : "Mòde fòrt contraste",
    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
    "Dyslexia font" : "Poliça dyslexia",
    "Enable dyslexia font" : "Activar la poliça dyslexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es una poliça d'escritura concebuda per resòlver las errors de lectura comuna causadas per la dislexia.",
    "Accessibility" : "Accessibilitat",
-    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornís mantuna opcion d’accessibilitat per facilitar vòstra utilizacion de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Un accès universal es plan important per nosautres. Seguissèm los estandards web e verificam de rendre tot utilizable tanben sens mirga e amb de logicial d’assiténcia coma los lectors d’ecran. Avèm per tòca de complir las {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 al nivèl AA, amb un tèma de contraste naut amai al nivèl AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se trobatz una avaria, esitetz pas de nos las senhalar sul {issuetracker}traçador de bugs{linkend}. E se volètz vos implicar, venètz rejónher {designteam}nòstra equipa de concepcion{linkend} !"
+    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud"
 },
 "nplurals=2; plural=(n > 1);");
@@ -1,17 +1,12 @@
 { "translations": {
    "Dark theme" : "Tèma fosc",
    "Enable dark theme" : "Activar lo tèma fosc",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tèma escur per solaçar vòstres uèlhs en redusissent la luminositat globala. Es encara en òbra, doncas mercés de senhalar quina que siá avaria que vesètz.",
    "High contrast mode" : "Mòde fòrt contraste",
    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
    "Dyslexia font" : "Poliça dyslexia",
    "Enable dyslexia font" : "Activar la poliça dyslexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es una poliça d'escritura concebuda per resòlver las errors de lectura comuna causadas per la dislexia.",
    "Accessibility" : "Accessibilitat",
-    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornís mantuna opcion d’accessibilitat per facilitar vòstra utilizacion de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Un accès universal es plan important per nosautres. Seguissèm los estandards web e verificam de rendre tot utilizable tanben sens mirga e amb de logicial d’assiténcia coma los lectors d’ecran. Avèm per tòca de complir las {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 al nivèl AA, amb un tèma de contraste naut amai al nivèl AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se trobatz una avaria, esitetz pas de nos las senhalar sul {issuetracker}traçador de bugs{linkend}. E se volètz vos implicar, venètz rejónher {designteam}nòstra equipa de concepcion{linkend} !"
+    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -7,13 +7,13 @@ OC.L10N.register(
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Ativar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Um modo de alto contraste para facilitar sua navegação. A qualidade visual será reduzida, mas a clareza será aumentada.",
-    "Dyslexia font" : "Tipo de letra \"Dyslexia\"",
-    "Enable dyslexia font" : "Ativar tipo de letra \"Dyslexia\"",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic é um tipo de letra gratuito, desenhado para mitigar alguns dos problemas causados pela dislexia.",
+    "Dyslexia font" : "Fonte de texto \"Dyslexia\"",
+    "Enable dyslexia font" : "Ativar fonte de dislexia",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic é uma fonte de texto gratuita, desenhada para mitigar alguns dos problemas causados pela dislexia.",
    "Accessibility" : "Acessibilidade",
    "Accessibility options for nextcloud" : "Opções de acessibilidade para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornece várias opções de acessibilidade para facilitar a sua utilização do Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem rato e software auxiliar, como leitores de ecrã. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
@@ -5,13 +5,13 @@
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Ativar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Um modo de alto contraste para facilitar sua navegação. A qualidade visual será reduzida, mas a clareza será aumentada.",
-    "Dyslexia font" : "Tipo de letra \"Dyslexia\"",
-    "Enable dyslexia font" : "Ativar tipo de letra \"Dyslexia\"",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic é um tipo de letra gratuito, desenhado para mitigar alguns dos problemas causados pela dislexia.",
+    "Dyslexia font" : "Fonte de texto \"Dyslexia\"",
+    "Enable dyslexia font" : "Ativar fonte de dislexia",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic é uma fonte de texto gratuita, desenhada para mitigar alguns dos problemas causados pela dislexia.",
    "Accessibility" : "Acessibilidade",
    "Accessibility options for nextcloud" : "Opções de acessibilidade para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornece várias opções de acessibilidade para facilitar a sua utilização do Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem rato e software auxiliar, como leitores de ecrã. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -12,8 +12,8 @@ OC.L10N.register(
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — бесплатный шрифт, который смягчает некоторые распространённые ошибки чтения, вызываемые дислексией.",
    "Accessibility" : "Доступность",
    "Accessibility options for nextcloud" : "Настройки доступности для Nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Предлагает дополнительные настройки для упрощения использования Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Доступная среда очень важна для нас. При разработке мы следуем веб-стандартам, контролируя возможность пользования всем сервисом без помощи мыши и с использованием вспомогательных программ, например, выполняющих чтение с экрана. Мы стремимся к выполнению рекомендаций {guidelines}Руководства доступности Веб-Контента{linkend} 2.1 на уровне АА, а при использовании режима высокой контрастности  — даже на уровне ААА.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "При обнаружении ошибок, не стесняйтесь сообщать о них {issuetracker}на наш форум{linkend}. Если Вы заинтересованы в продвижении проекта присоединяйтесь к {designteam}нашей команде дизайнеров{linkend}!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Предоставляет несколько вариантов доступности, чтобы облегчить использование Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Nextcloud разрабатывается с возможностью его использования всеми. При разработке учитываются веб-стандарты и выполняются проверки возможности использования без мыши, а также при помощи специальных программ, например, выполняющих чтение с экрана. Nextcloud стремиться к выполнению рекомендаций Руководства доступности веб-контента версии 2.1 на уровне АА, а при использованием режима высокой контрастности  — даже на уровне ААА.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Сообщайте об обнаруженных проблемах в  {issuetracker} системе отслеживания ошибок{linkend}. Присоединяйтесь к {designteam}команде дизайнеров{linkend} чтобы участвовать в разработке."
 },
 "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);");
@@ -10,8 +10,8 @@
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — бесплатный шрифт, который смягчает некоторые распространённые ошибки чтения, вызываемые дислексией.",
    "Accessibility" : "Доступность",
    "Accessibility options for nextcloud" : "Настройки доступности для Nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Предлагает дополнительные настройки для упрощения использования Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Доступная среда очень важна для нас. При разработке мы следуем веб-стандартам, контролируя возможность пользования всем сервисом без помощи мыши и с использованием вспомогательных программ, например, выполняющих чтение с экрана. Мы стремимся к выполнению рекомендаций {guidelines}Руководства доступности Веб-Контента{linkend} 2.1 на уровне АА, а при использовании режима высокой контрастности  — даже на уровне ААА.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "При обнаружении ошибок, не стесняйтесь сообщать о них {issuetracker}на наш форум{linkend}. Если Вы заинтересованы в продвижении проекта присоединяйтесь к {designteam}нашей команде дизайнеров{linkend}!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Предоставляет несколько вариантов доступности, чтобы облегчить использование Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Nextcloud разрабатывается с возможностью его использования всеми. При разработке учитываются веб-стандарты и выполняются проверки возможности использования без мыши, а также при помощи специальных программ, например, выполняющих чтение с экрана. Nextcloud стремиться к выполнению рекомендаций Руководства доступности веб-контента версии 2.1 на уровне АА, а при использованием режима высокой контрастности  — даже на уровне ААА.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Сообщайте об обнаруженных проблемах в  {issuetracker} системе отслеживания ошибок{linkend}. Присоединяйтесь к {designteam}команде дизайнеров{linkend} чтобы участвовать в разработке."
 },"pluralForm" :"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);"
 }
@@ -7,8 +7,8 @@ OC.L10N.register(
    "High contrast mode" : "Läge med hög kontrast",
    "Enable high contrast mode" : "Aktivera läge med hög kontrast",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ett läge med hög kontrast för att underlätta din navigering. Visuell kvalitet kommer att minska men tydligheten ökar.",
-    "Dyslexia font" : "Teckensnitt för dyslektiker",
-    "Enable dyslexia font" : "Aktivera teckensnitt för dyslektiker",
+    "Dyslexia font" : "Dyslexi-teckensnitt",
+    "Enable dyslexia font" : "Aktivera dyslexi-teckensnitt",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt teckensnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
    "Accessibility" : "Tillgänglighet",
    "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
@@ -5,8 +5,8 @@
    "High contrast mode" : "Läge med hög kontrast",
    "Enable high contrast mode" : "Aktivera läge med hög kontrast",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ett läge med hög kontrast för att underlätta din navigering. Visuell kvalitet kommer att minska men tydligheten ökar.",
-    "Dyslexia font" : "Teckensnitt för dyslektiker",
-    "Enable dyslexia font" : "Aktivera teckensnitt för dyslektiker",
+    "Dyslexia font" : "Dyslexi-teckensnitt",
+    "Enable dyslexia font" : "Aktivera dyslexi-teckensnitt",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt teckensnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
    "Accessibility" : "Tillgänglighet",
    "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
@@ -2,11 +2,11 @@ OC.L10N.register(
    "accessibility",
    {
    "Dark theme" : "Темна тема",
-    "Enable dark theme" : "Увімкнути темну тему",
+    "Enable dark theme" : "Дозволити темну тему",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Темна тема зменшує навантаження на очі завдяки зменшенню освітлення та яскравості. Вона ще в процесі розробки, тож повідомляйте, будь-ласка, про будь-які проблеми, з якими ви можете зіткнутись.",
    "High contrast mode" : "Висококонтрастний режим",
    "Enable high contrast mode" : "Увімкнути висококонтрастний режим",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Висококонтрастний режим спрощує Вашу навігацію. Візуальна якість буде знижена, але чіткість підвищиться..",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Контрастна тема спрощує Вашу навігацію. Знижена візуальна якість, проте підвищена ясність і зрозумілість.",
    "Dyslexia font" : "Шрифт для людей, які страждають від дислексії",
    "Enable dyslexia font" : "Увімкнути шрифт для людей, які страждають від дислексії",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic - це вільно доступний шрифт, що було розроблено для уникнення деяких загальних помилок, що спричинені дизлексією.",
@@ -1,10 +1,10 @@
 { "translations": {
    "Dark theme" : "Темна тема",
-    "Enable dark theme" : "Увімкнути темну тему",
+    "Enable dark theme" : "Дозволити темну тему",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Темна тема зменшує навантаження на очі завдяки зменшенню освітлення та яскравості. Вона ще в процесі розробки, тож повідомляйте, будь-ласка, про будь-які проблеми, з якими ви можете зіткнутись.",
    "High contrast mode" : "Висококонтрастний режим",
    "Enable high contrast mode" : "Увімкнути висококонтрастний режим",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Висококонтрастний режим спрощує Вашу навігацію. Візуальна якість буде знижена, але чіткість підвищиться..",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Контрастна тема спрощує Вашу навігацію. Знижена візуальна якість, проте підвищена ясність і зрозумілість.",
    "Dyslexia font" : "Шрифт для людей, які страждають від дислексії",
    "Enable dyslexia font" : "Увімкнути шрифт для людей, які страждають від дислексії",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic - це вільно доступний шрифт, що було розроблено для уникнення деяких загальних помилок, що спричинені дизлексією.",
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Khả năng tiếp cận",
    "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Cung cấp nhiều tùy chọn truy cập để dễ dàng sử dụng Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Sự truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với {guidelines}Nguyên Tắc Truy Cập Cho Nội Dung Mạng{linkend} 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với Nguyên Tắc Truy Cập Cho Nội Dung Mạng 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên hệ thống theo dõi vấn đề của chúng tôi."
 },
 "nplurals=1; plural=0;");
@@ -11,7 +11,7 @@
    "Accessibility" : "Khả năng tiếp cận",
    "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Cung cấp nhiều tùy chọn truy cập để dễ dàng sử dụng Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Sự truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với {guidelines}Nguyên Tắc Truy Cập Cho Nội Dung Mạng{linkend} 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với Nguyên Tắc Truy Cập Cho Nội Dung Mạng 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên hệ thống theo dõi vấn đề của chúng tôi."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dark theme" : "深色主题",
    "Enable dark theme" : "启用深色主题",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "深色主题通过降低色彩的明度和亮度来使您的眼睛保持舒适。这个功能还在完善中，所以请您随时向我们反馈所发现的问题。",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "一款通过降低整体亮度来使您的眼睛放松的深色主题。该主题目前还在开发中，如发现问题请您及时向我们反馈。",
    "High contrast mode" : "高对比度模式",
    "Enable high contrast mode" : "启用高对比度模式",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "使用高对比度模式。图像质量会下降，但清晰度会提升。",
@@ -11,8 +11,8 @@ OC.L10N.register(
    "Enable dyslexia font" : "启用阅读障碍字体",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic是一款免费的字样/字体，这款字体的设计目的是缓解由阅读障碍引起的一些常见阅读错误。",
    "Accessibility" : "辅助功能",
-    "Accessibility options for nextcloud" : "Nextcloud 辅助功能选项",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能选项以便于您使用Nextcloud",
+    "Accessibility options for nextcloud" : "Nextcloud的辅助功能",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能以便于您使用Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "通用访问对我们非常重要。 我们遵循网络标准，并进行检查以确保所有内容都可以在没有鼠标或辅助软件（例如屏幕阅读器）的情况下使用。 我们的目标是遵守 {guidelines} Web 内容可访问性指南 {linkend} 2.1 能达到 AA 级别，具有高对比度主题甚至能达到 AAA 级别。",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您发现任何问题，请随时在 {issuetracker} 我们的问题跟踪器 {linkend} 上报告。 如果您想参与其中，请加入 {designteam} 我们的设计团队 {linkend}！"
 },
@@ -1,7 +1,7 @@
 { "translations": {
    "Dark theme" : "深色主题",
    "Enable dark theme" : "启用深色主题",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "深色主题通过降低色彩的明度和亮度来使您的眼睛保持舒适。这个功能还在完善中，所以请您随时向我们反馈所发现的问题。",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "一款通过降低整体亮度来使您的眼睛放松的深色主题。该主题目前还在开发中，如发现问题请您及时向我们反馈。",
    "High contrast mode" : "高对比度模式",
    "Enable high contrast mode" : "启用高对比度模式",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "使用高对比度模式。图像质量会下降，但清晰度会提升。",
@@ -9,8 +9,8 @@
    "Enable dyslexia font" : "启用阅读障碍字体",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic是一款免费的字样/字体，这款字体的设计目的是缓解由阅读障碍引起的一些常见阅读错误。",
    "Accessibility" : "辅助功能",
-    "Accessibility options for nextcloud" : "Nextcloud 辅助功能选项",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能选项以便于您使用Nextcloud",
+    "Accessibility options for nextcloud" : "Nextcloud的辅助功能",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能以便于您使用Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "通用访问对我们非常重要。 我们遵循网络标准，并进行检查以确保所有内容都可以在没有鼠标或辅助软件（例如屏幕阅读器）的情况下使用。 我们的目标是遵守 {guidelines} Web 内容可访问性指南 {linkend} 2.1 能达到 AA 级别，具有高对比度主题甚至能达到 AAA 级别。",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您发现任何问题，请随时在 {issuetracker} 我们的问题跟踪器 {linkend} 上报告。 如果您想参与其中，请加入 {designteam} 我们的设计团队 {linkend}！"
 },"pluralForm" :"nplurals=1; plural=0;"
@@ -14,6 +14,6 @@ OC.L10N.register(
    "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到{guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linkend}！"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linked}！"
 },
 "nplurals=1; plural=0;");
@@ -12,6 +12,6 @@
    "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到{guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linkend}！"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linked}！"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -248,7 +248,7 @@ class AccessibilityController extends Controller {
 			return $this->injectedVariables;
 		}
 		$variables = '';
-		foreach ($this->defaults->getScssVariables(!$this->isDarkThemeEnabled()) as $key => $value) {
+		foreach ($this->defaults->getScssVariables() as $key => $value) {
 			$variables .= '$' . $key . ': ' . $value . ';';
 		}

@@ -267,18 +267,4 @@ class AccessibilityController extends Controller {
 		}
 		return $variables;
 	}
-
-	/**
-	 * Return true if the dark theme is enabled for the current user
-	 */
-	private function isDarkThemeEnabled(): bool {
-		if (!$this->userSession->isLoggedIn()) {
-			return false;
-		}
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return false;
-		}
-		return $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false) === 'dark';
-	}
 }
@@ -29,6 +29,8 @@ use OCA\Accessibility\AccessibilityProvider;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
 use OCP\Util;
@@ -44,6 +46,12 @@ class Personal implements ISettings {
 	/** @var IUserSession */
 	private $userSession;

+	/** @var IL10N */
+	private $l;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	/** @var AccessibilityProvider */
 	private $accessibilityProvider;

@@ -53,11 +61,15 @@ class Personal implements ISettings {
 	public function __construct(string $appName,
 								IConfig $config,
 								IUserSession $userSession,
+								IL10N $l,
+								IURLGenerator $urlGenerator,
 								AccessibilityProvider $accessibilityProvider,
 								IInitialState $initialStateService) {
 		$this->appName = $appName;
 		$this->config = $config;
 		$this->userSession = $userSession;
+		$this->l = $l;
+		$this->urlGenerator = $urlGenerator;
 		$this->accessibilityProvider = $accessibilityProvider;
 		$this->initialStateService = $initialStateService;
 	}
@@ -24,27 +24,23 @@
 </template>

 <script>
-import { generateUrl, generateOcsUrl } from '@nextcloud/router'
-import { loadState } from '@nextcloud/initial-state'
-import axios from '@nextcloud/axios'
 import ItemPreview from './components/ItemPreview'
-
-const availableConfig = loadState('accessibility', 'available-config')
-const userConfig = loadState('accessibility', 'user-config')
+import axios from '@nextcloud/axios'
+import { generateUrl, generateOcsUrl } from '@nextcloud/router'

 export default {
 	name: 'Accessibility',
-	components: {
-		ItemPreview,
+	components: { ItemPreview },
+	props: {
+		availableConfig: {
+			type: Object,
+			required: true,
+		},
+		userConfig: {
+			type: Object,
+			required: true,
+		},
 	},
-
-	data() {
-		return {
-			availableConfig,
-			userConfig,
-		}
-	},
-
 	computed: {
 		themes() {
 			return this.availableConfig.themes
@@ -125,7 +121,7 @@ export default {
 			try {
 				const isDelete = id === ''
 				await axios({
-					url: generateOcsUrl('apps/accessibility/api/v1/config/{type}', { type }),
+					url: generateOcsUrl('apps/accessibility/api/v1/config', 2) + type,
 					method: isDelete ? 'DELETE' : 'PUT',
 					data: {
 						value: id,
@@ -21,12 +21,21 @@
 */

 import Vue from 'vue'
+import { loadState } from '@nextcloud/initial-state'
 import App from './Accessibility.vue'

 // bind to window
 Vue.prototype.OC = OC
 Vue.prototype.t = t

+const availableConfig = loadState('accessibility', 'available-config')
+const userConfig = loadState('accessibility', 'user-config')
+
 const View = Vue.extend(App)
-const accessibility = new View()
+const accessibility = new View({
+	propsData: {
+		availableConfig,
+		userConfig,
+	},
+})
 accessibility.$mount('#accessibility')
@@ -5,7 +5,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.13.0</version>
+	<version>1.11.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="23" max-version="23"/>
+		<nextcloud min-version="22" max-version="22"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
@@ -42,75 +42,30 @@ namespace Composer\Autoload;
 */
 class ClassLoader
 {
-    /** @var ?string */
    private $vendorDir;

    // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
    private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
    private $fallbackDirsPsr4 = array();

    // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
    private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
    private $fallbackDirsPsr0 = array();

-    /** @var bool */
    private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
    private $classMap = array();
-
-    /** @var bool */
    private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
    private $missingClasses = array();
-
-    /** @var ?string */
    private $apcuPrefix;

-    /**
-     * @var self[]
-     */
    private static $registeredLoaders = array();

-    /**
-     * @param ?string $vendorDir
-     */
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
    }

-    /**
-     * @return string[]
-     */
    public function getPrefixes()
    {
        if (!empty($this->prefixesPsr0)) {
@@ -120,47 +75,28 @@ class ClassLoader
        return array();
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
    public function getPrefixesPsr4()
    {
        return $this->prefixDirsPsr4;
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
    public function getFallbackDirs()
    {
        return $this->fallbackDirsPsr0;
    }

-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
    public function getFallbackDirsPsr4()
    {
        return $this->fallbackDirsPsr4;
    }

-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
    public function getClassMap()
    {
        return $this->classMap;
    }

    /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
+     * @param array $classMap Class to filename map
     */
    public function addClassMap(array $classMap)
    {
@@ -175,11 +111,9 @@ class ClassLoader
     * Registers a set of PSR-0 directories for a given prefix, either
     * appending or prepending to the ones previously set for this prefix.
     *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
     */
    public function add($prefix, $paths, $prepend = false)
    {
@@ -222,13 +156,11 @@ class ClassLoader
     * Registers a set of PSR-4 directories for a given namespace, either
     * appending or prepending to the ones previously set for this namespace.
     *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
     *
     * @throws \InvalidArgumentException
-     *
-     * @return void
     */
    public function addPsr4($prefix, $paths, $prepend = false)
    {
@@ -272,10 +204,8 @@ class ClassLoader
     * Registers a set of PSR-0 directories for a given prefix,
     * replacing any others previously set for this prefix.
     *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
     */
    public function set($prefix, $paths)
    {
@@ -290,12 +220,10 @@ class ClassLoader
     * Registers a set of PSR-4 directories for a given namespace,
     * replacing any others previously set for this namespace.
     *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
     *
     * @throws \InvalidArgumentException
-     *
-     * @return void
     */
    public function setPsr4($prefix, $paths)
    {
@@ -315,8 +243,6 @@ class ClassLoader
     * Turns on searching the include path for class files.
     *
     * @param bool $useIncludePath
-     *
-     * @return void
     */
    public function setUseIncludePath($useIncludePath)
    {
@@ -339,8 +265,6 @@ class ClassLoader
     * that have not been registered with the class map.
     *
     * @param bool $classMapAuthoritative
-     *
-     * @return void
     */
    public function setClassMapAuthoritative($classMapAuthoritative)
    {
@@ -361,8 +285,6 @@ class ClassLoader
     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
     *
     * @param string|null $apcuPrefix
-     *
-     * @return void
     */
    public function setApcuPrefix($apcuPrefix)
    {
@@ -383,8 +305,6 @@ class ClassLoader
     * Registers this instance as an autoloader.
     *
     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
     */
    public function register($prepend = false)
    {
@@ -404,8 +324,6 @@ class ClassLoader

    /**
     * Unregisters this instance as an autoloader.
-     *
-     * @return void
     */
    public function unregister()
    {
@@ -485,11 +403,6 @@ class ClassLoader
        return self::$registeredLoaders;
    }

-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
    private function findFileWithExtension($class, $ext)
    {
        // PSR-4 lookup
@@ -561,10 +474,6 @@ class ClassLoader
 * Scope isolated include.
 *
 * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
 */
 function includeFile($file)
 {
@@ -20,27 +20,12 @@ use Composer\Semver\VersionParser;
 *
 * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
 *
- * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
+ * To require it's presence, you can require `composer-runtime-api ^2.0`
 */
 class InstalledVersions
 {
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
-     */
    private static $installed;
-
-    /**
-     * @var bool|null
-     */
    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
-     */
    private static $installedByVendor = array();

    /**
@@ -243,7 +228,7 @@ class InstalledVersions

    /**
     * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}
     */
    public static function getRootPackage()
    {
@@ -257,7 +242,7 @@ class InstalledVersions
     *
     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
     * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}
     */
    public static function getRawData()
    {
@@ -280,7 +265,7 @@ class InstalledVersions
     * Returns the raw data of all installed.php which are currently loaded for custom implementations
     *
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
     */
    public static function getAllRawData()
    {
@@ -303,7 +288,7 @@ class InstalledVersions
     * @param  array[] $data A vendor/composer/installed.php data set
     * @return void
     *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data
     */
    public static function reload($data)
    {
@@ -313,7 +298,7 @@ class InstalledVersions

    /**
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
     */
    private static function getInstalled()
    {
@@ -2,7 +2,7 @@

 // autoload_classmap.php @generated by Composer

-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;

 return array(
@@ -19,8 +19,6 @@ return array(
    'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir . '/../lib/Actions/UserManagement.php',
    'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
    'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\AdminAudit\\AuditLogger' => $baseDir . '/../lib/AuditLogger.php',
    'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
-    'OCA\\AdminAudit\\IAuditLogger' => $baseDir . '/../lib/IAuditLogger.php',
    'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php',
 );
--- a/Show More
+++ b/Show More