feat(scan): add log for failed files scan

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Merge pull request #52851 from nextcloud/ci/noid/update-phpunit10
2025-05-20 16:14:12 +02:00 · 2025-05-15 09:30:33 +02:00 · 2025-05-15 08:48:13 +02:00 · 2025-05-15 08:29:33 +02:00 · 2025-05-15 08:26:15 +02:00 · 2025-05-15 08:25:01 +02:00
1854 changed files with 28311 additions and 15822 deletions
@@ -16,16 +16,14 @@
 *.ts                                          @nextcloud/server-frontend

 # dependency management
-package.json                                  @nextcloud/server-dependabot
+package.json                                  @nextcloud/server-dependabot @nextcloud/server-frontend
 package-lock.json                             @nextcloud/server-dependabot
-
-# Compiled assets only - no owner set to not spam on automated dependency updates
-/dist                                         
+/dist                                         @nextcloud/server-dependabot

 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
-/apps/cloud_federation_api/appinfo/info.xml   @mejo-
-/apps/comments/appinfo/info.xml               @edward-ly @Pytal
+/apps/cloud_federation_api/appinfo/info.xml   @nfebe @mejo-
+/apps/comments/appinfo/info.xml               @edward-ly @sorbaugh
 /apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
 /apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
 /apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
@@ -36,21 +34,21 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @nfebe
-/apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
+/apps/federation/appinfo/info.xml             @nfebe @sorbaugh
+/apps/files/appinfo/info.xml                  @skjnldsv @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
-/apps/files_reminders/appinfo/info.xml        @Pytal
+/apps/files_reminders/appinfo/info.xml        @skjnldsv @sorbaugh
 /apps/files_sharing/appinfo/info.xml          @skjnldsv @come-nc
-/apps/files_trashbin/appinfo/info.xml         @Pytal @icewind1991
+/apps/files_trashbin/appinfo/info.xml         @icewind1991 @sorbaugh
 /apps/files_versions/appinfo/info.xml         @artonge @icewind1991
 /apps/oauth2/appinfo/info.xml                 @julien-nc @ChristophWurst
 /apps/provisioning_api/appinfo/info.xml       @provokateurin @nickvergessen
-/apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
-/apps/sharebymail/appinfo/info.xml            @Altahrim
+/apps/settings/appinfo/info.xml               @JuliaKirschenheuter @sorbaugh
+/apps/sharebymail/appinfo/info.xml            @Altahrim @skjnldsv
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
 /apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
-/apps/updatenotification/appinfo/info.xml     @Pytal @JuliaKirschenheuter
+/apps/updatenotification/appinfo/info.xml     @JuliaKirschenheuter @sorbaugh
 /apps/user_ldap/appinfo/info.xml              @come-nc @blizzz
 /apps/user_status/appinfo/info.xml            @Antreesy @nickvergessen
 /apps/weather_status/appinfo/info.xml         @julien-nc @juliusknorr
@@ -80,8 +78,8 @@ package-lock.json                             @nextcloud/server-dependabot
 /core/routes.php                    @Altahrim @nextcloud/server-backend

 # OpenAPI
-openapi*.json                       @provokateurin
-ResponseDefinitions.php             @provokateurin
+openapi*.json                       @provokateurin @nextcloud/server-backend
+ResponseDefinitions.php             @provokateurin @nextcloud/server-backend

 # Talk team
 /lib/private/Comments               @nickvergessen @nextcloud/talk-backend
@@ -1,230 +1,8 @@
 # SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
+
 version: 2
 updates:
-# Linting and coding style
- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# cs-fixer
- package-ecosystem: composer
-  directory: "/vendor-bin/cs-fixer"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:10"
-    timezone: Europe/Copenhagen
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# openapi-extractor
- package-ecosystem: composer
-  directory: "/vendor-bin/openapi-extractor"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:20"
-    timezone: Europe/Brussels
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-    - "provokateurin"
-
-# psalm
- package-ecosystem: composer
-  directory: "/vendor-bin/psalm"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:30"
-    timezone: Europe/Madrid
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# phpunit
- package-ecosystem: composer
-  directory: "/vendor-bin/phpunit"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:40"
-    timezone: Europe/Madrid
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Main master npm
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
-# Testing master npm
- package-ecosystem: npm
-  directory: "/build"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-# Testing master composer
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable29
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable30
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable31
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable29
-  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", "version-update:semver-patch"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable30
-  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", "version-update:semver-patch"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable31
-  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", "version-update:semver-patch"]
-
 # GitHub Actions
 - package-ecosystem: "github-actions"
  directory: "/"
@@ -238,6 +16,127 @@ updates:
  labels:
    - "3. to review"
    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"

+# Main composer (linting, testing, openapi)
+- package-ecosystem: composer
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+    - "/vendor-bin/rector"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+
+# Main master npm frontend dependencies
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+
+# Latest stable release
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable31
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:30"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+# Latest stable branch
+# frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable31
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:30"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+
+# Older stable releases
+
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable30
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+# frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable30
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
@@ -36,6 +36,7 @@ jobs:
              - 'composer.json'
              - 'composer.lock'
              - '**.php'
+              - build/autoloaderchecker.sh

  autoloader:
    runs-on: ubuntu-latest
@@ -57,7 +58,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -66,9 +67,6 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - name: Set up dependencies
-        run: composer i
-
      - name: Check auto loaders
        run: bash ./build/autoloaderchecker.sh

@@ -89,7 +87,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -110,6 +108,9 @@ jobs:
      - name: Check that all and only expected files are included
        run: php ./build/files-checker.php

+      - name: Check that all shipped apps are linted by psalm
+        run: sh ./build/psalm-checker.sh
+
  summary:
    permissions:
      contents: none
@@ -120,7 +120,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
          cache: npm
@@ -64,7 +64,7 @@ jobs:
          fallbackNpm: "^10"

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -94,11 +94,56 @@ jobs:
      matrix:
        # Run multiple copies of the current job in parallel
        # Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
-        containers: ["component", '0', '1', '2', '3', '4', '5', '6', '7']
+        containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7']
        # Hack as strategy.job-total includes the component and GitHub does not allow math expressions
        # Always align this number with the total of e2e runners (max. index + 1)
        total-containers: [8]

+    services:
+      mysql:
+        # Only start mysql if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}}
+        ports:
+          - '3306/tcp'
+        env:
+          MYSQL_ROOT_PASSWORD: rootpassword
+          MYSQL_USER: oc_autotest
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: oc_autotest
+        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
+
+      mariadb:
+        # Only start mariadb if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}}
+        ports:
+          - '3306/tcp'
+        env:
+          MYSQL_ROOT_PASSWORD: rootpassword
+          MYSQL_USER: oc_autotest
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: oc_autotest
+        options: --health-cmd="mariadb-admin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+
+      postgres:
+        # Only start postgres if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}}
+        ports:
+          - '5432/tcp'
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: rootpassword
+          POSTGRES_DB: nextcloud
+        options: --mount type=tmpfs,destination=/var/lib/postgresql/data --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
+
+      oracle:
+        # Only start oracle if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}}
+        ports:
+          - '1521'
+        env:
+          ORACLE_PASSWORD: oracle
+        options:  --health-cmd healthcheck.sh --health-interval 20s --health-timeout 10s --health-retries 10
+
    name: runner ${{ matrix.containers }}

    steps:
@@ -110,7 +155,7 @@ jobs:
          path: ./

      - name: Set up node ${{ needs.init.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.init.outputs.nodeVersion }}

@@ -141,6 +186,7 @@ jobs:
          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          SPLIT: ${{ matrix.total-containers }}
          SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}
+          SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}

      - name: Upload snapshots and videos
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -68,7 +68,7 @@ jobs:
          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/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -96,15 +96,22 @@ jobs:
      - name: PHPUnit
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/FtpTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-ftp

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-ftp
+
      - name: ftpd logs
        if: always()
        run: |
@@ -65,7 +65,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -94,15 +94,22 @@ jobs:
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/Amazons3Test.php \
          apps/files_external/tests/Storage/VersionedAmazonS3Test.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-s3
+
      - name: S3 logs
        if: always()
        run: |
@@ -140,7 +147,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -161,15 +168,22 @@ jobs:
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/Amazons3Test.php \
          apps/files_external/tests/Storage/VersionedAmazonS3Test.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-s3
+
      - name: S3 logs
        if: always()
        run: |
@@ -64,7 +64,7 @@ jobs:
          if [[ '${{ matrix.sftpd }}' == 'openssh' ]]; then docker run -p 2222:22 --name sftp -d -v /tmp/sftp:/home/test atmoz/sftp 'test:test:::data'; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -85,15 +85,22 @@ jobs:
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/SftpTest.php \
          apps/files_external/tests/Storage/SFTP_KeyTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-sftp

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-sftp
+
      - name: sftpd logs
        if: always()
        run: |
@@ -83,6 +83,18 @@ jobs:
        run: |
          apps/files_external/tests/sso-setup/test-sso-smb.sh ${{ env.DC_IP }}

+      - name: Show logs DC
+        if: always()
+        run: |
+          docker logs dc
+          echo "------------"
+          docker exec dc cat /var/log/samba/log.samba
+
+      - name: Show logs Apache
+        if: always()
+        run: |
+          docker logs apache
+
      - name: Show logs
        if: always()
        run: |
@@ -61,7 +61,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -90,15 +90,22 @@ jobs:
      - name: PHPUnit
        run: composer run test:files_external -- --verbose \
          apps/files_external/tests/Storage/SmbTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.1.1
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-smb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-smb
+
  files-external-smb-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-smb]
@@ -61,7 +61,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -87,15 +87,22 @@ jobs:
      - name: PHPUnit
        run: composer run test:files_external -- --verbose \
          apps/files_external/tests/Storage/WebdavTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.1.1
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-webdav

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-webdav
+
  files-external-webdav-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-webdav-apache]
@@ -54,7 +54,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -75,15 +75,22 @@ jobs:

      - name: PHPUnit
        run: composer run test:files_external -- \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-files-external-generic

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-files-external-generic
+
  files-external-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-generic ]
@@ -56,7 +56,7 @@ jobs:
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+          uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -55,7 +55,7 @@ jobs:
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+          uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -70,7 +70,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -114,7 +114,7 @@ jobs:
          ref: ${{ matrix.activity-versions }}

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -63,7 +63,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v3
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v3
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -51,7 +51,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up php8.1
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: 8.1
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -56,7 +56,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          coverage: none
@@ -35,7 +35,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -83,7 +83,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -99,10 +99,14 @@ jobs:
        run: npm run test:coverage --if-present

      - name: Collect coverage
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.3.1
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./coverage/lcov.info

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+
  jsunit:
    runs-on: ubuntu-latest
    needs: [versions, changes]
@@ -117,7 +121,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -145,7 +149,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -63,7 +63,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v3
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v3
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -45,7 +45,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -54,7 +54,7 @@ jobs:

      - name: Fix npm audit
        id: npm-audit
-        uses: nextcloud-libraries/npm-audit-action@2a60bd2e79cc77f2cc4d9a3fe40f1a69896f3a87 # v0.1.0
+        uses: nextcloud-libraries/npm-audit-action@1b1728b2b4a7a78d69de65608efcf4db0e3e42d0 # v0.2.0

      - name: Run npm ci and npm run build
        if: steps.checkout.outcome == 'success'
@@ -74,7 +74,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -101,15 +101,21 @@ jobs:
          OBJECT_STORE: azure
          OBJECT_STORE_KEY: nextcloud
          OBJECT_STORE_SECRET: bmV4dGNsb3Vk
-        run: composer run test -- --group PRIMARY-azure ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-azure

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-azure
+
      - name: Azurite logs
        if: always()
        run: |
@@ -75,7 +75,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -107,15 +107,21 @@ jobs:
          OBJECT_STORE: s3
          OBJECT_STORE_KEY: nextcloud
          OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
-        run: composer run test -- --group PRIMARY-s3 ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-s3
+
      - name: S3 logs
        if: always()
        run: |
@@ -72,7 +72,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -97,15 +97,21 @@ jobs:
        env:
          OBJECT_STORE: swift
          OBJECT_STORE_SECRET: veryfast
-        run: composer run test -- --group PRIMARY-swift ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-swift

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-swift
+
      - name: Swift logs
        if: always()
        run: |
@@ -29,7 +29,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: '8.1'
          extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
@@ -35,7 +35,7 @@ jobs:
          ref: ${{ github.event.pull_request.base.ref }}

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -42,7 +42,7 @@ jobs:
          sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
@@ -91,7 +91,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -120,15 +120,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-mariadb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-mariadb
+
  summary:
    permissions:
      contents: none
@@ -76,7 +76,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -97,15 +97,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache,Memcached ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group Memcache,Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.xml
          flags: phpunit-memcached

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-memcached
+
      - name: Print logs
        if: always()
        run: |
@@ -125,7 +125,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -155,15 +155,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-mysql

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-mysql
+
      - name: Print logs
        if: always()
        run: |
@@ -91,7 +91,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -120,15 +120,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-mysql

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-mysql
+
      - name: Print logs
        if: always()
        run: |
@@ -79,7 +79,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -103,15 +103,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB,SLOWDB ${{ matrix.coverage && ' --coverage-clover ./clover.nodb.xml' || '' }}
+        run: composer run test -- --exclude-group DB,SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}

      - name: Upload nodb code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.nodb.xml
          flags: phpunit-nodb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-nodb
+
      - name: Print logs
        if: always()
        run: |
@@ -75,7 +75,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -103,7 +103,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -125,15 +125,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-oci

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-oci
+
      - name: Run repair steps
        run: |
          ./occ maintenance:repair --include-expensive
@@ -91,7 +91,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -115,15 +115,21 @@ jobs:
          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

      - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-postgres

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-postgres
+
      - name: Run repair steps
        run: |
          ./occ maintenance:repair --include-expensive
@@ -76,7 +76,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -101,15 +101,21 @@ jobs:
        run: ./occ app:list && echo "======= System config =======" && ./occ config:list system

      - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
        with:
          files: ./clover.db.xml
          flags: phpunit-sqlite

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        with:
+          flags: phpunit-sqlite
+
      - name: Print logs
        if: always()
        run: |
@@ -30,7 +30,7 @@ jobs:
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: '8.1'
          extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -60,7 +60,7 @@ jobs:
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -94,7 +94,7 @@ jobs:
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -124,7 +124,7 @@ jobs:
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -131,6 +131,10 @@ Files: build/stubs/pcntl.php build/stubs/zip.php
 Copyright: 2022 JetBrains
 License: Apache-2.0

+Files: build/stubs/excimer.php
+Copyright: 2019 Wikimedia Foundation
+License: Apache-2.0
+
 Files: core/js/mimetypelist.js core/js/core.json themes/example/core/img
 Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-only
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-before_commands:
-  - 'git submodule update --init --recursive'
-
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-
-checks:
-    php:
-        excluded_dependencies:
-            - etsy/phan
-
-filter:
-    excluded_paths:
-        - '3rdparty/*'
-        - 'apps/*/3rdparty/*'
-        - 'apps/*/vendor/*'
-        - 'l10n/*'
-        - 'core/l10n/*'
-        - 'apps/*/l10n/*'
-        - 'apps/*/tests/*'
-        - 'lib/l10n/*'
-        - 'core/vendor/*'
-        - 'core/js/tests/lib/*.js'
-        - 'core/js/tests/specs/*.js'
-        - 'core/js/jquery-showpassword.js'
-        - 'core/js/jquery-tipsy.js'
-        - 'core/js/placeholders.js'
-        - 'settings/l10n/*'
-        - 'tests/*'
-        - 'build/*'
-        - 'lib/composer/*'
-
-imports:
-    - javascript
-    - php
@@ -67,7 +67,7 @@
 - Bernhard Posselt <dev@bernhard-posselt.com>
 - Bernhard Reiter <ockham@raz.or.at>
 - Bill McGonigle <bill-github.com@bfccomputing.com>
- - Birk Borkason <daniel.niccoli@gmail.com>
+ - Daniel Niccoli <daniel.niccoli@gmail.com>
 - Bjoern Schiessle <bjoern@schiessle.org>
 - Björn Schießle <bjoern@schiessle.org>
 - Bjørn Forsman <bjorn.forsman@gmail.com>
@@ -5,7 +5,6 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![codecov](https://codecov.io/gh/nextcloud/server/branch/master/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)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Aodit / Kerzhlevr"
+},
+"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Auditing / Logging" : "Aodit / Kerzhlevr"
+},"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
+}
@@ -2,6 +2,6 @@ OC.L10N.register(
    "admin_audit",
    {
    "Auditing / Logging" : "Auditēšana / Žurnalizēšana",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
@@ -1,5 +1,5 @@
 { "translations": {
    "Auditing / Logging" : "Auditēšana / Žurnalizēšana",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
@@ -2,6 +2,6 @@ OC.L10N.register(
    "admin_audit",
    {
    "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,5 +1,5 @@
 { "translations": {
    "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -10,7 +10,6 @@ namespace OCA\AdminAudit\Actions;
 use OC\Files\Node\NonExistingFile;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
-use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
@@ -26,9 +25,6 @@ use Psr\Log\LoggerInterface;
 * @package OCA\AdminAudit\Actions
 */
 class Files extends Action {
-
-	private array $renamedNodes = [];
-
 	/**
 	 * Logs file read actions
 	 */
@@ -52,31 +48,16 @@ class Files extends Action {
 		);
 	}

-	/**
-	 * Logs rename actions of files
-	 */
-	public function beforeRename(BeforeNodeRenamedEvent $event): void {
-		try {
-			$source = $event->getSource();
-			$this->renamedNodes[$source->getId()] = $source;
-		} catch (InvalidPathException|NotFoundException $e) {
-			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file rename: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
-			);
-			return;
-		}
-	}
-
 	/**
 	 * Logs rename actions of files
 	 */
 	public function afterRename(NodeRenamedEvent $event): void {
 		try {
 			$target = $event->getTarget();
-			$originalSource = $this->renamedNodes[$target->getId()];
+			$source = $event->getSource();
 			$params = [
 				'newid' => $target->getId(),
-				'oldpath' => $originalSource->getPath(),
+				'oldpath' => $source->getPath(),
 				'newpath' => $target->getPath(),
 			];
 		} catch (InvalidPathException|NotFoundException $e) {
@@ -8,16 +8,6 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;

 class Versions extends Action {
-	public function rollback(array $params): void {
-		$this->log('Version "%s" of "%s" was restored.',
-			[
-				'version' => $params['revision'],
-				'path' => $params['path']
-			],
-			['version', 'path']
-		);
-	}
-
 	public function delete(array $params): void {
 		$this->log('Version "%s" was deleted.',
 			['path' => $params['path']],
@@ -27,6 +27,7 @@ use OCA\AdminAudit\Listener\GroupManagementEventListener;
 use OCA\AdminAudit\Listener\SecurityEventListener;
 use OCA\AdminAudit\Listener\SharingEventListener;
 use OCA\AdminAudit\Listener\UserManagementEventListener;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCP\App\Events\AppDisableEvent;
 use OCP\App\Events\AppEnableEvent;
 use OCP\App\Events\AppUpdateEvent;
@@ -41,7 +42,6 @@ use OCP\Console\ConsoleEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
-use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
@@ -110,6 +110,7 @@ class Application extends App implements IBootstrap {

 		// File events
 		$context->registerEventListener(BeforePreviewFetchedEvent::class, FileEventListener::class);
+		$context->registerEventListener(VersionRestoredEvent::class, FileEventListener::class);

 		// Security events
 		$context->registerEventListener(TwoFactorProviderChallengePassed::class, SecurityEventListener::class);
@@ -168,13 +169,6 @@ class Application extends App implements IBootstrap {
 	private function fileHooks(IAuditLogger $logger, IEventDispatcher $eventDispatcher): void {
 		$fileActions = new Files($logger);

-		$eventDispatcher->addListener(
-			BeforeNodeRenamedEvent::class,
-			function (BeforeNodeRenamedEvent $event) use ($fileActions): void {
-				$fileActions->beforeRename($event);
-			}
-		);
-
 		$eventDispatcher->addListener(
 			NodeRenamedEvent::class,
 			function (NodeRenamedEvent $event) use ($fileActions): void {
@@ -220,7 +214,6 @@ class Application extends App implements IBootstrap {

 	private function versionsHooks(IAuditLogger $logger): void {
 		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
 		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Listener;

 use OCA\AdminAudit\Actions\Action;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\InvalidPathException;
@@ -19,12 +20,14 @@ use OCP\Server;
 use Psr\Log\LoggerInterface;

 /**
- * @template-implements IEventListener<BeforePreviewFetchedEvent>
+ * @template-implements IEventListener<BeforePreviewFetchedEvent|VersionRestoredEvent>
 */
 class FileEventListener extends Action implements IEventListener {
 	public function handle(Event $event): void {
 		if ($event instanceof BeforePreviewFetchedEvent) {
 			$this->beforePreviewFetched($event);
+		} elseif ($event instanceof VersionRestoredEvent) {
+			$this->versionRestored($event);
 		}
 	}

@@ -54,4 +57,18 @@ class FileEventListener extends Action implements IEventListener {
 			return;
 		}
 	}
+
+	/**
+	 * Logs when a version is restored
+	 */
+	private function versionRestored(VersionRestoredEvent $event): void {
+		$version = $event->getVersion();
+		$this->log('Version "%s" of "%s" was restored.',
+			[
+				'version' => $version->getRevisionId(),
+				'path' => $version->getVersionPath()
+			],
+			['version', 'path']
+		);
+	}
 }
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
+    "Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
+},
+"nplurals=1; plural=0;");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
+    "Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
@@ -12,13 +12,14 @@ use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
 use NCU\Security\Signature\Exceptions\SignatoryException;
 use OC\OCM\OCMSignatoryManager;
 use OCP\Capabilities\ICapability;
+use OCP\Capabilities\IInitialStateExcludedCapability;
 use OCP\IAppConfig;
 use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
 use OCP\OCM\IOCMProvider;
 use Psr\Log\LoggerInterface;

-class Capabilities implements ICapability {
+class Capabilities implements ICapability, IInitialStateExcludedCapability {
 	public const API_VERSION = '1.1'; // informative, real version.

 	public function __construct(
@@ -54,15 +55,13 @@ class Capabilities implements ICapability {
 	 */
 	public function getCapabilities() {
 		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+		$pos = strrpos($url, '/');
+		if ($pos === false) {
+			throw new OCMArgumentException('generated route should contain a slash character');
+		}

 		$this->provider->setEnabled(true);
 		$this->provider->setApiVersion(self::API_VERSION);
-
-		$pos = strrpos($url, '/');
-		if ($pos === false) {
-			throw new OCMArgumentException('generated route should contains a slash character');
-		}
-
 		$this->provider->setEndPoint(substr($url, 0, $pos));

 		$resource = $this->provider->createNewResourceType();
@@ -87,6 +86,6 @@ class Capabilities implements ICapability {
 			$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
 		}

-		return ['ocm' => json_decode(json_encode($this->provider->jsonSerialize()), true)];
+		return ['ocm' => $this->provider->jsonSerialize()];
 	}
 }
@@ -6,6 +6,7 @@
 namespace OCA\CloudFederationAPI;

 use OCP\Federation\ICloudFederationProviderManager;
+use Psr\Log\LoggerInterface;

 /**
 * Class config
@@ -18,6 +19,7 @@ class Config {

 	public function __construct(
 		private ICloudFederationProviderManager $cloudFederationProviderManager,
+		private LoggerInterface $logger,
 	) {
 	}

@@ -32,6 +34,7 @@ class Config {
 			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
 			return $provider->getSupportedShareTypes();
 		} catch (\Exception $e) {
+			$this->logger->error('Failed to create federation provider', ['exception' => $e]);
 			return [];
 		}
 	}
@@ -452,7 +452,7 @@ class RequestHandlerController extends Controller {
 	 */
 	private function getHostFromFederationId(string $entry): string {
 		if (!str_contains($entry, '@')) {
-			throw new IncomingRequestException('entry ' . $entry . ' does not contains @');
+			throw new IncomingRequestException('entry ' . $entry . ' does not contain @');
 		}
 		$rightPart = substr($entry, strrpos($entry, '@') + 1);

@@ -10,7 +10,7 @@ OC.L10N.register(
    "{author} commented on {file}" : "{author} a commenté sur {file}",
    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
    "Files" : "Fichiers",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné sur « {file} », dans un commentaire par un compte qui depuis a été supprimé",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vous a mentionné dans un commentaire sur « {file} »",
    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
    "Edit comment" : "Modifier le commentaire",
@@ -8,7 +8,7 @@
    "{author} commented on {file}" : "{author} a commenté sur {file}",
    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
    "Files" : "Fichiers",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné sur « {file} », dans un commentaire par un compte qui depuis a été supprimé",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vous a mentionné dans un commentaire sur « {file} »",
    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
    "Edit comment" : "Modifier le commentaire",
@@ -11,7 +11,7 @@ OC.L10N.register(
    "<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
    "Files" : "Arquivos",
    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Você foi mencionado em \"{file}\", em um comentário de uma conta que já foi excluída",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário em \"{file}\"",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário sobre \"{file}\"",
    "Files app plugin to add comments to files" : "Complemento do aplicativo Files para adicionar comentários",
    "Edit comment" : "Editar comentário",
    "Delete comment" : "Excluir comentário",
@@ -9,7 +9,7 @@
    "<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
    "Files" : "Arquivos",
    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Você foi mencionado em \"{file}\", em um comentário de uma conta que já foi excluída",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário em \"{file}\"",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário sobre \"{file}\"",
    "Files app plugin to add comments to files" : "Complemento do aplicativo Files para adicionar comentários",
    "Edit comment" : "Editar comentário",
    "Delete comment" : "Excluir comentário",
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
 * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -20,30 +23,17 @@ use OCP\Files\Node;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share\IShareHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class ListenerTest extends TestCase {
-
-	/** @var Listener */
-	protected $listener;
-
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $activityManager;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	protected $session;
-
-	/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appManager;
-
-	/** @var IMountProviderCollection|\PHPUnit\Framework\MockObject\MockObject */
-	protected $mountProviderCollection;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	protected $rootFolder;
-
-	/** @var IShareHelper|\PHPUnit\Framework\MockObject\MockObject */
-	protected $shareHelper;
+	protected IManager&MockObject $activityManager;
+	protected IUserSession&MockObject $session;
+	protected IAppManager&MockObject $appManager;
+	protected IMountProviderCollection&MockObject $mountProviderCollection;
+	protected IRootFolder&MockObject $rootFolder;
+	protected IShareHelper&MockObject $shareHelper;
+	protected Listener $listener;

 	protected function setUp(): void {
 		parent::setUp();
@@ -76,7 +66,7 @@ class ListenerTest extends TestCase {
 			->method('getObjectType')
 			->willReturn('files');

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
+		/** @var CommentsEvent|MockObject $event */
 		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->any())
 			->method('getComment')
@@ -85,13 +75,13 @@ class ListenerTest extends TestCase {
 			->method('getEvent')
 			->willReturn(CommentsEvent::EVENT_ADD);

-		/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $ownerUser */
+		/** @var IUser|MockObject $ownerUser */
 		$ownerUser = $this->createMock(IUser::class);
 		$ownerUser->expects($this->any())
 			->method('getUID')
 			->willReturn('937393');

-		/** @var \PHPUnit\Framework\MockObject\MockObject $mount */
+		/** @var MockObject $mount */
 		$mount = $this->createMock(ICachedMountFileInfo::class);
 		$mount->expects($this->any())
 			->method('getUser')
@@ -133,7 +123,7 @@ class ListenerTest extends TestCase {
 			->method('getUser')
 			->willReturn($ownerUser);

-		/** @var \PHPUnit\Framework\MockObject\MockObject $activity */
+		/** @var MockObject $activity */
 		$activity = $this->createMock(IEvent::class);
 		$activity->expects($this->exactly(count($al['users'])))
 			->method('setAffectedUser');
@@ -1,5 +1,7 @@
 <?php

+declare(strict_types=1);
+
 /**
 * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,7 +9,12 @@
 */
 namespace OCA\Comments\Tests\Unit\AppInfo;

+use OCA\Comments\Activity\Filter;
+use OCA\Comments\Activity\Listener;
+use OCA\Comments\Activity\Provider;
+use OCA\Comments\Activity\Setting;
 use OCA\Comments\AppInfo\Application;
+use OCA\Comments\Controller\NotificationsController;
 use OCA\Comments\Notification\Notifier;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -38,12 +45,12 @@ class ApplicationTest extends TestCase {
 		$c = $app->getContainer();

 		$services = [
-			'OCA\Comments\Controller\NotificationsController',
-			'OCA\Comments\Activity\Filter',
-			'OCA\Comments\Activity\Listener',
-			'OCA\Comments\Activity\Provider',
-			'OCA\Comments\Activity\Setting',
-			'OCA\Comments\Notification\Listener',
+			NotificationsController::class,
+			Filter::class,
+			Listener::class,
+			Provider::class,
+			Setting::class,
+			\OCA\Comments\Notification\Listener::class,
 			Notifier::class,
 		];

@@ -8,13 +8,12 @@ namespace OCA\Comments\Tests\Unit\Collaboration;
 use OCA\Comments\Collaboration\CommentersSorter;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class CommentersSorterTest extends TestCase {
-	/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $commentsManager;
-	/** @var CommentersSorter */
-	protected $sorter;
+	protected ICommentsManager&MockObject $commentsManager;
+	protected CommentersSorter $sorter;

 	protected function setUp(): void {
 		parent::setUp();
@@ -55,7 +54,7 @@ class CommentersSorterTest extends TestCase {
 		$this->assertEquals($data['expected'], $workArray);
 	}

-	public function sortDataProvider() {
+	public static function sortDataProvider(): array {
 		return [[
 			[
 				#1 – sort properly and otherwise keep existing order
@@ -1,5 +1,7 @@
 <?php

+declare(strict_types=1);
+
 /**
 * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -22,26 +24,16 @@ use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
 use OCP\Notification\INotification;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class NotificationsTest extends TestCase {
-	/** @var NotificationsController */
-	protected $notificationsController;
-
-	/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $commentsManager;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	protected $rootFolder;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	protected $session;
-
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $notificationManager;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	protected $urlGenerator;
+	protected ICommentsManager&MockObject $commentsManager;
+	protected IRootFolder&MockObject $rootFolder;
+	protected IUserSession&MockObject $session;
+	protected IManager&MockObject $notificationManager;
+	protected IURLGenerator&MockObject $urlGenerator;
+	protected NotificationsController $notificationsController;

 	protected function setUp(): void {
 		parent::setUp();
@@ -81,10 +73,6 @@ class NotificationsTest extends TestCase {

 		$this->urlGenerator->expects($this->exactly(2))
 			->method('linkToRoute')
-			->withConsecutive(
-				['comments.Notifications.view', ['id' => '42']],
-				['core.login.showLoginForm', ['redirect_url' => 'link-to-comment']]
-			)
 			->willReturnMap([
 				['comments.Notifications.view', ['id' => '42'], 'link-to-comment'],
 				['core.login.showLoginForm', ['redirect_url' => 'link-to-comment'], 'link-to-login'],
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
 * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,43 +13,32 @@ use OCA\Comments\Listener\CommentsEventListener;
 use OCA\Comments\Notification\Listener as NotificationListener;
 use OCP\Comments\CommentsEvent;
 use OCP\Comments\IComment;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class EventHandlerTest extends TestCase {
-	/** @var CommentsEventListener */
-	protected $eventHandler;
-
-	/** @var ActivityListener|\PHPUnit\Framework\MockObject\MockObject */
-	protected $activityListener;
-
-	/** @var NotificationListener|\PHPUnit\Framework\MockObject\MockObject */
-	protected $notificationListener;
+	protected ActivityListener&MockObject $activityListener;
+	protected NotificationListener&MockObject $notificationListener;
+	protected CommentsEventListener $eventHandler;

 	protected function setUp(): void {
 		parent::setUp();

-		$this->activityListener = $this->getMockBuilder(ActivityListener::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->notificationListener = $this->getMockBuilder(NotificationListener::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->activityListener = $this->createMock(ActivityListener::class);
+		$this->notificationListener = $this->createMock(NotificationListener::class);

 		$this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
 	}

 	public function testNotFiles(): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->once())
 			->method('getObjectType')
 			->willReturn('smiles');

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->once())
 			->method('getComment')
 			->willReturn($comment);
@@ -56,7 +48,7 @@ class EventHandlerTest extends TestCase {
 		$this->eventHandler->handle($event);
 	}

-	public function handledProvider() {
+	public static function handledProvider(): array {
 		return [
 			[CommentsEvent::EVENT_DELETE],
 			[CommentsEvent::EVENT_UPDATE],
@@ -67,19 +59,16 @@ class EventHandlerTest extends TestCase {

 	/**
 	 * @dataProvider handledProvider
-	 * @param string $eventType
 	 */
-	public function testHandled($eventType): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+	public function testHandled(string $eventType): void {
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->once())
 			->method('getObjectType')
 			->willReturn('files');

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->atLeastOnce())
 			->method('getComment')
 			->willReturn($comment);
@@ -14,25 +14,19 @@ use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
 use OCP\Notification\INotification;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class ListenerTest extends TestCase {
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $notificationManager;
-
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $userManager;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	protected $urlGenerator;
-
-	/** @var Listener */
-	protected $listener;
+	protected IManager&MockObject $notificationManager;
+	protected IUserManager&MockObject $userManager;
+	protected IURLGenerator&MockObject $urlGenerator;
+	protected Listener $listener;

 	protected function setUp(): void {
 		parent::setUp();

-		$this->notificationManager = $this->createMock(\OCP\Notification\IManager::class);
+		$this->notificationManager = $this->createMock(IManager::class);
 		$this->userManager = $this->createMock(IUserManager::class);

 		$this->listener = new Listener(
@@ -41,7 +35,7 @@ class ListenerTest extends TestCase {
 		);
 	}

-	public function eventProvider() {
+	public static function eventProvider(): array {
 		return [
 			[CommentsEvent::EVENT_ADD, 'notify'],
 			[CommentsEvent::EVENT_UPDATE, 'notify'],
@@ -56,8 +50,8 @@ class ListenerTest extends TestCase {
 	 * @param string $notificationMethod
 	 */
 	public function testEvaluate($eventType, $notificationMethod): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->willReturn('files');
@@ -78,10 +72,8 @@ class ListenerTest extends TestCase {
 			->method('getId')
 			->willReturn('1234');

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->once())
 			->method('getComment')
 			->willReturn($comment);
@@ -89,8 +81,8 @@ class ListenerTest extends TestCase {
 			->method(('getEvent'))
 			->willReturn($eventType);

-		/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
-		$notification = $this->getMockBuilder(INotification::class)->getMock();
+		/** @var INotification|MockObject $notification */
+		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->any())
 			->method($this->anything())
 			->willReturn($notification);
@@ -106,26 +98,24 @@ class ListenerTest extends TestCase {

 		$this->userManager->expects($this->exactly(6))
 			->method('userExists')
-			->withConsecutive(
-				['foobar'],
-				['barfoo'],
-				['foo@bar.com'],
-				['bar@foo.org@foobar.io'],
-				['23452-4333-54353-2342'],
-				['yolo']
-			)
-			->willReturn(true);
+			->willReturnMap([
+				['foobar', true],
+				['barfoo', true],
+				['foo@bar.com', true],
+				['bar@foo.org@foobar.io', true],
+				['23452-4333-54353-2342', true],
+				['yolo', true]
+			]);

 		$this->listener->evaluate($event);
 	}

 	/**
 	 * @dataProvider eventProvider
-	 * @param string $eventType
 	 */
-	public function testEvaluateNoMentions($eventType): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+	public function testEvaluateNoMentions(string $eventType): void {
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->willReturn('files');
@@ -136,10 +126,8 @@ class ListenerTest extends TestCase {
 			->method('getMentions')
 			->willReturn([]);

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->once())
 			->method('getComment')
 			->willReturn($comment);
@@ -161,8 +149,8 @@ class ListenerTest extends TestCase {
 	}

 	public function testEvaluateUserDoesNotExist(): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->willReturn('files');
@@ -176,10 +164,8 @@ class ListenerTest extends TestCase {
 			->method('getId')
 			->willReturn('1234');

-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->once())
 			->method('getComment')
 			->willReturn($comment);
@@ -187,8 +173,8 @@ class ListenerTest extends TestCase {
 			->method(('getEvent'))
 			->willReturn(CommentsEvent::EVENT_ADD);

-		/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
-		$notification = $this->getMockBuilder(INotification::class)->getMock();
+		/** @var INotification|MockObject $notification */
+		$notification = $this->createMock(INotification::class);
 		$notification->expects($this->any())
 			->method($this->anything())
 			->willReturn($notification);
@@ -203,9 +189,7 @@ class ListenerTest extends TestCase {

 		$this->userManager->expects($this->once())
 			->method('userExists')
-			->withConsecutive(
-				['foobar']
-			)
+			->with('foobar')
 			->willReturn(false);

 		$this->listener->evaluate($event);
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
 * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -23,26 +26,16 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;

 class NotifierTest extends TestCase {
-	/** @var Notifier */
-	protected $notifier;
-	/** @var IFactory|MockObject */
-	protected $l10nFactory;
-	/** @var IL10N|MockObject */
-	protected $l;
-	/** @var IRootFolder|MockObject */
-	protected $folder;
-	/** @var ICommentsManager|MockObject */
-	protected $commentsManager;
-	/** @var IURLGenerator|MockObject */
-	protected $url;
-	/** @var IUserManager|MockObject */
-	protected $userManager;
-	/** @var INotification|MockObject */
-	protected $notification;
-	/** @var IComment|MockObject */
-	protected $comment;
-	/** @var string */
-	protected $lc = 'tlh_KX';
+	protected IFactory&MockObject $l10nFactory;
+	protected IL10N&MockObject $l;
+	protected IRootFolder&MockObject $folder;
+	protected ICommentsManager&MockObject $commentsManager;
+	protected IURLGenerator&MockObject $url;
+	protected IUserManager&MockObject $userManager;
+	protected INotification&MockObject $notification;
+	protected IComment&MockObject $comment;
+	protected Notifier $notifier;
+	protected string $lc = 'tlh_KX';

 	protected function setUp(): void {
 		parent::setUp();
@@ -75,9 +68,8 @@ class NotifierTest extends TestCase {
 	public function testPrepareSuccess(): void {
 		$fileName = 'Gre\'thor.odp';
 		$displayName = 'Huraga';
-		$message = '@Huraga mentioned you in a comment on "Gre\'thor.odp"';

-		/** @var Node|MockObject $node */
+		/** @var Node&MockObject $node */
 		$node = $this->createMock(Node::class);
 		$node
 			->expects($this->atLeastOnce())
@@ -192,7 +184,6 @@ class NotifierTest extends TestCase {

 	public function testPrepareSuccessDeletedUser(): void {
 		$fileName = 'Gre\'thor.odp';
-		$message = 'You were mentioned on "Gre\'thor.odp", in a comment by an account that has since been deleted';

 		/** @var Node|MockObject $node */
 		$node = $this->createMock(Node::class);
@@ -2,7 +2,7 @@ OC.L10N.register(
    "contactsinteraction",
    {
    "Recently contacted" : "Contactados recentemente",
-    "Contacts Interaction" : "Interação de contatos",
+    "Contacts Interaction" : "Interação de Contatos",
    "Manages interaction between accounts and contacts" : "Gerencia a interação entre contas e contatos",
    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Colete dados sobre interações de contas e contatos e forneça um catálogo de endereços para os dados"
 },
@@ -1,6 +1,6 @@
 { "translations": {
    "Recently contacted" : "Contactados recentemente",
-    "Contacts Interaction" : "Interação de contatos",
+    "Contacts Interaction" : "Interação de Contatos",
    "Manages interaction between accounts and contacts" : "Gerencia a interação entre contas e contatos",
    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Colete dados sobre interações de contas e contatos e forneça um catálogo de endereços para os dados"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
@@ -21,12 +21,8 @@ use Test\TestCase;
 * @group DB
 */
 class RecentContactMapperTest extends TestCase {
-
-	/** @var RecentContactMapper */
-	private $recentContactMapper;
-
-	/** @var ITimeFactory */
-	private $time;
+	private RecentContactMapper $recentContactMapper;
+	private ITimeFactory $time;

 	protected function setUp(): void {
 		parent::setUp();
@@ -1,11 +1,11 @@
 OC.L10N.register(
    "dashboard",
    {
-    "Dashboard" : "Töölaud",
-    "Dashboard app" : "Töölaua rakendus",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Alustage oma päeva teadlikult\n\nNextcloudi avaleht on su päeva alguspunkt, mis annab ülevaate eelseisvatest kohtumistest, kiireloomulistest meilidest, vestlussõnumitest, sissetulevatest päringutest, viimastest säutsudest ja paljust muust! Inimesed saavad lisada neile meeldivaid vidinaid ja muuta tausta oma maitse järgi.",
+    "Dashboard" : "Töölaud/Juhtpaneel",
+    "Dashboard app" : "Töölaua/juhtpaneeli rakendus",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Alusta oma päeva teadlikult\n\nNextcloudi avaleht on su päeva alguspunkt, mis annab ülevaate eelseisvatest kohtumistest, kiireloomulistest kirjadest, vestlussõnumitest, sissetulevatest päringutest, viimastest säutsudest ja paljust muust! Inimesed saavad lisada neile meeldivaid vidinaid ja muuta tausta oma maitse järgi.",
    "Weather" : "Ilm",
-    "Status" : "Staatus",
+    "Status" : "Olek",
    "Good morning" : "Tere hommikust",
    "Good morning, {name}" : "Tere hommikust, {name}",
    "Good afternoon" : "Tere päevast",
@@ -16,14 +16,14 @@ OC.L10N.register(
    "Hello, {name}" : "Tere, {name}",
    "Happy birthday 🥳🤩🎂🎉" : "Palju õnne sünnipäevaks 🥳🤩🎂🎉",
    "Happy birthday, {name} 🥳🤩🎂🎉" : "Palju õnne, {name} 🥳🤩🎂🎉",
-    "\"{title} icon\"" : "\"{title} ikoon\"",
+    "\"{title} icon\"" : "„{title} ikoon“",
    "Customize" : "Kohanda",
-    "Edit widgets" : "Redigeeri vidinaid",
+    "Edit widgets" : "Muuda vidinaid",
    "Get more widgets from the App Store" : "Hangi rohkem vidinaid Rakenduste Poest",
    "Weather service" : "Ilmateenus",
    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Sinu privaatsuse huvides küsib su nimel ilmaandmeid Nextcloudi server, nii et ilmateenistus ei saa isiklikku teavet.",
    "Weather data from Met.no" : "Ilmaandmed Met.no-st",
-    "geocoding with Nominatim" : "geoprogrammeerimine Nominatim-iga",
-    "elevation data from OpenTopoData" : "kõrgusandmed OpenTopoData-st"
+    "geocoding with Nominatim" : "geoprogrammeerimine Nominatimiga",
+    "elevation data from OpenTopoData" : "kõrgusandmed OpenTopoDatast"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,9 +1,9 @@
 { "translations": {
-    "Dashboard" : "Töölaud",
-    "Dashboard app" : "Töölaua rakendus",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Alustage oma päeva teadlikult\n\nNextcloudi avaleht on su päeva alguspunkt, mis annab ülevaate eelseisvatest kohtumistest, kiireloomulistest meilidest, vestlussõnumitest, sissetulevatest päringutest, viimastest säutsudest ja paljust muust! Inimesed saavad lisada neile meeldivaid vidinaid ja muuta tausta oma maitse järgi.",
+    "Dashboard" : "Töölaud/Juhtpaneel",
+    "Dashboard app" : "Töölaua/juhtpaneeli rakendus",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Alusta oma päeva teadlikult\n\nNextcloudi avaleht on su päeva alguspunkt, mis annab ülevaate eelseisvatest kohtumistest, kiireloomulistest kirjadest, vestlussõnumitest, sissetulevatest päringutest, viimastest säutsudest ja paljust muust! Inimesed saavad lisada neile meeldivaid vidinaid ja muuta tausta oma maitse järgi.",
    "Weather" : "Ilm",
-    "Status" : "Staatus",
+    "Status" : "Olek",
    "Good morning" : "Tere hommikust",
    "Good morning, {name}" : "Tere hommikust, {name}",
    "Good afternoon" : "Tere päevast",
@@ -14,14 +14,14 @@
    "Hello, {name}" : "Tere, {name}",
    "Happy birthday 🥳🤩🎂🎉" : "Palju õnne sünnipäevaks 🥳🤩🎂🎉",
    "Happy birthday, {name} 🥳🤩🎂🎉" : "Palju õnne, {name} 🥳🤩🎂🎉",
-    "\"{title} icon\"" : "\"{title} ikoon\"",
+    "\"{title} icon\"" : "„{title} ikoon“",
    "Customize" : "Kohanda",
-    "Edit widgets" : "Redigeeri vidinaid",
+    "Edit widgets" : "Muuda vidinaid",
    "Get more widgets from the App Store" : "Hangi rohkem vidinaid Rakenduste Poest",
    "Weather service" : "Ilmateenus",
    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Sinu privaatsuse huvides küsib su nimel ilmaandmeid Nextcloudi server, nii et ilmateenistus ei saa isiklikku teavet.",
    "Weather data from Met.no" : "Ilmaandmed Met.no-st",
-    "geocoding with Nominatim" : "geoprogrammeerimine Nominatim-iga",
-    "elevation data from OpenTopoData" : "kõrgusandmed OpenTopoData-st"
+    "geocoding with Nominatim" : "geoprogrammeerimine Nominatimiga",
+    "elevation data from OpenTopoData" : "kõrgusandmed OpenTopoDatast"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dashboard" : "Painel",
    "Dashboard app" : "Aplicativo Painel",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Nextcloud Dashboard é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.",
    "Weather" : "Clima",
    "Status" : "Status",
    "Good morning" : "Bom dia",
@@ -16,10 +16,10 @@ OC.L10N.register(
    "Hello, {name}" : "Olá, {name}",
    "Happy birthday 🥳🤩🎂🎉" : "Feliz Aniversário 🥳🤩🎂🎉",
    "Happy birthday, {name} 🥳🤩🎂🎉" : "Feliz Aniversário, {name} 🥳🤩🎂🎉",
-    "\"{title} icon\"" : "\"{title} icon\"",
+    "\"{title} icon\"" : "\"ícone de {title} \"",
    "Customize" : "Personalizar",
    "Edit widgets" : "Editar widgets",
-    "Get more widgets from the App Store" : "Obtenha mais widgets na App Store",
+    "Get more widgets from the App Store" : "Obtenha mais widgets na Loja de Aplicativos",
    "Weather service" : "Serviço de Clima",
    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Para sua privacidade, as informações de Tempo são solicitadas pelo servidor Nextcloud de forma que o serviço de Tempo não receba suas informações pessoais.",
    "Weather data from Met.no" : "Dados de Tempo do Met.no",
@@ -1,7 +1,7 @@
 { "translations": {
    "Dashboard" : "Painel",
    "Dashboard app" : "Aplicativo Painel",
-    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Nextcloud Dashboard é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.",
+    "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.",
    "Weather" : "Clima",
    "Status" : "Status",
    "Good morning" : "Bom dia",
@@ -14,10 +14,10 @@
    "Hello, {name}" : "Olá, {name}",
    "Happy birthday 🥳🤩🎂🎉" : "Feliz Aniversário 🥳🤩🎂🎉",
    "Happy birthday, {name} 🥳🤩🎂🎉" : "Feliz Aniversário, {name} 🥳🤩🎂🎉",
-    "\"{title} icon\"" : "\"{title} icon\"",
+    "\"{title} icon\"" : "\"ícone de {title} \"",
    "Customize" : "Personalizar",
    "Edit widgets" : "Editar widgets",
-    "Get more widgets from the App Store" : "Obtenha mais widgets na App Store",
+    "Get more widgets from the App Store" : "Obtenha mais widgets na Loja de Aplicativos",
    "Weather service" : "Serviço de Clima",
    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Para sua privacidade, as informações de Tempo são solicitadas pelo servidor Nextcloud de forma que o serviço de Tempo não receba suas informações pessoais.",
    "Weather data from Met.no" : "Dados de Tempo do Met.no",
@@ -13,6 +13,8 @@ OC.L10N.register(
    "Good evening, {name}" : "Bună seara, {name}",
    "Hello" : "Bună",
    "Hello, {name}" : "Bună, {name}",
+    "Happy birthday 🥳🤩🎂🎉" : "La mulți ani 🥳🤩🎂🎉",
+    "Happy birthday, {name} 🥳🤩🎂🎉" : "La mulți ani, {name} 🥳🤩🎂🎉",
    "Customize" : "Personalizează",
    "Edit widgets" : "Editează widget",
    "Get more widgets from the App Store" : "Obține mai multe widget-uri din App Store",
@@ -11,6 +11,8 @@
    "Good evening, {name}" : "Bună seara, {name}",
    "Hello" : "Bună",
    "Hello, {name}" : "Bună, {name}",
+    "Happy birthday 🥳🤩🎂🎉" : "La mulți ani 🥳🤩🎂🎉",
+    "Happy birthday, {name} 🥳🤩🎂🎉" : "La mulți ani, {name} 🥳🤩🎂🎉",
    "Customize" : "Personalizează",
    "Edit widgets" : "Editează widget",
    "Get more widgets from the App Store" : "Obține mai multe widget-uri din App Store",
@@ -40,7 +40,7 @@ class DashboardServiceTest extends TestCase {
 		);
 	}

-	public function testGetBirthdate() {
+	public function testGetBirthdate(): void {
 		$user = $this->createMock(IUser::class);
 		$this->userManager->method('get')
 			->willReturn($user);
@@ -61,7 +61,7 @@ class DashboardServiceTest extends TestCase {
 		$this->assertEquals('2024-12-10T00:00:00.000Z', $birthdate);
 	}

-	public function testGetBirthdatePropertyDoesNotExist() {
+	public function testGetBirthdatePropertyDoesNotExist(): void {
 		$user = $this->createMock(IUser::class);
 		$this->userManager->method('get')
 			->willReturn($user);
@@ -75,7 +75,7 @@ class DashboardServiceTest extends TestCase {
 		$this->assertEquals('', $birthdate);
 	}

-	public function testGetBirthdateUserNotFound() {
+	public function testGetBirthdateUserNotFound(): void {
 		$this->userManager->method('get')
 			->willReturn(null);

@@ -84,7 +84,7 @@ class DashboardServiceTest extends TestCase {
 		$this->assertEquals('', $birthdate);
 	}

-	public function testGetBirthdateNoUserId() {
+	public function testGetBirthdateNoUserId(): void {
 		$service = new DashboardService(
 			$this->config,
 			null,
@@ -55,13 +55,16 @@
 	</repair-steps>

 	<commands>
+		<command>OCA\DAV\Command\ClearCalendarUnshares</command>
 		<command>OCA\DAV\Command\CreateAddressBook</command>
 		<command>OCA\DAV\Command\CreateCalendar</command>
 		<command>OCA\DAV\Command\CreateSubscription</command>
 		<command>OCA\DAV\Command\DeleteCalendar</command>
 		<command>OCA\DAV\Command\DeleteSubscription</command>
+		<command>OCA\DAV\Command\ExportCalendar</command>
 		<command>OCA\DAV\Command\FixCalendarSyncCommand</command>
 		<command>OCA\DAV\Command\ListAddressbooks</command>
+		<command>OCA\DAV\Command\ListCalendarShares</command>
 		<command>OCA\DAV\Command\ListCalendars</command>
 		<command>OCA\DAV\Command\ListSubscriptions</command>
 		<command>OCA\DAV\Command\MoveCalendar</command>
@@ -68,7 +68,7 @@ $requestUri = Server::get(IRequest::class)->getRequestUri();
 $linkCheckPlugin = new PublicLinkCheckPlugin();
 $filesDropPlugin = new FilesDropPlugin();

-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
+$server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
 	$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
 	/** @var FederatedShareProvider $shareProvider */
 	$federatedShareProvider = Server::get(FederatedShareProvider::class);
@@ -61,13 +61,14 @@ $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new BearerAuth(
 	Server::get(IUserSession::class),
 	Server::get(ISession::class),
-	Server::get(IRequest::class)
+	Server::get(IRequest::class),
+	Server::get(IConfig::class),
 );
 $authPlugin->addBackend($bearerAuthPlugin);

 $requestUri = Server::get(IRequest::class)->getRequestUri();

-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function () {
+$server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function () {
 	// use the view for the logged in user
 	return Filesystem::getView();
 });
@@ -14,12 +14,15 @@ use OCA\DAV\Files\Sharing\FilesDropPlugin;
 use OCA\DAV\Files\Sharing\PublicLinkCheckPlugin;
 use OCA\DAV\Storage\PublicOwnerWrapper;
 use OCA\DAV\Storage\PublicShareWrapper;
+use OCA\DAV\Upload\ChunkingPlugin;
+use OCA\DAV\Upload\ChunkingV2Plugin;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCP\BeforeSabrePubliclyLoadedEvent;
 use OCP\Constants;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountManager;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IPreview;
@@ -75,12 +78,8 @@ $serverFactory = new ServerFactory(
 $linkCheckPlugin = new PublicLinkCheckPlugin();
 $filesDropPlugin = new FilesDropPlugin();

-// Define root url with /public.php/dav/files/TOKEN
 /** @var string $baseuri defined in public.php */
-preg_match('/(^files\/[a-z0-9-]+)/i', substr($requestUri, strlen($baseuri)), $match);
-$baseuri = $baseuri . $match[0];
-
-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
+$server = $serverFactory->createServer(true, $baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
 	// GET must be allowed for e.g. showing images and allowing Zip downloads
 	if ($server->httpRequest->getMethod() !== 'GET') {
 		// If this is *not* a GET request we only allow access to public DAV from AJAX or when Server2Server is allowed
@@ -142,6 +141,8 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct

 $server->addPlugin($linkCheckPlugin);
 $server->addPlugin($filesDropPlugin);
+$server->addPlugin(new ChunkingV2Plugin(Server::get(ICacheFactory::class)));
+$server->addPlugin(new ChunkingPlugin());

 // allow setup of additional plugins
 $event = new BeforeSabrePubliclyLoadedEvent($server);
@@ -16,6 +16,7 @@ return array(
    'OCA\\DAV\\BackgroundJob\\CalendarRetentionJob' => $baseDir . '/../lib/BackgroundJob/CalendarRetentionJob.php',
    'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => $baseDir . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
    'OCA\\DAV\\BackgroundJob\\CleanupInvitationTokenJob' => $baseDir . '/../lib/BackgroundJob/CleanupInvitationTokenJob.php',
+    'OCA\\DAV\\BackgroundJob\\CleanupOrphanedChildrenJob' => $baseDir . '/../lib/BackgroundJob/CleanupOrphanedChildrenJob.php',
    'OCA\\DAV\\BackgroundJob\\DeleteOutdatedSchedulingObjects' => $baseDir . '/../lib/BackgroundJob/DeleteOutdatedSchedulingObjects.php',
    'OCA\\DAV\\BackgroundJob\\EventReminderJob' => $baseDir . '/../lib/BackgroundJob/EventReminderJob.php',
    'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => $baseDir . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
@@ -63,6 +64,7 @@ return array(
    'OCA\\DAV\\CalDAV\\EventReader' => $baseDir . '/../lib/CalDAV/EventReader.php',
    'OCA\\DAV\\CalDAV\\EventReaderRDate' => $baseDir . '/../lib/CalDAV/EventReaderRDate.php',
    'OCA\\DAV\\CalDAV\\EventReaderRRule' => $baseDir . '/../lib/CalDAV/EventReaderRRule.php',
+    'OCA\\DAV\\CalDAV\\Export\\ExportService' => $baseDir . '/../lib/CalDAV/Export/ExportService.php',
    'OCA\\DAV\\CalDAV\\FreeBusy\\FreeBusyGenerator' => $baseDir . '/../lib/CalDAV/FreeBusy/FreeBusyGenerator.php',
    'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => $baseDir . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
    'OCA\\DAV\\CalDAV\\IRestorable' => $baseDir . '/../lib/CalDAV/IRestorable.php',
@@ -153,13 +155,16 @@ return array(
    'OCA\\DAV\\CardDAV\\UserAddressBooks' => $baseDir . '/../lib/CardDAV/UserAddressBooks.php',
    'OCA\\DAV\\CardDAV\\Validation\\CardDavValidatePlugin' => $baseDir . '/../lib/CardDAV/Validation/CardDavValidatePlugin.php',
    'OCA\\DAV\\CardDAV\\Xml\\Groups' => $baseDir . '/../lib/CardDAV/Xml/Groups.php',
+    'OCA\\DAV\\Command\\ClearCalendarUnshares' => $baseDir . '/../lib/Command/ClearCalendarUnshares.php',
    'OCA\\DAV\\Command\\CreateAddressBook' => $baseDir . '/../lib/Command/CreateAddressBook.php',
    'OCA\\DAV\\Command\\CreateCalendar' => $baseDir . '/../lib/Command/CreateCalendar.php',
    'OCA\\DAV\\Command\\CreateSubscription' => $baseDir . '/../lib/Command/CreateSubscription.php',
    'OCA\\DAV\\Command\\DeleteCalendar' => $baseDir . '/../lib/Command/DeleteCalendar.php',
    'OCA\\DAV\\Command\\DeleteSubscription' => $baseDir . '/../lib/Command/DeleteSubscription.php',
+    'OCA\\DAV\\Command\\ExportCalendar' => $baseDir . '/../lib/Command/ExportCalendar.php',
    'OCA\\DAV\\Command\\FixCalendarSyncCommand' => $baseDir . '/../lib/Command/FixCalendarSyncCommand.php',
    'OCA\\DAV\\Command\\ListAddressbooks' => $baseDir . '/../lib/Command/ListAddressbooks.php',
+    'OCA\\DAV\\Command\\ListCalendarShares' => $baseDir . '/../lib/Command/ListCalendarShares.php',
    'OCA\\DAV\\Command\\ListCalendars' => $baseDir . '/../lib/Command/ListCalendars.php',
    'OCA\\DAV\\Command\\ListSubscriptions' => $baseDir . '/../lib/Command/ListSubscriptions.php',
    'OCA\\DAV\\Command\\MoveCalendar' => $baseDir . '/../lib/Command/MoveCalendar.php',
@@ -281,6 +286,7 @@ return array(
    'OCA\\DAV\\Files\\RootCollection' => $baseDir . '/../lib/Files/RootCollection.php',
    'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => $baseDir . '/../lib/Files/Sharing/FilesDropPlugin.php',
    'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+    'OCA\\DAV\\Files\\Sharing\\RootCollection' => $baseDir . '/../lib/Files/Sharing/RootCollection.php',
    'OCA\\DAV\\Listener\\ActivityUpdaterListener' => $baseDir . '/../lib/Listener/ActivityUpdaterListener.php',
    'OCA\\DAV\\Listener\\AddMissingIndicesListener' => $baseDir . '/../lib/Listener/AddMissingIndicesListener.php',
    'OCA\\DAV\\Listener\\AddressbookListener' => $baseDir . '/../lib/Listener/AddressbookListener.php',
@@ -31,6 +31,7 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\BackgroundJob\\CalendarRetentionJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CalendarRetentionJob.php',
        'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
        'OCA\\DAV\\BackgroundJob\\CleanupInvitationTokenJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupInvitationTokenJob.php',
+        'OCA\\DAV\\BackgroundJob\\CleanupOrphanedChildrenJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupOrphanedChildrenJob.php',
        'OCA\\DAV\\BackgroundJob\\DeleteOutdatedSchedulingObjects' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOutdatedSchedulingObjects.php',
        'OCA\\DAV\\BackgroundJob\\EventReminderJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/EventReminderJob.php',
        'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
@@ -78,6 +79,7 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\CalDAV\\EventReader' => __DIR__ . '/..' . '/../lib/CalDAV/EventReader.php',
        'OCA\\DAV\\CalDAV\\EventReaderRDate' => __DIR__ . '/..' . '/../lib/CalDAV/EventReaderRDate.php',
        'OCA\\DAV\\CalDAV\\EventReaderRRule' => __DIR__ . '/..' . '/../lib/CalDAV/EventReaderRRule.php',
+        'OCA\\DAV\\CalDAV\\Export\\ExportService' => __DIR__ . '/..' . '/../lib/CalDAV/Export/ExportService.php',
        'OCA\\DAV\\CalDAV\\FreeBusy\\FreeBusyGenerator' => __DIR__ . '/..' . '/../lib/CalDAV/FreeBusy/FreeBusyGenerator.php',
        'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
        'OCA\\DAV\\CalDAV\\IRestorable' => __DIR__ . '/..' . '/../lib/CalDAV/IRestorable.php',
@@ -168,13 +170,16 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__ . '/..' . '/../lib/CardDAV/UserAddressBooks.php',
        'OCA\\DAV\\CardDAV\\Validation\\CardDavValidatePlugin' => __DIR__ . '/..' . '/../lib/CardDAV/Validation/CardDavValidatePlugin.php',
        'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__ . '/..' . '/../lib/CardDAV/Xml/Groups.php',
+        'OCA\\DAV\\Command\\ClearCalendarUnshares' => __DIR__ . '/..' . '/../lib/Command/ClearCalendarUnshares.php',
        'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__ . '/..' . '/../lib/Command/CreateAddressBook.php',
        'OCA\\DAV\\Command\\CreateCalendar' => __DIR__ . '/..' . '/../lib/Command/CreateCalendar.php',
        'OCA\\DAV\\Command\\CreateSubscription' => __DIR__ . '/..' . '/../lib/Command/CreateSubscription.php',
        'OCA\\DAV\\Command\\DeleteCalendar' => __DIR__ . '/..' . '/../lib/Command/DeleteCalendar.php',
        'OCA\\DAV\\Command\\DeleteSubscription' => __DIR__ . '/..' . '/../lib/Command/DeleteSubscription.php',
+        'OCA\\DAV\\Command\\ExportCalendar' => __DIR__ . '/..' . '/../lib/Command/ExportCalendar.php',
        'OCA\\DAV\\Command\\FixCalendarSyncCommand' => __DIR__ . '/..' . '/../lib/Command/FixCalendarSyncCommand.php',
        'OCA\\DAV\\Command\\ListAddressbooks' => __DIR__ . '/..' . '/../lib/Command/ListAddressbooks.php',
+        'OCA\\DAV\\Command\\ListCalendarShares' => __DIR__ . '/..' . '/../lib/Command/ListCalendarShares.php',
        'OCA\\DAV\\Command\\ListCalendars' => __DIR__ . '/..' . '/../lib/Command/ListCalendars.php',
        'OCA\\DAV\\Command\\ListSubscriptions' => __DIR__ . '/..' . '/../lib/Command/ListSubscriptions.php',
        'OCA\\DAV\\Command\\MoveCalendar' => __DIR__ . '/..' . '/../lib/Command/MoveCalendar.php',
@@ -296,6 +301,7 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\Files\\RootCollection' => __DIR__ . '/..' . '/../lib/Files/RootCollection.php',
        'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/FilesDropPlugin.php',
        'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+        'OCA\\DAV\\Files\\Sharing\\RootCollection' => __DIR__ . '/..' . '/../lib/Files/Sharing/RootCollection.php',
        'OCA\\DAV\\Listener\\ActivityUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/ActivityUpdaterListener.php',
        'OCA\\DAV\\Listener\\AddMissingIndicesListener' => __DIR__ . '/..' . '/../lib/Listener/AddMissingIndicesListener.php',
        'OCA\\DAV\\Listener\\AddressbookListener' => __DIR__ . '/..' . '/../lib/Listener/AddressbookListener.php',
@@ -250,6 +250,9 @@ OC.L10N.register(
    "Completed on %s" : "Fuldført den %s",
    "Due on %s by %s" : "Forfalder på %s til %s",
    "Due on %s" : "Forfalder på %s",
+    "System Address Book" : "System adressebog",
+    "The system address book contains contact information for all users in your instance." : "System adressebogen indeholder kontaktoplysninger for alle brugere i din instans.",
+    "Enable System Address Book" : "Aktivér System adressebog",
    "DAV system address book" : "DAV system adressebog",
    "No outstanding DAV system address book sync." : "Ingen udestående synkronisering af DAV-systemets adressebog.",
    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "DAV-systemets adressebogssynkronisering er ikke kørt endnu, da din instans har mere end 1000 brugere, eller fordi der opstod en fejl. Kør det manuelt ved at kalde \"occ dav:sync-system-addressbook\".",
@@ -306,6 +309,16 @@ OC.L10N.register(
    "Cancel" : "Annuller",
    "Import" : "Importer",
    "Error while saving settings" : "Der opstod en fejl under lagring af indstillinger",
+    "Contact reset successfully" : "Kontakten blev nulstillet",
+    "Error while resetting contact" : "Fejl under nulstilling af kontakt",
+    "Contact imported successfully" : "Kontakten blev importeret",
+    "Error while importing contact" : "Fejl under import af kontakt",
+    "Example Content" : "Eksempelindhold",
+    "Set example content to be created on new user first login." : "Indstil eksempel på indhold, der skal oprettes ved ny brugers første login.",
+    "Import contact" : "Importér kontakt",
+    "Reset to default contact" : "Nulstil til standardkontakt",
+    "Import contacts" : "Importér kontakter",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Import af en ny .vcf-fil vil slette den eksisterende standardkontakt og erstatte den med den nye. Vil du fortsætte?",
    "There was an error updating your attendance status." : "Der opstod en fejl under opdatering af din fremmødestatus.",
    "Please contact the organizer directly." : "Kontakt venligst arrangøren direkte.",
    "Are you accepting the invitation?" : "Accepter du invitationen?",
@@ -248,6 +248,9 @@
    "Completed on %s" : "Fuldført den %s",
    "Due on %s by %s" : "Forfalder på %s til %s",
    "Due on %s" : "Forfalder på %s",
+    "System Address Book" : "System adressebog",
+    "The system address book contains contact information for all users in your instance." : "System adressebogen indeholder kontaktoplysninger for alle brugere i din instans.",
+    "Enable System Address Book" : "Aktivér System adressebog",
    "DAV system address book" : "DAV system adressebog",
    "No outstanding DAV system address book sync." : "Ingen udestående synkronisering af DAV-systemets adressebog.",
    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "DAV-systemets adressebogssynkronisering er ikke kørt endnu, da din instans har mere end 1000 brugere, eller fordi der opstod en fejl. Kør det manuelt ved at kalde \"occ dav:sync-system-addressbook\".",
@@ -304,6 +307,16 @@
    "Cancel" : "Annuller",
    "Import" : "Importer",
    "Error while saving settings" : "Der opstod en fejl under lagring af indstillinger",
+    "Contact reset successfully" : "Kontakten blev nulstillet",
+    "Error while resetting contact" : "Fejl under nulstilling af kontakt",
+    "Contact imported successfully" : "Kontakten blev importeret",
+    "Error while importing contact" : "Fejl under import af kontakt",
+    "Example Content" : "Eksempelindhold",
+    "Set example content to be created on new user first login." : "Indstil eksempel på indhold, der skal oprettes ved ny brugers første login.",
+    "Import contact" : "Importér kontakt",
+    "Reset to default contact" : "Nulstil til standardkontakt",
+    "Import contacts" : "Importér kontakter",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Import af en ny .vcf-fil vil slette den eksisterende standardkontakt og erstatte den med den nye. Vil du fortsætte?",
    "There was an error updating your attendance status." : "Der opstod en fejl under opdatering af din fremmødestatus.",
    "Please contact the organizer directly." : "Kontakt venligst arrangøren direkte.",
    "Are you accepting the invitation?" : "Accepter du invitationen?",
@@ -186,9 +186,9 @@ OC.L10N.register(
    "November" : "November",
    "December" : "Dezember",
    "First" : "Erste",
-    "Second" : "2.",
-    "Third" : "3.",
-    "Fourth" : "4.",
+    "Second" : "Zweite",
+    "Third" : "Dritte",
+    "Fourth" : "Vierte",
    "Fifth" : "Fünften",
    "Last" : "Letzte",
    "Second Last" : "Vorletztes",
@@ -255,11 +255,11 @@ OC.L10N.register(
    "Enable System Address Book" : "Systemadressbuch aktivieren",
    "DAV system address book" : "DAV-Systemadressbuch",
    "No outstanding DAV system address book sync." : "Keine ausstehende Synchronisierung des DAV-Systemadressbuchs",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Die Synchronisierung des DAV-Systemadressbuchs wurde noch nicht ausgeführt, da deine Instanz mehr als 1000 Benutzer hat oder weil ein Fehler aufgetreten ist. Bitte führe sie manuell aus, indem du \"occ dav:sync-system-addressbook\" ausführst.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Die Synchronisierung des DAV-Systemadressbuchs wurde noch nicht ausgeführt, da diese Instanz mehr als 1000 Benutzer hat oder weil ein Fehler aufgetreten ist. Bitte manuell ausführen, mittels \"occ dav:sync-system-addressbook\".",
    "WebDAV endpoint" : "WebDAV-Endpunkt",
-    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Es konnte nicht überprüft werden, ob dein Webserver ordnungsgemäß eingerichtet ist, um Dateisynchronisation über WebDAV zu ermöglichen. Bitte überprüfe dies manuell.",
-    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisierung konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
-    "Your web server is properly set up to allow file synchronization over WebDAV." : "Dein Webserver ist ordnungsgemäß eingerichtet um Dateisynchronisation über WebDAV zu ermöglichen.",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Es konnte nicht überprüft werden, ob der Webserver ordnungsgemäß eingerichtet ist, um Dateisynchronisation über WebDAV zu ermöglichen. Bitte dies manuell überprüfen.",
+    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Der Webserver ist noch nicht hinreichend für Datei-Synchronisierung konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Der Webserver ist ordnungsgemäß eingerichtet um Dateisynchronisation über WebDAV zu ermöglichen.",
    "Migrated calendar (%1$s)" : "Migrierter Kalender (%1$s)",
    "Calendars including events, details and attendees" : "Kalender mit Terminen, Details und Teilnehmern",
    "Contacts and groups" : "Kontakte und Gruppen",
@@ -273,14 +273,14 @@ OC.L10N.register(
    "Out of office replacement (optional)" : "Abwesenheitsvertretung (optional)",
    "Name of the replacement" : "Name der Vertretung",
    "No results." : "Keine Ergebnisse",
-    "Start typing." : "Beginne mit Schreiben",
-    "Short absence status" : "Kurze Abwesenheits Meldung",
-    "Long absence Message" : "Lange Abwesenheits Meldung",
+    "Start typing." : "Mit dem Schreiben beginnen.",
+    "Short absence status" : "Kurzer Abwesenheitsstatus",
+    "Long absence Message" : "Lange Abwesenheitsnachricht",
    "Save" : "Speichern",
-    "Disable absence" : "Abwesenheitmeldungen deaktivieren",
-    "Failed to load availability" : "Fehler beim Laden der Verfügbarkeit",
+    "Disable absence" : "Abwesenheit deaktivieren",
+    "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden",
    "Saved availability" : "Verfügbarkeit gespeichert",
-    "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit",
+    "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden",
    "Time zone:" : "Zeitzone:",
    "to" : "an",
    "Delete slot" : "Slot löschen",
@@ -291,7 +291,7 @@ OC.L10N.register(
    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setze den Benutzerstatus außerhalb deiner Verfügbarkeit automatisch auf \"Nicht stören\", um alle Benachrichtigungen stumm zu schalten.",
    "Availability" : "Verfügbarkeit",
-    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen.",
+    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten angibst, können andere beim Buchen einer Besprechung sehen, wann du nicht im Büro bist.",
    "Absence" : "Abwesenheit",
    "Configure your next absence period." : "Richte deinen nächsten Abwesenheitszeitraum ein.",
    "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Installiere außerdem die {calendarappstoreopen}Kalender-App{linkclose} oder {calendardocopen}verbinde deinen Desktop & Mobilgerät zur Synchronisierung ↗{linkclose}.",
@@ -309,9 +309,9 @@ OC.L10N.register(
    "Cancel" : "Abbrechen",
    "Import" : "Importieren",
    "Error while saving settings" : "Fehler beim Speichern der Einstellungen",
-    "Contact reset successfully" : "Kontakt erfolgreich zurückgesetzt",
+    "Contact reset successfully" : "Kontakt zurückgesetzt",
    "Error while resetting contact" : "Fehler beim Zurücksetzen des Kontakts",
-    "Contact imported successfully" : "Kontakt erfolgreich importiert",
+    "Contact imported successfully" : "Kontakt importiert",
    "Error while importing contact" : "Fehler beim Import des Kontakts",
    "Example Content" : "Beispielinhalt",
    "Set example content to be created on new user first login." : "Beispielinhalte festlegen, die bei der ersten Anmeldung eines neuen Benutzers erstellt werden sollen.",
@@ -184,9 +184,9 @@
    "November" : "November",
    "December" : "Dezember",
    "First" : "Erste",
-    "Second" : "2.",
-    "Third" : "3.",
-    "Fourth" : "4.",
+    "Second" : "Zweite",
+    "Third" : "Dritte",
+    "Fourth" : "Vierte",
    "Fifth" : "Fünften",
    "Last" : "Letzte",
    "Second Last" : "Vorletztes",
@@ -253,11 +253,11 @@
    "Enable System Address Book" : "Systemadressbuch aktivieren",
    "DAV system address book" : "DAV-Systemadressbuch",
    "No outstanding DAV system address book sync." : "Keine ausstehende Synchronisierung des DAV-Systemadressbuchs",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Die Synchronisierung des DAV-Systemadressbuchs wurde noch nicht ausgeführt, da deine Instanz mehr als 1000 Benutzer hat oder weil ein Fehler aufgetreten ist. Bitte führe sie manuell aus, indem du \"occ dav:sync-system-addressbook\" ausführst.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Die Synchronisierung des DAV-Systemadressbuchs wurde noch nicht ausgeführt, da diese Instanz mehr als 1000 Benutzer hat oder weil ein Fehler aufgetreten ist. Bitte manuell ausführen, mittels \"occ dav:sync-system-addressbook\".",
    "WebDAV endpoint" : "WebDAV-Endpunkt",
-    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Es konnte nicht überprüft werden, ob dein Webserver ordnungsgemäß eingerichtet ist, um Dateisynchronisation über WebDAV zu ermöglichen. Bitte überprüfe dies manuell.",
-    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisierung konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
-    "Your web server is properly set up to allow file synchronization over WebDAV." : "Dein Webserver ist ordnungsgemäß eingerichtet um Dateisynchronisation über WebDAV zu ermöglichen.",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Es konnte nicht überprüft werden, ob der Webserver ordnungsgemäß eingerichtet ist, um Dateisynchronisation über WebDAV zu ermöglichen. Bitte dies manuell überprüfen.",
+    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Der Webserver ist noch nicht hinreichend für Datei-Synchronisierung konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Der Webserver ist ordnungsgemäß eingerichtet um Dateisynchronisation über WebDAV zu ermöglichen.",
    "Migrated calendar (%1$s)" : "Migrierter Kalender (%1$s)",
    "Calendars including events, details and attendees" : "Kalender mit Terminen, Details und Teilnehmern",
    "Contacts and groups" : "Kontakte und Gruppen",
@@ -271,14 +271,14 @@
    "Out of office replacement (optional)" : "Abwesenheitsvertretung (optional)",
    "Name of the replacement" : "Name der Vertretung",
    "No results." : "Keine Ergebnisse",
-    "Start typing." : "Beginne mit Schreiben",
-    "Short absence status" : "Kurze Abwesenheits Meldung",
-    "Long absence Message" : "Lange Abwesenheits Meldung",
+    "Start typing." : "Mit dem Schreiben beginnen.",
+    "Short absence status" : "Kurzer Abwesenheitsstatus",
+    "Long absence Message" : "Lange Abwesenheitsnachricht",
    "Save" : "Speichern",
-    "Disable absence" : "Abwesenheitmeldungen deaktivieren",
-    "Failed to load availability" : "Fehler beim Laden der Verfügbarkeit",
+    "Disable absence" : "Abwesenheit deaktivieren",
+    "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden",
    "Saved availability" : "Verfügbarkeit gespeichert",
-    "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit",
+    "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden",
    "Time zone:" : "Zeitzone:",
    "to" : "an",
    "Delete slot" : "Slot löschen",
@@ -289,7 +289,7 @@
    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setze den Benutzerstatus außerhalb deiner Verfügbarkeit automatisch auf \"Nicht stören\", um alle Benachrichtigungen stumm zu schalten.",
    "Availability" : "Verfügbarkeit",
-    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten konfigurierst, können andere Benutzer sehen, wann du nicht im Büro bist, wenn sie eine Besprechung buchen.",
+    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn du deine Arbeitszeiten angibst, können andere beim Buchen einer Besprechung sehen, wann du nicht im Büro bist.",
    "Absence" : "Abwesenheit",
    "Configure your next absence period." : "Richte deinen nächsten Abwesenheitszeitraum ein.",
    "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Installiere außerdem die {calendarappstoreopen}Kalender-App{linkclose} oder {calendardocopen}verbinde deinen Desktop & Mobilgerät zur Synchronisierung ↗{linkclose}.",
@@ -307,9 +307,9 @@
    "Cancel" : "Abbrechen",
    "Import" : "Importieren",
    "Error while saving settings" : "Fehler beim Speichern der Einstellungen",
-    "Contact reset successfully" : "Kontakt erfolgreich zurückgesetzt",
+    "Contact reset successfully" : "Kontakt zurückgesetzt",
    "Error while resetting contact" : "Fehler beim Zurücksetzen des Kontakts",
-    "Contact imported successfully" : "Kontakt erfolgreich importiert",
+    "Contact imported successfully" : "Kontakt importiert",
    "Error while importing contact" : "Fehler beim Import des Kontakts",
    "Example Content" : "Beispielinhalt",
    "Set example content to be created on new user first login." : "Beispielinhalte festlegen, die bei der ersten Anmeldung eines neuen Benutzers erstellt werden sollen.",
@@ -274,26 +274,26 @@ OC.L10N.register(
    "Name of the replacement" : "Name der Vertretung",
    "No results." : "Keine Ergebnisse.",
    "Start typing." : "Anfangen zu tippen.",
-    "Short absence status" : "Kurzer Abwesenheitsstaus",
+    "Short absence status" : "Kurzer Abwesenheitsstatus",
    "Long absence Message" : "Lange Abwesenheitsnachricht",
    "Save" : "Speichern",
    "Disable absence" : "Abwesenheit deaktivieren",
-    "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen",
+    "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden",
    "Saved availability" : "Verfügbarkeit gespeichert",
-    "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit",
+    "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden",
    "Time zone:" : "Zeitzone:",
    "to" : "an",
    "Delete slot" : "Zeitfenster löschen",
-    "No working hours set" : "Arbeitsfreie Stunden gesetzt",
+    "No working hours set" : "Keine Arbeitszeiten konfiguriert",
    "Add slot" : "Zeitfenster hinzufügen",
    "Weekdays" : "Wochentage",
    "Pick a start time for {dayName}" : "Eine Startzeit für {dayName} wählen",
    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setzen Sie den Benutzerstatus außerhalb Ihrer Verfügbarkeit automatisch auf \"Nicht stören\", um alle Benachrichtigungen stumm zu schalten.",
    "Availability" : "Verfügbarkeit",
-    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten angeben, können Andere beim Buchen einer Besprechung sehen, wann Sie nicht im Büro sind.",
+    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten angeben, können andere beim Buchen einer Besprechung sehen, wann Sie nicht im Büro sind.",
    "Absence" : "Abwesenheit",
-    "Configure your next absence period." : "Richten Sie ihren nächsten Abwesenheitszeitraum ein",
+    "Configure your next absence period." : "Richten Sie ihren nächsten Abwesenheitszeitraum ein.",
    "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Installieren Sie außerdem die {calendarappstoreopen}Kalender-App{linkclose} oder {calendardocopen}verbinden Sie Ihren Desktop & Mobilgerät zur Synchronisierung ↗{linkclose}.",
    "Please make sure to properly set up {emailopen}the email server{linkclose}." : "Bitte stellen Sie sicher, dass Sie {emailopen}den E-Mail Server{linkclose} ordnungsgemäß eingerichtet haben.",
    "Calendar server" : "Kalender-Server",
@@ -272,26 +272,26 @@
    "Name of the replacement" : "Name der Vertretung",
    "No results." : "Keine Ergebnisse.",
    "Start typing." : "Anfangen zu tippen.",
-    "Short absence status" : "Kurzer Abwesenheitsstaus",
+    "Short absence status" : "Kurzer Abwesenheitsstatus",
    "Long absence Message" : "Lange Abwesenheitsnachricht",
    "Save" : "Speichern",
    "Disable absence" : "Abwesenheit deaktivieren",
-    "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen",
+    "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden",
    "Saved availability" : "Verfügbarkeit gespeichert",
-    "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit",
+    "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden",
    "Time zone:" : "Zeitzone:",
    "to" : "an",
    "Delete slot" : "Zeitfenster löschen",
-    "No working hours set" : "Arbeitsfreie Stunden gesetzt",
+    "No working hours set" : "Keine Arbeitszeiten konfiguriert",
    "Add slot" : "Zeitfenster hinzufügen",
    "Weekdays" : "Wochentage",
    "Pick a start time for {dayName}" : "Eine Startzeit für {dayName} wählen",
    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setzen Sie den Benutzerstatus außerhalb Ihrer Verfügbarkeit automatisch auf \"Nicht stören\", um alle Benachrichtigungen stumm zu schalten.",
    "Availability" : "Verfügbarkeit",
-    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten angeben, können Andere beim Buchen einer Besprechung sehen, wann Sie nicht im Büro sind.",
+    "If you configure your working hours, other people will see when you are out of office when they book a meeting." : "Wenn Sie Ihre Arbeitszeiten angeben, können andere beim Buchen einer Besprechung sehen, wann Sie nicht im Büro sind.",
    "Absence" : "Abwesenheit",
-    "Configure your next absence period." : "Richten Sie ihren nächsten Abwesenheitszeitraum ein",
+    "Configure your next absence period." : "Richten Sie ihren nächsten Abwesenheitszeitraum ein.",
    "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Installieren Sie außerdem die {calendarappstoreopen}Kalender-App{linkclose} oder {calendardocopen}verbinden Sie Ihren Desktop & Mobilgerät zur Synchronisierung ↗{linkclose}.",
    "Please make sure to properly set up {emailopen}the email server{linkclose}." : "Bitte stellen Sie sicher, dass Sie {emailopen}den E-Mail Server{linkclose} ordnungsgemäß eingerichtet haben.",
    "Calendar server" : "Kalender-Server",
@@ -2,7 +2,7 @@ OC.L10N.register(
    "dav",
    {
    "Calendar" : "Kalender",
-    "Todos" : "Ülesanded",
+    "Tasks" : "Ülesanded",
    "Personal" : "Isiklik",
    "{actor} created calendar {calendar}" : "{actor} lõi kalendri {calendar}",
    "You created calendar {calendar}" : "Sa lõid kalendri {calendar}",
@@ -10,6 +10,10 @@ OC.L10N.register(
    "You deleted calendar {calendar}" : "Sa kustutasid kalendri {calendar}",
    "{actor} updated calendar {calendar}" : "{actor} uuendas kalendrit {calendar}",
    "You updated calendar {calendar}" : "Sa uuendasid kalendrit {calendar}",
+    "{actor} restored calendar {calendar}" : "{actor} taastas kalendri {calendar}",
+    "You restored calendar {calendar}" : "Sina taastasid kalendri {calendar}",
+    "You shared calendar {calendar} as public link" : "Sina jagasid „{calendar}“ kalendrit avaliku lingina",
+    "You removed public link for calendar {calendar}" : "Sa eemaldasid „{calendar}“ kalendri avaliku lingi",
    "{actor} shared calendar {calendar} with you" : "{actor} jagas kalendrit {calendar} sinuga",
    "You shared calendar {calendar} with {user}" : "Sa jagasid kalendrit {calendar} kasutajaga {user}",
    "{actor} shared calendar {calendar} with {user}" : "{actor} jagas kalendrit {calendar} kasutajaga {user}",
@@ -21,41 +25,190 @@ OC.L10N.register(
    "{actor} shared calendar {calendar} with group {group}" : "{actor} jagas kalendrit {calendar} grupiga {group}",
    "You unshared calendar {calendar} from group {group}" : "Sa lõpetasid kalendri {calendar} jagamise grupiga {group}",
    "{actor} unshared calendar {calendar} from group {group}" : "{actor} lõpetas kalendri {calendar} jagamise grupiga {group}",
+    "Untitled event" : "Ilma nimeta sündmus",
    "{actor} created event {event} in calendar {calendar}" : "{actor} lõi sündmuse {event} kalendrisse {calendar}",
    "You created event {event} in calendar {calendar}" : "Sa lõid sündmuse {event} kalendrisse {calendar}",
    "{actor} deleted event {event} from calendar {calendar}" : "{actor} kustutas sündmuse {event} kalendrist {calendar}",
    "You deleted event {event} from calendar {calendar}" : "Sa kustutasid sündmuse {event} kalendrist {calendar}",
    "{actor} updated event {event} in calendar {calendar}" : "{actor} uuendas sündmust {event} kalendris {calendar}",
    "You updated event {event} in calendar {calendar}" : "Sa uuendasid sündmust {event} kalendris {calendar}",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} lõi ülesande {todo} nimekirjas {calendar}",
-    "You created todo {todo} in list {calendar}" : "Sa lõid ülesande {todo} nimekirjas {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} kustutas ülesande {todo} nimekirjast {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Sa kustutasid ülesande {todo} nimekirjast {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uuendas ülesande {todo} nimekirjas {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Sa uuendasid ülesande {todo} nimekirjas {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} lõpetas ülesande {todo} nimekirjas {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Sa lõpetasid ülesande {todo} nimekirjas {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} taasavas ülesande {todo} nimekirjas {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Sa taasavasid ülesande {todo} nimekirjas {calendar}",
+    "Busy" : "Hõivatud",
+    "{actor} created to-do {todo} in list {calendar}" : "{actor} lisas {todo} ülesande {calendar} loendissse",
+    "You created to-do {todo} in list {calendar}" : "Sina lisasid {todo} ülesande {calendar} loendisse",
+    "{actor} deleted to-do {todo} from list {calendar}" : "{actor} kustutas {todo} ülesande {calendar} loendist",
+    "You deleted to-do {todo} from list {calendar}" : "Sina kustutasid {todo} ülesande {calendar} loendist",
+    "{actor} updated to-do {todo} in list {calendar}" : "{actor} uuendas {todo} ülesannnet {calendar} loendist",
+    "You updated to-do {todo} in list {calendar}" : "Sina uuendasid {todo} ülesannet {calendar} loendist",
+    "{actor} solved to-do {todo} in list {calendar}" : "{actor} lahendas {todo} ülesande {calendar} loendist",
+    "You solved to-do {todo} in list {calendar}" : "Sina lahendasid {todo} ülesande {calendar} loendist",
+    "{actor} reopened to-do {todo} in list {calendar}" : "{actor} avas uuesti {todo} ülesande {calendar} loendist",
+    "You reopened to-do {todo} in list {calendar}" : "Sina avasid uuesti {todo} ülesande {calendar} loendist",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} teisaldas {todo} ülesande {sourceCalendar} loendist {targetCalendar} loendisse",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Sina teisaldasid {todo} ülesande {sourceCalendar} loendist {targetCalendar} loendisse",
+    "Calendar, contacts and tasks" : "Kalender, kontaktid ja ülesanded",
    "A <strong>calendar</strong> was modified" : " <strong>Kalendrit</strong> muudeti",
    "A calendar <strong>event</strong> was modified" : "Kalendri <strong>sündmust </strong> muudeti",
-    "A calendar <strong>todo</strong> was modified" : "Kalendri <strong>ülesannet</strong> muudeti",
+    "A calendar <strong>to-do</strong> was modified" : "Kalendri <strong>ülesannet</strong> muudeti",
    "Contact birthdays" : "Kontaktide sünnipäevad",
+    "Death of %s" : "%s surm",
+    "Untitled calendar" : "Nimetu kalender",
+    "Calendar:" : "Kalender:",
+    "Date:" : "Kuupäev:",
    "Where:" : "Kus:",
    "Description:" : "Kirjeldus:",
-    "Invitation canceled" : "Kutse on tühistatud",
-    "Invitation updated" : "Kutse uuendatud",
+    "_%n year_::_%n years_" : ["%n aasta","%n aastat"],
+    "_%n month_::_%n months_" : ["%n kuu","%n kuud"],
+    "_%n day_::_%n days_" : ["%n päev","%n päeva"],
+    "_%n hour_::_%n hours_" : ["%n tund","%n tundi"],
+    "_%n minute_::_%n minutes_" : ["%n minut","%n minutit"],
+    "%s (in %s)" : "%s (%s pärast)",
+    "%s (%s ago)" : "%s (%s eest)",
+    "Calendar: %s" : "Kalender: %s",
+    "Date: %s" : "Kuupäev: %s",
+    "Description: %s" : "Kirjeldus: %s",
+    "Where: %s" : "Kus: %s",
+    "%1$s via %2$s" : "%1$s %2$s kaudu",
+    "Cancelled: %1$s" : "Tühistatud: %1$s",
+    "\"%1$s\" has been canceled" : "„%1$s“ on tühistatud",
+    "Re: %1$s" : "Re: %1$s",
+    "%1$s has accepted your invitation" : "„%1$s“ on nõustunud sinu kutsega",
+    "%1$s has tentatively accepted your invitation" : "„%1$s“ on esialgselt nõustunud sinu kutsega",
+    "%1$s has declined your invitation" : "„%1$s“ on sinu kutsest keeldunud",
+    "%1$s has responded to your invitation" : "„%1$s“ on vastanud sinu kutsele",
+    "Invitation updated: %1$s" : "Kutse on uuendatud: %1$s",
+    "%1$s updated the event \"%2$s\"" : "„%1$s“ uuendas sündmust „%2$s“",
+    "Invitation: %1$s" : "Kutse: %1$s",
+    "%1$s would like to invite you to \"%2$s\"" : "„%1$s“ soovib saata sulle „%2$s“ kutset",
+    "Organizer:" : "Korraldaja:",
+    "Attendees:" : "Osalejad:",
+    "Title:" : "Pealkiri:",
+    "When:" : "Millal:",
    "Location:" : "Asukoht:",
    "Link:" : "Link:",
    "Accept" : "Nõustu",
    "Decline" : "Keeldu",
+    "More options …" : "Täiendavad valikud…",
+    "More options at %s" : "Lisavalikud: %s",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "Sunday" : "Pühapäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "First" : "Esimene",
+    "Second" : "Teine",
+    "Third" : "Kolmas",
+    "Fourth" : "Neljas",
+    "Fifth" : "Viies",
+    "Last" : "Viimane",
    "Contacts" : "Kontaktid",
-    "Tasks" : "Ülesanded",
+    "You created address book {addressbook}" : "Sa lõid aadressiraamatu „{addressbook}“",
+    "{actor} deleted address book {addressbook}" : "„{actor}“  kustutas „{addressbook}“ aadressiraamatu",
+    "You deleted address book {addressbook}" : "Sa kustutasid aadressiraamatu „{addressbook}“",
+    "You shared address book {addressbook} with {user}" : "Sa jagasid „{addressbook}“ aadressiraamatut kasutajaga „{user}“",
+    "You deleted contact {card} from address book {addressbook}" : "Sa kustutasid „{card}“ kontakti „{addressbook}“ aadressiraamatus",
+    "You updated contact {card} in address book {addressbook}" : "Sa uuendasid „{card}“ kontakti „{addressbook}“ aadressiraamatus",
+    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Kontakti</strong> või <strong>aadressiraamatut</strong> muudeti",
+    "Accounts" : "Kasutajakontod",
+    "System address book which holds all accounts" : "Süsteemne aadressiraamat, kus leiduvad kõik kasutajakontod",
+    "File is not updatable: %1$s" : "Fail pole uuendatav: %1$s",
+    "Failed to get storage for file" : "Failile ei õnnestunud eraldada andmeruumi",
+    "Could not write file contents" : "Ei õnnestunud kirjutada faili sisu",
+    "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
+    "Failed to check file size: %1$s" : "Faili suuruse kontrollimine ei õnnestunud: %1$s",
+    "Could not open file: %1$s, file does seem to exist" : "„%1$s“ faili avamine ei õnnestunud - aga tundub, et ta on olemas",
+    "Could not open file: %1$s, file doesn't seem to exist" : "„%1$s“ faili avamine ei õnnestunud - tundub, et teda pole olemas",
+    "Encryption not ready: %1$s" : "Krüptimine pole veel kasutatav: %1$s",
+    "Failed to open file: %1$s" : "Faili avamine ei õnnestunud: %1$s",
+    "Failed to unlink: %1$s" : "Lingi eemaldamine ei õnnestunud: %1$s",
+    "Failed to write file contents: %1$s" : "Faili sisu salvestamine ei õnnestunud: %1$s",
+    "File not found: %1$s" : "Faili ei leidu: %1$s",
+    "Invalid target path" : "Vigane sihtasukoht",
+    "System is in maintenance mode." : "Server on hooldusrežiimis.",
+    "Upgrade needed" : "Uuendus on vajalik",
+    "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Selleks, et sinu %s toimiks iOS-is/macOS-is CalDAV-i ja CardDAV-iga  peab https olema seadistatud.",
+    "Configures a CalDAV account" : "Seadistab CalDAV-i kasutajakonto",
+    "Configures a CardDAV account" : "Seadistab CardDAV-i kasutajakonto",
+    "Events" : "Sündmused",
+    "Untitled task" : "Ilma nimeta pealkiri",
+    "Completed on %s" : "Lõpetatud %s",
+    "Due on %s by %s" : "Tähtaeg: %s, täitjaks %s",
+    "Due on %s" : "Tähtaeg: %s",
+    "System Address Book" : "Süsteemne aadressiraamat",
+    "The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
+    "Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
+    "DAV system address book" : "DAV-i süsteemne aadressiraamat",
+    "WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
+    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel.",
+    "Calendars including events, details and attendees" : "Kalendrid, sealhulgas sündmused, üksikasjad ja osalejad",
+    "Contacts and groups" : "Kontaktid ja grupid",
    "WebDAV" : "WebDAV",
-    "Tentative" : "Esialgne",
+    "Absence saved" : "Äraoleku teave on salvestatud",
+    "Failed to save your absence settings" : "Sinu äraoleku seadistuste salvestamine ei õnnestunud",
+    "Absence cleared" : "Äraolek on eemaldatud",
+    "Failed to clear your absence settings" : "Sinu äraoleku seadistuste eemaldamine ei õnnestunud",
+    "First day" : "Esimene päev",
+    "Last day (inclusive)" : "Viimane päev (kaasaarvatud)",
+    "Out of office replacement (optional)" : "Asendaja äraoleku ajaks (valikuline)",
+    "Name of the replacement" : "Asendaja nimi",
+    "No results." : "Vasteid ei leitud.",
+    "Start typing." : "Alusta kirjutamist.",
+    "Short absence status" : "Äraoleku lühinimi",
+    "Long absence Message" : "Äraoleku pikk sõnum",
    "Save" : "Salvesta",
+    "Disable absence" : "Lülita äraolek välja",
+    "Failed to load availability" : "Saadavuse laadimine ei õnnestunud",
+    "Saved availability" : "Saadavus on salvestatud",
+    "Failed to save availability" : "Saadavuse salvestamine ei õnnestunud",
+    "Time zone:" : "Ajavöönd:",
+    "to" : "saaja",
+    "Delete slot" : "Kustuta ajavahemik",
+    "No working hours set" : "Tööajad on sisestamata",
+    "Add slot" : "Lisa ajavahemik",
+    "Weekdays" : "Nädalapäevad",
+    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Kõikide teavituste summutamiseks määra automaatselt kasutajale olek „Ära sega“ nendele aegadele, kus ta vaba ei ole.",
+    "Availability" : "Saadavus",
+    "Absence" : "Äraolek",
+    "Configure your next absence period." : "Seadista järgmise äraoleku ajavahemik.",
+    "Calendar server" : "Kalendriserver",
    "Send invitations to attendees" : "Saada osalejatele kutsed",
-    "Hello %s," : "Tere %s,",
-    "When:" : "Millal:"
+    "Automatically generate a birthday calendar" : "Koosta sünnipäevade kalender automaatselt",
+    "Send notifications for events" : "Saada sündmuste teavitusi",
+    "Enable notifications for events via push" : "Võta kasutusele tõuketeenustepõhised teavitused",
+    "Cancel" : "Tühista",
+    "Import" : "Impordi",
+    "Error while saving settings" : "Viga seadistuste salvestamisel",
+    "Contact reset successfully" : "Kontakti lähtestamine õnnestus",
+    "Error while resetting contact" : "Viga kontakti lähtestamisel",
+    "Contact imported successfully" : "Kontakti importimine õnnestus",
+    "Error while importing contact" : "Viga kontakti importimisel",
+    "Example Content" : "Sisunäidis",
+    "Set example content to be created on new user first login." : "Kirjelda näidissisu, mis uue kasutaja esimesel sisselogimisel luuakse.",
+    "Import contact" : "Impordi kontakt",
+    "Reset to default contact" : "Lähtesta vaikimisi kontakstiks",
+    "Import contacts" : "Impordi kontaktid",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Uue .vcf faili importimisel olemasolev vaikimisi kontakt kustutatakse ja asendatakse uuega. Kas sa soovid jätkata?",
+    "There was an error updating your attendance status." : "Sinu osalemise oleku muutmisel tekkis viga.",
+    "Please contact the organizer directly." : "Palun võta ühendust korraldajaga otse.",
+    "Are you accepting the invitation?" : "Kas sa nõustud kutsega?",
+    "Tentative" : "Esialgne",
+    "Your attendance was updated successfully." : "Sinu osalemise oleku muutmine õnnestus.",
+    "Time:" : "Aeg:",
+    "Could not open file" : "Ei õnnestunud avada faili"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,6 @@
 { "translations": {
    "Calendar" : "Kalender",
-    "Todos" : "Ülesanded",
+    "Tasks" : "Ülesanded",
    "Personal" : "Isiklik",
    "{actor} created calendar {calendar}" : "{actor} lõi kalendri {calendar}",
    "You created calendar {calendar}" : "Sa lõid kalendri {calendar}",
@@ -8,6 +8,10 @@
    "You deleted calendar {calendar}" : "Sa kustutasid kalendri {calendar}",
    "{actor} updated calendar {calendar}" : "{actor} uuendas kalendrit {calendar}",
    "You updated calendar {calendar}" : "Sa uuendasid kalendrit {calendar}",
+    "{actor} restored calendar {calendar}" : "{actor} taastas kalendri {calendar}",
+    "You restored calendar {calendar}" : "Sina taastasid kalendri {calendar}",
+    "You shared calendar {calendar} as public link" : "Sina jagasid „{calendar}“ kalendrit avaliku lingina",
+    "You removed public link for calendar {calendar}" : "Sa eemaldasid „{calendar}“ kalendri avaliku lingi",
    "{actor} shared calendar {calendar} with you" : "{actor} jagas kalendrit {calendar} sinuga",
    "You shared calendar {calendar} with {user}" : "Sa jagasid kalendrit {calendar} kasutajaga {user}",
    "{actor} shared calendar {calendar} with {user}" : "{actor} jagas kalendrit {calendar} kasutajaga {user}",
@@ -19,41 +23,190 @@
    "{actor} shared calendar {calendar} with group {group}" : "{actor} jagas kalendrit {calendar} grupiga {group}",
    "You unshared calendar {calendar} from group {group}" : "Sa lõpetasid kalendri {calendar} jagamise grupiga {group}",
    "{actor} unshared calendar {calendar} from group {group}" : "{actor} lõpetas kalendri {calendar} jagamise grupiga {group}",
+    "Untitled event" : "Ilma nimeta sündmus",
    "{actor} created event {event} in calendar {calendar}" : "{actor} lõi sündmuse {event} kalendrisse {calendar}",
    "You created event {event} in calendar {calendar}" : "Sa lõid sündmuse {event} kalendrisse {calendar}",
    "{actor} deleted event {event} from calendar {calendar}" : "{actor} kustutas sündmuse {event} kalendrist {calendar}",
    "You deleted event {event} from calendar {calendar}" : "Sa kustutasid sündmuse {event} kalendrist {calendar}",
    "{actor} updated event {event} in calendar {calendar}" : "{actor} uuendas sündmust {event} kalendris {calendar}",
    "You updated event {event} in calendar {calendar}" : "Sa uuendasid sündmust {event} kalendris {calendar}",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} lõi ülesande {todo} nimekirjas {calendar}",
-    "You created todo {todo} in list {calendar}" : "Sa lõid ülesande {todo} nimekirjas {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} kustutas ülesande {todo} nimekirjast {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Sa kustutasid ülesande {todo} nimekirjast {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uuendas ülesande {todo} nimekirjas {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Sa uuendasid ülesande {todo} nimekirjas {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} lõpetas ülesande {todo} nimekirjas {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Sa lõpetasid ülesande {todo} nimekirjas {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} taasavas ülesande {todo} nimekirjas {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Sa taasavasid ülesande {todo} nimekirjas {calendar}",
+    "Busy" : "Hõivatud",
+    "{actor} created to-do {todo} in list {calendar}" : "{actor} lisas {todo} ülesande {calendar} loendissse",
+    "You created to-do {todo} in list {calendar}" : "Sina lisasid {todo} ülesande {calendar} loendisse",
+    "{actor} deleted to-do {todo} from list {calendar}" : "{actor} kustutas {todo} ülesande {calendar} loendist",
+    "You deleted to-do {todo} from list {calendar}" : "Sina kustutasid {todo} ülesande {calendar} loendist",
+    "{actor} updated to-do {todo} in list {calendar}" : "{actor} uuendas {todo} ülesannnet {calendar} loendist",
+    "You updated to-do {todo} in list {calendar}" : "Sina uuendasid {todo} ülesannet {calendar} loendist",
+    "{actor} solved to-do {todo} in list {calendar}" : "{actor} lahendas {todo} ülesande {calendar} loendist",
+    "You solved to-do {todo} in list {calendar}" : "Sina lahendasid {todo} ülesande {calendar} loendist",
+    "{actor} reopened to-do {todo} in list {calendar}" : "{actor} avas uuesti {todo} ülesande {calendar} loendist",
+    "You reopened to-do {todo} in list {calendar}" : "Sina avasid uuesti {todo} ülesande {calendar} loendist",
+    "{actor} moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} teisaldas {todo} ülesande {sourceCalendar} loendist {targetCalendar} loendisse",
+    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Sina teisaldasid {todo} ülesande {sourceCalendar} loendist {targetCalendar} loendisse",
+    "Calendar, contacts and tasks" : "Kalender, kontaktid ja ülesanded",
    "A <strong>calendar</strong> was modified" : " <strong>Kalendrit</strong> muudeti",
    "A calendar <strong>event</strong> was modified" : "Kalendri <strong>sündmust </strong> muudeti",
-    "A calendar <strong>todo</strong> was modified" : "Kalendri <strong>ülesannet</strong> muudeti",
+    "A calendar <strong>to-do</strong> was modified" : "Kalendri <strong>ülesannet</strong> muudeti",
    "Contact birthdays" : "Kontaktide sünnipäevad",
+    "Death of %s" : "%s surm",
+    "Untitled calendar" : "Nimetu kalender",
+    "Calendar:" : "Kalender:",
+    "Date:" : "Kuupäev:",
    "Where:" : "Kus:",
    "Description:" : "Kirjeldus:",
-    "Invitation canceled" : "Kutse on tühistatud",
-    "Invitation updated" : "Kutse uuendatud",
+    "_%n year_::_%n years_" : ["%n aasta","%n aastat"],
+    "_%n month_::_%n months_" : ["%n kuu","%n kuud"],
+    "_%n day_::_%n days_" : ["%n päev","%n päeva"],
+    "_%n hour_::_%n hours_" : ["%n tund","%n tundi"],
+    "_%n minute_::_%n minutes_" : ["%n minut","%n minutit"],
+    "%s (in %s)" : "%s (%s pärast)",
+    "%s (%s ago)" : "%s (%s eest)",
+    "Calendar: %s" : "Kalender: %s",
+    "Date: %s" : "Kuupäev: %s",
+    "Description: %s" : "Kirjeldus: %s",
+    "Where: %s" : "Kus: %s",
+    "%1$s via %2$s" : "%1$s %2$s kaudu",
+    "Cancelled: %1$s" : "Tühistatud: %1$s",
+    "\"%1$s\" has been canceled" : "„%1$s“ on tühistatud",
+    "Re: %1$s" : "Re: %1$s",
+    "%1$s has accepted your invitation" : "„%1$s“ on nõustunud sinu kutsega",
+    "%1$s has tentatively accepted your invitation" : "„%1$s“ on esialgselt nõustunud sinu kutsega",
+    "%1$s has declined your invitation" : "„%1$s“ on sinu kutsest keeldunud",
+    "%1$s has responded to your invitation" : "„%1$s“ on vastanud sinu kutsele",
+    "Invitation updated: %1$s" : "Kutse on uuendatud: %1$s",
+    "%1$s updated the event \"%2$s\"" : "„%1$s“ uuendas sündmust „%2$s“",
+    "Invitation: %1$s" : "Kutse: %1$s",
+    "%1$s would like to invite you to \"%2$s\"" : "„%1$s“ soovib saata sulle „%2$s“ kutset",
+    "Organizer:" : "Korraldaja:",
+    "Attendees:" : "Osalejad:",
+    "Title:" : "Pealkiri:",
+    "When:" : "Millal:",
    "Location:" : "Asukoht:",
    "Link:" : "Link:",
    "Accept" : "Nõustu",
    "Decline" : "Keeldu",
+    "More options …" : "Täiendavad valikud…",
+    "More options at %s" : "Lisavalikud: %s",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "Sunday" : "Pühapäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "First" : "Esimene",
+    "Second" : "Teine",
+    "Third" : "Kolmas",
+    "Fourth" : "Neljas",
+    "Fifth" : "Viies",
+    "Last" : "Viimane",
    "Contacts" : "Kontaktid",
-    "Tasks" : "Ülesanded",
+    "You created address book {addressbook}" : "Sa lõid aadressiraamatu „{addressbook}“",
+    "{actor} deleted address book {addressbook}" : "„{actor}“  kustutas „{addressbook}“ aadressiraamatu",
+    "You deleted address book {addressbook}" : "Sa kustutasid aadressiraamatu „{addressbook}“",
+    "You shared address book {addressbook} with {user}" : "Sa jagasid „{addressbook}“ aadressiraamatut kasutajaga „{user}“",
+    "You deleted contact {card} from address book {addressbook}" : "Sa kustutasid „{card}“ kontakti „{addressbook}“ aadressiraamatus",
+    "You updated contact {card} in address book {addressbook}" : "Sa uuendasid „{card}“ kontakti „{addressbook}“ aadressiraamatus",
+    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Kontakti</strong> või <strong>aadressiraamatut</strong> muudeti",
+    "Accounts" : "Kasutajakontod",
+    "System address book which holds all accounts" : "Süsteemne aadressiraamat, kus leiduvad kõik kasutajakontod",
+    "File is not updatable: %1$s" : "Fail pole uuendatav: %1$s",
+    "Failed to get storage for file" : "Failile ei õnnestunud eraldada andmeruumi",
+    "Could not write file contents" : "Ei õnnestunud kirjutada faili sisu",
+    "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
+    "Failed to check file size: %1$s" : "Faili suuruse kontrollimine ei õnnestunud: %1$s",
+    "Could not open file: %1$s, file does seem to exist" : "„%1$s“ faili avamine ei õnnestunud - aga tundub, et ta on olemas",
+    "Could not open file: %1$s, file doesn't seem to exist" : "„%1$s“ faili avamine ei õnnestunud - tundub, et teda pole olemas",
+    "Encryption not ready: %1$s" : "Krüptimine pole veel kasutatav: %1$s",
+    "Failed to open file: %1$s" : "Faili avamine ei õnnestunud: %1$s",
+    "Failed to unlink: %1$s" : "Lingi eemaldamine ei õnnestunud: %1$s",
+    "Failed to write file contents: %1$s" : "Faili sisu salvestamine ei õnnestunud: %1$s",
+    "File not found: %1$s" : "Faili ei leidu: %1$s",
+    "Invalid target path" : "Vigane sihtasukoht",
+    "System is in maintenance mode." : "Server on hooldusrežiimis.",
+    "Upgrade needed" : "Uuendus on vajalik",
+    "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Selleks, et sinu %s toimiks iOS-is/macOS-is CalDAV-i ja CardDAV-iga  peab https olema seadistatud.",
+    "Configures a CalDAV account" : "Seadistab CalDAV-i kasutajakonto",
+    "Configures a CardDAV account" : "Seadistab CardDAV-i kasutajakonto",
+    "Events" : "Sündmused",
+    "Untitled task" : "Ilma nimeta pealkiri",
+    "Completed on %s" : "Lõpetatud %s",
+    "Due on %s by %s" : "Tähtaeg: %s, täitjaks %s",
+    "Due on %s" : "Tähtaeg: %s",
+    "System Address Book" : "Süsteemne aadressiraamat",
+    "The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
+    "Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
+    "DAV system address book" : "DAV-i süsteemne aadressiraamat",
+    "WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
+    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
+    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
+    "Your web server is properly set up to allow file synchronization over WebDAV." : "Sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel.",
+    "Calendars including events, details and attendees" : "Kalendrid, sealhulgas sündmused, üksikasjad ja osalejad",
+    "Contacts and groups" : "Kontaktid ja grupid",
    "WebDAV" : "WebDAV",
-    "Tentative" : "Esialgne",
+    "Absence saved" : "Äraoleku teave on salvestatud",
+    "Failed to save your absence settings" : "Sinu äraoleku seadistuste salvestamine ei õnnestunud",
+    "Absence cleared" : "Äraolek on eemaldatud",
+    "Failed to clear your absence settings" : "Sinu äraoleku seadistuste eemaldamine ei õnnestunud",
+    "First day" : "Esimene päev",
+    "Last day (inclusive)" : "Viimane päev (kaasaarvatud)",
+    "Out of office replacement (optional)" : "Asendaja äraoleku ajaks (valikuline)",
+    "Name of the replacement" : "Asendaja nimi",
+    "No results." : "Vasteid ei leitud.",
+    "Start typing." : "Alusta kirjutamist.",
+    "Short absence status" : "Äraoleku lühinimi",
+    "Long absence Message" : "Äraoleku pikk sõnum",
    "Save" : "Salvesta",
+    "Disable absence" : "Lülita äraolek välja",
+    "Failed to load availability" : "Saadavuse laadimine ei õnnestunud",
+    "Saved availability" : "Saadavus on salvestatud",
+    "Failed to save availability" : "Saadavuse salvestamine ei õnnestunud",
+    "Time zone:" : "Ajavöönd:",
+    "to" : "saaja",
+    "Delete slot" : "Kustuta ajavahemik",
+    "No working hours set" : "Tööajad on sisestamata",
+    "Add slot" : "Lisa ajavahemik",
+    "Weekdays" : "Nädalapäevad",
+    "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Kõikide teavituste summutamiseks määra automaatselt kasutajale olek „Ära sega“ nendele aegadele, kus ta vaba ei ole.",
+    "Availability" : "Saadavus",
+    "Absence" : "Äraolek",
+    "Configure your next absence period." : "Seadista järgmise äraoleku ajavahemik.",
+    "Calendar server" : "Kalendriserver",
    "Send invitations to attendees" : "Saada osalejatele kutsed",
-    "Hello %s," : "Tere %s,",
-    "When:" : "Millal:"
+    "Automatically generate a birthday calendar" : "Koosta sünnipäevade kalender automaatselt",
+    "Send notifications for events" : "Saada sündmuste teavitusi",
+    "Enable notifications for events via push" : "Võta kasutusele tõuketeenustepõhised teavitused",
+    "Cancel" : "Tühista",
+    "Import" : "Impordi",
+    "Error while saving settings" : "Viga seadistuste salvestamisel",
+    "Contact reset successfully" : "Kontakti lähtestamine õnnestus",
+    "Error while resetting contact" : "Viga kontakti lähtestamisel",
+    "Contact imported successfully" : "Kontakti importimine õnnestus",
+    "Error while importing contact" : "Viga kontakti importimisel",
+    "Example Content" : "Sisunäidis",
+    "Set example content to be created on new user first login." : "Kirjelda näidissisu, mis uue kasutaja esimesel sisselogimisel luuakse.",
+    "Import contact" : "Impordi kontakt",
+    "Reset to default contact" : "Lähtesta vaikimisi kontakstiks",
+    "Import contacts" : "Impordi kontaktid",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Uue .vcf faili importimisel olemasolev vaikimisi kontakt kustutatakse ja asendatakse uuega. Kas sa soovid jätkata?",
+    "There was an error updating your attendance status." : "Sinu osalemise oleku muutmisel tekkis viga.",
+    "Please contact the organizer directly." : "Palun võta ühendust korraldajaga otse.",
+    "Are you accepting the invitation?" : "Kas sa nõustud kutsega?",
+    "Tentative" : "Esialgne",
+    "Your attendance was updated successfully." : "Sinu osalemise oleku muutmine õnnestus.",
+    "Time:" : "Aeg:",
+    "Could not open file" : "Ei õnnestunud avada faili"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -275,6 +275,13 @@ OC.L10N.register(
    "Cancel" : "Annuler",
    "Import" : "Importation",
    "Error while saving settings" : "Erreur lors de l'enregistrement des paramètres",
+    "Contact reset successfully" : "Contact réinitialisé avec succès",
+    "Error while resetting contact" : "Erreur lors de la remise à zéro du contact",
+    "Contact imported successfully" : "Contact importé avec succès",
+    "Error while importing contact" : "Erreur lors de l'importation du contact",
+    "Import contact" : "Importer un contact",
+    "Import contacts" : "Importer des contacts",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Importer un nouveau fichier .vcf supprimera le contact par défaut existant et le remplacera. Voulez-vous continuer ?",
    "There was an error updating your attendance status." : "Une erreur s'est produite lors de la mise à jour de votre statut de présence.",
    "Please contact the organizer directly." : "Merci de contacter l'organisateur directement.",
    "Are you accepting the invitation?" : "Acceptez-vous l'invitation ?",
@@ -273,6 +273,13 @@
    "Cancel" : "Annuler",
    "Import" : "Importation",
    "Error while saving settings" : "Erreur lors de l'enregistrement des paramètres",
+    "Contact reset successfully" : "Contact réinitialisé avec succès",
+    "Error while resetting contact" : "Erreur lors de la remise à zéro du contact",
+    "Contact imported successfully" : "Contact importé avec succès",
+    "Error while importing contact" : "Erreur lors de l'importation du contact",
+    "Import contact" : "Importer un contact",
+    "Import contacts" : "Importer des contacts",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "Importer un nouveau fichier .vcf supprimera le contact par défaut existant et le remplacera. Voulez-vous continuer ?",
    "There was an error updating your attendance status." : "Une erreur s'est produite lors de la mise à jour de votre statut de présence.",
    "Please contact the organizer directly." : "Merci de contacter l'organisateur directement.",
    "Are you accepting the invitation?" : "Acceptez-vous l'invitation ?",
@@ -309,6 +309,16 @@ OC.L10N.register(
    "Cancel" : "キャンセル",
    "Import" : "インポート",
    "Error while saving settings" : "設定の保存中にエラーが発生",
+    "Contact reset successfully" : "連絡先のリセットが正常に完了しました",
+    "Error while resetting contact" : "連絡先のリセット中にエラーが発生しました",
+    "Contact imported successfully" : "連絡先のインポートが正常に完了しました",
+    "Error while importing contact" : "連絡先のインポート中にエラーが発生しました",
+    "Example Content" : "サンプルコンテンツ",
+    "Set example content to be created on new user first login." : "新規ユーザの初回ログイン時に作成されるサンプルコンテンツを設定します。",
+    "Import contact" : "連絡先のインポート",
+    "Reset to default contact" : "デフォルトの連絡先にリセットする",
+    "Import contacts" : "連絡先のインポート",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "新しい .vcf ファイルをインポートすると、既存のデフォルト連絡先が削除され、新しいものに置き換えられます。続行しますか？",
    "There was an error updating your attendance status." : "出席状況の更新中にエラーが発生しました。",
    "Please contact the organizer directly." : "主催者に直接お問い合わせください。",
    "Are you accepting the invitation?" : "招待を受け入れていますか？",
@@ -307,6 +307,16 @@
    "Cancel" : "キャンセル",
    "Import" : "インポート",
    "Error while saving settings" : "設定の保存中にエラーが発生",
+    "Contact reset successfully" : "連絡先のリセットが正常に完了しました",
+    "Error while resetting contact" : "連絡先のリセット中にエラーが発生しました",
+    "Contact imported successfully" : "連絡先のインポートが正常に完了しました",
+    "Error while importing contact" : "連絡先のインポート中にエラーが発生しました",
+    "Example Content" : "サンプルコンテンツ",
+    "Set example content to be created on new user first login." : "新規ユーザの初回ログイン時に作成されるサンプルコンテンツを設定します。",
+    "Import contact" : "連絡先のインポート",
+    "Reset to default contact" : "デフォルトの連絡先にリセットする",
+    "Import contacts" : "連絡先のインポート",
+    "Importing a new .vcf file will delete the existing default contact and replace it with the new one. Do you want to continue?" : "新しい .vcf ファイルをインポートすると、既存のデフォルト連絡先が削除され、新しいものに置き換えられます。続行しますか？",
    "There was an error updating your attendance status." : "出席状況の更新中にエラーが発生しました。",
    "Please contact the organizer directly." : "主催者に直接お問い合わせください。",
    "Are you accepting the invitation?" : "招待を受け入れていますか？",
@@ -32,12 +32,12 @@ OC.L10N.register(
    "You deleted event {event} from calendar {calendar}" : "Você excluiu o evento {event} do calendário {calendar}",
    "{actor} updated event {event} in calendar {calendar}" : "{actor} atualizou o evento {event} no calendário {calendar}",
    "You updated event {event} in calendar {calendar}" : "Você atualizou o evento {event} no calendário {calendar}",
-    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendario {sourceCalendar} para o calendario {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Você moveu o evento {event} do calendario {sourceCalendar} para o calendario {targetCalendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendário {sourceCalendar} para o calendário {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Você moveu o evento {event} do calendário {sourceCalendar} para o calendário {targetCalendar}",
    "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendário {calendar}",
    "You restored event {event} of calendar {calendar}" : "Você restaurou o evento {event} do calendário {calendar}",
    "Busy" : "Ocupado",
-    "{actor} created to-do {todo} in list {calendar}" : "{actor} criou tarefa {todo} na lista {calendar}",
+    "{actor} created to-do {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
    "You created to-do {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
    "{actor} deleted to-do {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
    "You deleted to-do {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
@@ -51,8 +51,8 @@ OC.L10N.register(
    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Você moveu a tarefa {todo} da lista {sourceCalendar} para a lista {targetCalendar}",
    "Calendar, contacts and tasks" : "Calendário, contatos e tarefas",
    "A <strong>calendar</strong> was modified" : "Um <strong>calendário</strong> foi modificado",
-    "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado",
-    "A calendar <strong>to-do</strong> was modified" : "Um calendário <strong>tarefa</strong> foi modificado",
+    "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> de calendário foi modificado",
+    "A calendar <strong>to-do</strong> was modified" : "Uma <strong>tarefa</strong> de calendário foi modificada",
    "Contact birthdays" : "Aniversário dos contatos",
    "Death of %s" : "Morte de %s",
    "Untitled calendar" : "Calendário sem título",
@@ -74,7 +74,7 @@ OC.L10N.register(
    "%1$s via %2$s" : "%1$s via %2$s",
    "In the past on %1$s for the entire day" : "No passado em %1$s para o dia inteiro",
    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Em um minuto em %1$s para o dia inteiro","Em %n minutos em %1$s para o dia inteiro","Em %n minutos em %1$s para o dia inteiro"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Em uma hora em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro","Em %n horas em  %1$s para o dia inteiro"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Em uma hora em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro"],
    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Em um dias em %1$s para o dia inteiro","Em %n dias em %1$s para o dia inteiro","Em %n dias em %1$s para o dia inteiro"],
    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Em uma semana em %1$s para o dia inteiro","Em %n semanas em %1$s para o dia inteiro","Em %n semanas em %1$s para o dia inteiro"],
    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Em um mês em %1$s para o dia inteiro","Em %n meses em %1$s para o dia inteiro","Em %n meses em %1$s para o dia inteiro"],
@@ -86,42 +86,42 @@ OC.L10N.register(
    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Em uma semana em %1$s entre %2$s - %3$s","Em %n semanas em %1$s entre %2$s - %3$s","Em %n semanas em %1$s entre %2$s - %3$s"],
    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Em um mês em %1$s entre %2$s - %3$s","Em %n meses em %1$s entre %2$s - %3$s","Em %n meses em %1$s entre %2$s - %3$s"],
    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Em um ano em %1$s entre %2$s - %3$s","Em %n anos em %1$s entre %2$s - %3$s","Em %n anos em %1$s entre %2$s - %3$s"],
-    "Could not generate when statement" : "Não foi possível gerar a instrução Quando",
-    "Every Day for the entire day" : "Todos os dias durante todo o dia",
-    "Every Day for the entire day until %1$s" : "Todos os dias durante todo o dia até %1$s",
-    "Every Day between %1$s - %2$s" : "Todos os dias entre %1$s - %2$s",
-    "Every Day between %1$s - %2$s until %3$s" : "Todos os dias entre  %1$s - %2$s até %3$s",
-    "Every %1$d Days for the entire day" : "A cada %1$d dias durante o dia inteiro",
-    "Every %1$d Days for the entire day until %2$s" : "Cada %1$d dias durante todo o dia até %2$s",
-    "Every %1$d Days between %2$s - %3$s" : "Todo os %1$d Dias entre %2$s - %3$s",
-    "Every %1$d Days between %2$s - %3$s until %4$s" : "Todo os %1$d Dias entre %2$s - %3$s até %4$s",
-    "Could not generate event recurrence statement" : "Não foi possível gerar a instrução de recorrência do evento",
-    "Every Week on %1$s for the entire day" : "Todas as semanas em %1$s durante o dia inteiro",
-    "Every Week on %1$s for the entire day until %2$s" : "Toda semana em %1$s durante todo o dia até %2$s",
-    "Every Week on %1$s between %2$s - %3$s" : "Toda semana em %1$s entre %2$s - %3$s",
-    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Toda semana em %1$s entre %2$s - %3$s até %4$s",
-    "Every %1$d Weeks on %2$s for the entire day" : "Todas as  %1$d Semanas em %2$s durante o dia inteiro",
-    "Every %1$d Weeks on %2$s for the entire day until %3$s" : "Todas as  %1$d Semanas em %2$s durante todo o dia até %3$s",
-    "Every %1$d Weeks on %2$s between %3$s - %4$s" : "Todas as  %1$d Semanas em %2$s entre %3$s - %4$s",
-    "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "Todas as %1$d Semanas em %2$s entre %3$s - %4$s até %5$s",
-    "Every Month on the %1$s for the entire day" : "Todo mês em %1$s durante todo o dia",
-    "Every Month on the %1$s for the entire day until %2$s" : "Todos os meses em %1$s durante todo o dia até %2$s",
-    "Every Month on the %1$s between %2$s - %3$s" : "Todo mês nos %1$s entre %2$s - %3$s",
-    "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Todo mês nos %1$s entre %2$s - %3$s até%4$s",
-    "Every %1$d Months on the %2$s for the entire day" : "A cada %1$d Meses nos %2$s durante o dia inteiro",
-    "Every %1$d Months on the %2$s for the entire day until %3$s" : "A cada %1$d Meses no %2$s durante todo o dia até%3$s",
-    "Every %1$d Months on the %2$s between %3$s - %4$s" : "A cada %1$d Meses nos %2$s entre %3$s - %4$s",
-    "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "A cada %1$d Meses nos %2$s entre %3$s - %4$s até %5$s",
-    "Every Year in %1$s on the %2$s for the entire day" : "Todos os anos em %1$s em %2$s durante todo o dia",
-    "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Todos os anos em %1$s em %2$s durante todo o dia até %3$s",
-    "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Todos os anos em %1$s nos %2$s entre %3$s - %4$s",
-    "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Todos os anos em %1$s nos %2$s entre %3$s - %4$s até %5$s",
-    "Every %1$d Years in %2$s on the %3$s for the entire day" : "A cada %1$d Anos em %2$s nos %3$s durante o dia inteiro",
-    "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "A cada %1$d Anos em %2$s nos %3$s durante todo o dia até %4$s",
-    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s ",
-    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s até%6$s",
-    "On specific dates for the entire day until %1$s" : "Em datas específicas durante todo o dia até %1$s",
-    "On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até%3$s",
+    "Could not generate when statement" : "Não foi possível gerar a indicação sobre quando",
+    "Every Day for the entire day" : "Todo Dia durante o dia inteiro",
+    "Every Day for the entire day until %1$s" : "Todo Dia para o dia inteiro até %1$s",
+    "Every Day between %1$s - %2$s" : "Todo Dia entre %1$s - %2$s",
+    "Every Day between %1$s - %2$s until %3$s" : "Todo Dia entre  %1$s - %2$s até %3$s",
+    "Every %1$d Days for the entire day" : "A Cada %1$d Dias para o dia inteiro",
+    "Every %1$d Days for the entire day until %2$s" : "A Cada %1$d Dias para o dia inteiro até %2$s",
+    "Every %1$d Days between %2$s - %3$s" : "A Cada %1$d Dias entre %2$s - %3$s",
+    "Every %1$d Days between %2$s - %3$s until %4$s" : "A Cada %1$d Dias entre %2$s - %3$s até %4$s",
+    "Could not generate event recurrence statement" : "Não foi possível gerar a indicação de recorrência do evento",
+    "Every Week on %1$s for the entire day" : "Toda Semana, %1$s para o dia inteiro",
+    "Every Week on %1$s for the entire day until %2$s" : "Toda Semana, %1$s para o dia inteiro até %2$s",
+    "Every Week on %1$s between %2$s - %3$s" : "Toda Semana, %1$s entre %2$s - %3$s",
+    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Toda Semana, %1$s entre %2$s - %3$s até %4$s",
+    "Every %1$d Weeks on %2$s for the entire day" : "A Cada %1$d Semanas, %2$s para o dia inteiro",
+    "Every %1$d Weeks on %2$s for the entire day until %3$s" : "A Cada %1$d Semanas, %2$s para o dia inteiro até %3$s",
+    "Every %1$d Weeks on %2$s between %3$s - %4$s" : "A Cada %1$d Semanas, %2$s entre %3$s - %4$s",
+    "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "A Cada %1$d Semanas, %2$s entre %3$s - %4$s até %5$s",
+    "Every Month on the %1$s for the entire day" : "Todo Mês no dia %1$s para o dia inteiro",
+    "Every Month on the %1$s for the entire day until %2$s" : "Todo Mês no dia %1$s para o dia inteiro até %2$s",
+    "Every Month on the %1$s between %2$s - %3$s" : "Todo Mês no dia %1$s entre %2$s - %3$s",
+    "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Todo Mês no dia %1$s entre %2$s - %3$s até %4$s",
+    "Every %1$d Months on the %2$s for the entire day" : "A Cada %1$d Meses no dia %2$s para o dia inteiro",
+    "Every %1$d Months on the %2$s for the entire day until %3$s" : "A Cada %1$d Meses no dia %2$s para o dia inteiro até %3$s",
+    "Every %1$d Months on the %2$s between %3$s - %4$s" : "A Cada %1$d Meses no dia %2$s entre %3$s - %4$s",
+    "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "A Cada %1$d Meses no dia %2$s entre %3$s - %4$s até %5$s",
+    "Every Year in %1$s on the %2$s for the entire day" : "Todo Ano em %1$s no dia %2$s para o dia inteiro",
+    "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Todo Ano em %1$s no dia %2$s para o dia inteiro até %3$s",
+    "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Todo Ano em %1$s no dia %2$s entre %3$s - %4$s",
+    "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Todo Ano em %1$s no dia %2$s entre %3$s - %4$s até %5$s",
+    "Every %1$d Years in %2$s on the %3$s for the entire day" : "A Cada %1$d Anos em %2$s no dia %3$s para o dia inteiro",
+    "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "A Cada %1$d Anos em %2$s no dia %3$s para o dia inteiro até %4$s",
+    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "A Cada %1$d Anos em %2$s no dia %3$s entre %4$s - %5$s ",
+    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A Cada %1$d Anos em %2$s no dia %3$s entre %4$s - %5$s até %6$s",
+    "On specific dates for the entire day until %1$s" : "Em datas específicas para o dia inteiro até %1$s",
+    "On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até %3$s",
    "In the past on %1$s" : "No passado em %1$s",
    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Em um minuto em %1$s","Em %n minutos em %1$s","Em %n minutos em %1$s"],
    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Em uma hora em %1$s","Em %n horas em %1$s","Em %n horas em %1$s"],
@@ -129,32 +129,32 @@ OC.L10N.register(
    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Em uma semana em %1$s","Em %n semanas em %1$s","Em %n semanas em %1$s"],
    "_In a month on %1$s_::_In %n months on %1$s_" : ["Em um mês em %1$s","Em %n meses em %1$s","Em %n meses em %1$s"],
    "_In a year on %1$s_::_In %n years on %1$s_" : ["Em um ano em %1$s","Em %n anos em %1$s","Em %n anos em %1$s"],
-    "In the past on %1$s then on %2$s" : "No passado em %1$s e então em %2$s",
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Em um minuto em %1$s e então em %2$s","Em %n minutos em %1$s e então em %2$s","Em %n minutos em %1$s e então em %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Em um hora em %1$s e então em %2$s","Em %n horas em %1$s e então em %2$s","Em %n horas em %1$s e então em %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Em um dia em %1$s e então em %2$s","Em %n dias em %1$s e então em %2$s","Em %n dias em %1$s e então em %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Em uma semana em %1$s e então em %2$s","Em %n semanas em %1$s e então em %2$s","Em %n semanas em %1$s e então em %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Em um mes em %1$s e então em %2$s","Em %n meses em %1$s e então em %2$s","Em %n meses em %1$s e então em %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Em um ano em %1$s e então em %2$s","Em %n anos em %1$s e então em %2$s","Em %n anos em %1$s e então em %2$s"],
-    "In the past on %1$s then on %2$s and %3$s" : "No passado em %1$s e então em %2$s e %3$s",
-    "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Em um minuto e %1$s e então em %2$s e %3$s","Em %n minutos e %1$s e então em %2$s e %3$s","Em %n minutos e %1$s e então em %2$s e %3$s"],
-    "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Em uma hora e %1$s e então em %2$s e %3$s","Em %n horas e %1$s e então em %2$s e %3$s","Em %n horas e %1$s e então em %2$s e %3$s"],
-    "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Em um dia e %1$s e então em %2$s e %3$s","Em %n dias e %1$s e então em %2$s e %3$s","Em %n dias e %1$s e então em %2$s e %3$s"],
-    "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Em uma semana e %1$s e então em %2$s e %3$s","Em %n semanas e %1$s e então em %2$s e %3$s","Em %n semanas e %1$s e então em %2$s e %3$s"],
-    "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Em um mês e %1$s e então em %2$s e %3$s","Em %n meses e %1$s e então em %2$s e %3$s","Em %n meses e %1$s e então em %2$s e %3$s"],
-    "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Em um ano e %1$s e então em %2$s e %3$s","Em %n anos e %1$s e então em %2$s e %3$s","Em %n anos e %1$s e então em %2$s e %3$s"],
-    "Could not generate next recurrence statement" : "Não foi possível gerar a próxima instrução de recorrência",
+    "In the past on %1$s then on %2$s" : "No passado em %1$s e depois em %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Em um minuto em %1$s e depois em %2$s","Em %n minutos em %1$s e depois em %2$s","Em %n minutos em %1$s e depois em %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Em um hora em %1$s e depois em %2$s","Em %n horas em %1$s e depois em %2$s","Em %n horas em %1$s e depois em %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Em um dia em %1$s e depois em %2$s","Em %n dias em %1$s e depois em %2$s","Em %n dias em %1$s e depois em %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Em uma semana em %1$s e depois em %2$s","Em %n semanas em %1$s e depois em %2$s","Em %n semanas em %1$s e depois em %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Em um mês em %1$s e depois em %2$s","Em %n meses em %1$s e depois em %2$s","Em %n meses em %1$s e depois em %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Em um ano em %1$s e depois em %2$s","Em %n anos em %1$s e depois em %2$s","Em %n anos em %1$s e depois em %2$s"],
+    "In the past on %1$s then on %2$s and %3$s" : "No passado em %1$s e depois em %2$s e %3$s",
+    "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Em um minuto e %1$s e depois em %2$s e %3$s","Em %n minutos e %1$s e depois em %2$s e %3$s","Em %n minutos e %1$s e depois em %2$s e %3$s"],
+    "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Em uma hora e %1$s e depois em %2$s e %3$s","Em %n horas e %1$s e depois em %2$s e %3$s","Em %n horas e %1$s e depois em %2$s e %3$s"],
+    "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Em um dia e %1$s e depois em %2$s e %3$s","Em %n dias e %1$s e depois em %2$s e %3$s","Em %n dias e %1$s e depois em %2$s e %3$s"],
+    "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Em uma semana e %1$s e depois em %2$s e %3$s","Em %n semanas e %1$s e depois em %2$s e %3$s","Em %n semanas e %1$s e depois em %2$s e %3$s"],
+    "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Em um mês e %1$s e depois em %2$s e %3$s","Em %n meses e %1$s e depois em %2$s e %3$s","Em %n meses e %1$s e depois em %2$s e %3$s"],
+    "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Em um ano e %1$s e depois em %2$s e %3$s","Em %n anos e %1$s e depois em %2$s e %3$s","Em %n anos e %1$s e depois em %2$s e %3$s"],
+    "Could not generate next recurrence statement" : "Não foi possível gerar a indicação da próxima recorrência",
    "Cancelled: %1$s" : "Cancelado: %1$s",
    "\"%1$s\" has been canceled" : "\"%1$s\" foi cancelado",
-    "Re: %1$s" : "Remetente: %1$s",
+    "Re: %1$s" : "Re: %1$s",
    "%1$s has accepted your invitation" : "%1$s aceitou seu convite",
-    "%1$s has tentatively accepted your invitation" : "%1$s aceitou provisoriamente o seu convite",
+    "%1$s has tentatively accepted your invitation" : "%1$s aceitou provisoriamente seu convite",
    "%1$s has declined your invitation" : "%1$s recusou seu convite",
    "%1$s has responded to your invitation" : "%1$s respondeu ao seu convite",
-    "Invitation updated: %1$s" : "Invitation updated: %1$s",
-    "%1$s updated the event \"%2$s\"" : "%1$s updated the event \"%2$s\"",
+    "Invitation updated: %1$s" : "Convite atualizado: %1$s",
+    "%1$s updated the event \"%2$s\"" : "%1$s atualizou o evento \"%2$s\"",
    "Invitation: %1$s" : "Convite: %1$s",
-    "%1$s would like to invite you to \"%2$s\"" : "%1$s gostaria de convidá-lo para \"%2$s\"",
+    "%1$s would like to invite you to \"%2$s\"" : "%1$s gostaria de convidar você para \"%2$s\"",
    "Organizer:" : "Organizador:",
    "Attendees:" : "Participantes:",
    "Title:" : "Título:",
@@ -185,52 +185,52 @@ OC.L10N.register(
    "October" : "Outubro",
    "November" : "Novembro",
    "December" : "Dezembro",
-    "First" : "Primeiro",
-    "Second" : "Segundo",
-    "Third" : "Terço",
-    "Fourth" : "Quarto",
-    "Fifth" : "Quinto",
-    "Last" : "Último",
-    "Second Last" : "Último segundo",
-    "Third Last" : "Terceiro Último",
-    "Fourth Last" : "Quarto Último",
-    "Fifth Last" : "Quinto Último",
+    "First" : "Primeiro/a",
+    "Second" : "Segundo/a",
+    "Third" : "Terço/a",
+    "Fourth" : "Quarto/a",
+    "Fifth" : "Quinto/a",
+    "Last" : "Último/a",
+    "Second Last" : "Penúltimo/a",
+    "Third Last" : "Terceiro/a Último/a",
+    "Fourth Last" : "Quarto/a Último/a",
+    "Fifth Last" : "Quinto/a Último/a",
    "Contacts" : "Contatos",
-    "{actor} created address book {addressbook}" : "{actor} criou o livro de endereço {addressbook}",
+    "{actor} created address book {addressbook}" : "{actor} criou o catálogo de endereços {addressbook}",
    "You created address book {addressbook}" : "Você criou o catálogo de endereços  {addressbook}",
-    "{actor} deleted address book {addressbook}" : "{actor} apagou o livro de endereços  {addressbook}",
+    "{actor} deleted address book {addressbook}" : "{actor} excluiu o catálogo de endereços {addressbook}",
    "You deleted address book {addressbook}" : "Você excluiu o catálogo de endereços {addressbook}",
-    "{actor} updated address book {addressbook}" : "{actor} atualizou o livro de endereço {addressbook}",
-    "You updated address book {addressbook}" : "Você atualizou o livro de endereço {addressbook}",
-    "{actor} shared address book {addressbook} with you" : "{actor} compartilhou o livro de endereço {addressbook} com você",
+    "{actor} updated address book {addressbook}" : "{actor} atualizou o catálogo de endereços {addressbook}",
+    "You updated address book {addressbook}" : "Você atualizou o catálogo de endereços {addressbook}",
+    "{actor} shared address book {addressbook} with you" : "{actor} compartilhou o catálogo de endereços {addressbook} com você",
    "You shared address book {addressbook} with {user}" : "Você compartilhou o catálogo de endereços {addressbook} com {user}",
-    "{actor} shared address book {addressbook} with {user}" : "{actor} compartilhou o livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from you" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com você",
-    "You unshared address book {addressbook} from {user}" : "Você retirou o compartilhamento do livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from {user}" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from themselves" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com ele mesmo",
-    "You shared address book {addressbook} with group {group}" : "Você compartilhou o livro de endereço {addressbook} com o grupo {group}",
-    "{actor} shared address book {addressbook} with group {group}" : "{actor} compartilhou o livro de endereço {addressbook} com o grupo {group}",
-    "You unshared address book {addressbook} from group {group}" : "Você retirou o compartilhamento do livro de enredeços {addressbook} com o grupo {group}",
-    "{actor} unshared address book {addressbook} from group {group}" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com o grupo {group}",
-    "{actor} created contact {card} in address book {addressbook}" : "{actor} criou o contato {card} no livro de enrereço {addressbook}",
-    "You created contact {card} in address book {addressbook}" : "Você criou o contato {card} no livro de endereço {addressbook}",
-    "{actor} deleted contact {card} from address book {addressbook}" : "{actor} excluiu o contato {card} do livro de endereço {addressbook}",
-    "You deleted contact {card} from address book {addressbook}" : "Você apagou o contato {card} do livro de endereços {addressbook}",
-    "{actor} updated contact {card} in address book {addressbook}" : "{actor} updated contact {card} no livro de endereço {addressbook}",
-    "You updated contact {card} in address book {addressbook}" : "Você atualizou o contato  {card} no livro de endereços  {addressbook}",
-    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "O <strong>contato</strong> ou <strong>livro de endereço</strong> foi modificado",
+    "{actor} shared address book {addressbook} with {user}" : "{actor} compartilhou o catálogo de endereços {addressbook} com {user}",
+    "{actor} unshared address book {addressbook} from you" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de você",
+    "You unshared address book {addressbook} from {user}" : "Você retirou o compartilhamento do catálogo de endereços {addressbook} de {user}",
+    "{actor} unshared address book {addressbook} from {user}" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de {user}",
+    "{actor} unshared address book {addressbook} from themselves" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de si mesmo",
+    "You shared address book {addressbook} with group {group}" : "Você compartilhou o catálogo de endereços {addressbook} com o grupo {group}",
+    "{actor} shared address book {addressbook} with group {group}" : "{actor} compartilhou o catálogo de endereços {addressbook} com o grupo {group}",
+    "You unshared address book {addressbook} from group {group}" : "Você retirou o compartilhamento do catálogo de endereços {addressbook} do grupo {group}",
+    "{actor} unshared address book {addressbook} from group {group}" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} do grupo {group}",
+    "{actor} created contact {card} in address book {addressbook}" : "{actor} criou o contato {card} no catálogo de endereços {addressbook}",
+    "You created contact {card} in address book {addressbook}" : "Você criou o contato {card} no catálogo de endereços {addressbook}",
+    "{actor} deleted contact {card} from address book {addressbook}" : "{actor} excluiu o contato {card} do catálogo de endereços {addressbook}",
+    "You deleted contact {card} from address book {addressbook}" : "Você exluiu o contato {card} do catálogo de endereços {addressbook}",
+    "{actor} updated contact {card} in address book {addressbook}" : "{actor} atualizou o contato {card} no catálogo de endereços {addressbook}",
+    "You updated contact {card} in address book {addressbook}" : "Você atualizou o contato {card} no catálogo de endereços {addressbook}",
+    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "Um <strong>contato</strong> ou <strong>catálogo de endereços</strong> foi modificado",
    "Accounts" : "Contas",
    "System address book which holds all accounts" : "Catálogo de endereços do sistema que contém todas as contas",
    "File is not updatable: %1$s" : "O arquivo não é atualizável: %1$s",
    "Failed to get storage for file" : "Falha ao obter armazenamento para arquivo",
-    "Could not write to final file, canceled by hook" : "Não foi possível gravar no arquivo final, cancelado pelo gancho",
+    "Could not write to final file, canceled by hook" : "Não foi possível gravar no arquivo final, cancelado pelo hook",
    "Could not write file contents" : "Não foi possível gravar o conteúdo do arquivo",
    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
    "Error while copying file to target location (copied: %1$s, expected filesize: %2$s)" : "Erro ao copiar o arquivo para o local de destino (copiado: %1$s, tamanho de arquivo esperado: %2$s)",
-    "Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side." : "Tamanho de arquivo esperado de %1$s mas lido (do cliente Nextcloud) e gravado (no armazenamento Nextcloud) %2$s. Pode ser um problema de rede no lado de envio ou um problema de gravação no armazenamento no lado do servidor.",
-    "Could not rename part file to final file, canceled by hook" : "Não foi possível renomear o arquivo de parte para o arquivo final, cancelado pelo gancho",
-    "Could not rename part file to final file" : "Não foi possível renomear o arquivo de parte para o arquivo final",
+    "Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side." : "Tamanho de arquivo esperado de %1$s, mas lido (do cliente Nextcloud) e gravado (no armazenamento Nextcloud) %2$s. Pode ser um problema de rede no lado de envio ou um problema de gravação no armazenamento no lado do servidor.",
+    "Could not rename part file to final file, canceled by hook" : "Não foi possível renomear o arquivo de peça para o arquivo final, cancelado pelo hook",
+    "Could not rename part file to final file" : "Não foi possível renomear o arquivo de peça para o arquivo final",
    "Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
    "Could not open file: %1$s, file does seem to exist" : "Não foi possível abrir o arquivo: %1$s, o arquivo parece existir",
    "Could not open file: %1$s, file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s, o arquivo parece não existir",
@@ -238,7 +238,7 @@ OC.L10N.register(
    "Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
    "Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
    "Failed to write file contents: %1$s" : "Falha ao gravar o conteúdo do arquivo:%1$s",
-    "File not found: %1$s" : "Arquivo não encontrado:%1$s",
+    "File not found: %1$s" : "Arquivo não encontrado: %1$s",
    "Invalid target path" : "Caminho de destino inválido",
    "System is in maintenance mode." : "O sistema está em modo de manutenção",
    "Upgrade needed" : "Upgrade necessário",
@@ -253,9 +253,9 @@ OC.L10N.register(
    "System Address Book" : "Catálogo de Endereços do Sistema",
    "The system address book contains contact information for all users in your instance." : "O catálogo de endereços do sistema contém informações de contato de todos os usuários da sua instância.",
    "Enable System Address Book" : "Ativar Catálogo de Endereços do Sistema",
-    "DAV system address book" : "Livro de endereços DAV do sistema",
-    "No outstanding DAV system address book sync." : "Não há nenhum livro de endereços DAV sendo sincronizado.",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "A sincronização do catálogo de endereços do sistema DAV ainda não foi executada porque sua instância tem mais de 1000 usuários ou porque ocorreu um erro. Execute-o manualmente chamando \"occ dav:sync-system-addressbook\".",
+    "DAV system address book" : "Catálogo de endereços DAV do sistema",
+    "No outstanding DAV system address book sync." : "Não há sincronização pendente do catálogo de endereços DAV do sistema.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "A sincronização do catálogo de endereços DAV do sistema ainda não foi executada porque sua instância tem mais de 1000 usuários ou porque ocorreu um erro. Execute-a manualmente chamando \"occ dav:sync-system-addressbook\".",
    "WebDAV endpoint" : "Endpoint WebDAV",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Não foi possível verificar se o seu servidor web está configurado corretamente para permitir a sincronização de arquivos via WebDAV. Verifique manualmente.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, porque a interface do WebDAV parece estar quebrada.",
@@ -266,16 +266,16 @@ OC.L10N.register(
    "WebDAV" : "WebDAV",
    "Absence saved" : "Ausência salva",
    "Failed to save your absence settings" : "Falha ao salvar suas configurações de ausência",
-    "Absence cleared" : "Ausência apagada",
+    "Absence cleared" : "Limpou a ausência",
    "Failed to clear your absence settings" : "Falha ao limpar suas configurações de ausência",
    "First day" : "Primeiro dia",
    "Last day (inclusive)" : "Último dia (inclusive)",
-    "Out of office replacement (optional)" : "Substituição fora do escritório (opcional)",
+    "Out of office replacement (optional)" : "Substituto durante sua ausência (opcional)",
    "Name of the replacement" : "Nome do substituto",
    "No results." : "Nenhum resultado.",
    "Start typing." : "Comece a digitar.",
-    "Short absence status" : "Status para ausência breve",
-    "Long absence Message" : "Mensagem longa de ausência",
+    "Short absence status" : "Status curto sobre a ausência",
+    "Long absence Message" : "Mensagem longa sobre a ausência",
    "Save" : "Salvar",
    "Disable absence" : "Desativar ausência",
    "Failed to load availability" : "Falha ao carregar a disponibilidade",
@@ -303,18 +303,18 @@ OC.L10N.register(
    "Hence they will not be available immediately after enabling but will show up after some time." : "Portanto, eles não estarão disponíveis imediatamente após a ativação, mas depois de algum tempo.",
    "Send notifications for events" : "Enviar notificações para eventos",
    "Notifications are sent via background jobs, so these must occur often enough." : "As notificações são enviadas via trabalhos em segundo plano, portanto, elas devem ocorrer com frequência suficiente.",
-    "Send reminder notifications to calendar sharees as well" : "Envie notificações de lembrete para compartilhamentos de calendário também",
-    "Reminders are always sent to organizers and attendees." : "Os lembretes são sempre enviados aos organizadores e participantes.",
+    "Send reminder notifications to calendar sharees as well" : "Enviar notificações de lembrete também para os compartilhadores de calendário",
+    "Reminders are always sent to organizers and attendees." : "Lembretes são sempre enviados aos organizadores e participantes.",
    "Enable notifications for events via push" : "Ativar notificações para eventos via push",
    "Cancel" : "Cancelar",
    "Import" : "Importar",
-    "Error while saving settings" : "Error while saving settings",
+    "Error while saving settings" : "Erro ao salvar as configurações",
    "Contact reset successfully" : "O contato foi reiniciado com sucesso",
    "Error while resetting contact" : "Erro ao reiniciar o contato",
    "Contact imported successfully" : "O contato foi importado com sucesso",
    "Error while importing contact" : "Erro ao importar o contato",
-    "Example Content" : "Conteúdo de Exemplo",
-    "Set example content to be created on new user first login." : "Defina o conteúdo de exemplo a ser criado no primeiro login do novo usuário.",
+    "Example Content" : "Exemplo de Conteúdo",
+    "Set example content to be created on new user first login." : "Defina o exemplo de conteúdo a ser criado no primeiro login do novo usuário.",
    "Import contact" : "Importar contato",
    "Reset to default contact" : "Redefinir para o contato padrão",
    "Import contacts" : "Importar contatos",
@@ -325,8 +325,8 @@ OC.L10N.register(
    "Tentative" : "Tentativa",
    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso.",
    "Time:" : "Horário:",
-    "Could not open file" : "Não pode abrir o arquivo",
-    "Invalid chunk name" : "Nome do bloco inválido",
-    "Could not rename part file assembled from chunks" : "Não foi possível renomear parte do arquivo montado a partir de pedaços"
+    "Could not open file" : "Não foi possível abrir o arquivo",
+    "Invalid chunk name" : "Nome de pedaço inválido",
+    "Could not rename part file assembled from chunks" : "Não foi possível renomear o arquivo de peça montado a partir de pedaços"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -30,12 +30,12 @@
    "You deleted event {event} from calendar {calendar}" : "Você excluiu o evento {event} do calendário {calendar}",
    "{actor} updated event {event} in calendar {calendar}" : "{actor} atualizou o evento {event} no calendário {calendar}",
    "You updated event {event} in calendar {calendar}" : "Você atualizou o evento {event} no calendário {calendar}",
-    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendario {sourceCalendar} para o calendario {targetCalendar}",
-    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Você moveu o evento {event} do calendario {sourceCalendar} para o calendario {targetCalendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} moveu o evento {event} do calendário {sourceCalendar} para o calendário {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Você moveu o evento {event} do calendário {sourceCalendar} para o calendário {targetCalendar}",
    "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendário {calendar}",
    "You restored event {event} of calendar {calendar}" : "Você restaurou o evento {event} do calendário {calendar}",
    "Busy" : "Ocupado",
-    "{actor} created to-do {todo} in list {calendar}" : "{actor} criou tarefa {todo} na lista {calendar}",
+    "{actor} created to-do {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
    "You created to-do {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
    "{actor} deleted to-do {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
    "You deleted to-do {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
@@ -49,8 +49,8 @@
    "You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}" : "Você moveu a tarefa {todo} da lista {sourceCalendar} para a lista {targetCalendar}",
    "Calendar, contacts and tasks" : "Calendário, contatos e tarefas",
    "A <strong>calendar</strong> was modified" : "Um <strong>calendário</strong> foi modificado",
-    "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado",
-    "A calendar <strong>to-do</strong> was modified" : "Um calendário <strong>tarefa</strong> foi modificado",
+    "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> de calendário foi modificado",
+    "A calendar <strong>to-do</strong> was modified" : "Uma <strong>tarefa</strong> de calendário foi modificada",
    "Contact birthdays" : "Aniversário dos contatos",
    "Death of %s" : "Morte de %s",
    "Untitled calendar" : "Calendário sem título",
@@ -72,7 +72,7 @@
    "%1$s via %2$s" : "%1$s via %2$s",
    "In the past on %1$s for the entire day" : "No passado em %1$s para o dia inteiro",
    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Em um minuto em %1$s para o dia inteiro","Em %n minutos em %1$s para o dia inteiro","Em %n minutos em %1$s para o dia inteiro"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Em uma hora em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro","Em %n horas em  %1$s para o dia inteiro"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Em uma hora em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro","Em %n horas em %1$s para o dia inteiro"],
    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Em um dias em %1$s para o dia inteiro","Em %n dias em %1$s para o dia inteiro","Em %n dias em %1$s para o dia inteiro"],
    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Em uma semana em %1$s para o dia inteiro","Em %n semanas em %1$s para o dia inteiro","Em %n semanas em %1$s para o dia inteiro"],
    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Em um mês em %1$s para o dia inteiro","Em %n meses em %1$s para o dia inteiro","Em %n meses em %1$s para o dia inteiro"],
@@ -84,42 +84,42 @@
    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Em uma semana em %1$s entre %2$s - %3$s","Em %n semanas em %1$s entre %2$s - %3$s","Em %n semanas em %1$s entre %2$s - %3$s"],
    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Em um mês em %1$s entre %2$s - %3$s","Em %n meses em %1$s entre %2$s - %3$s","Em %n meses em %1$s entre %2$s - %3$s"],
    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Em um ano em %1$s entre %2$s - %3$s","Em %n anos em %1$s entre %2$s - %3$s","Em %n anos em %1$s entre %2$s - %3$s"],
-    "Could not generate when statement" : "Não foi possível gerar a instrução Quando",
-    "Every Day for the entire day" : "Todos os dias durante todo o dia",
-    "Every Day for the entire day until %1$s" : "Todos os dias durante todo o dia até %1$s",
-    "Every Day between %1$s - %2$s" : "Todos os dias entre %1$s - %2$s",
-    "Every Day between %1$s - %2$s until %3$s" : "Todos os dias entre  %1$s - %2$s até %3$s",
-    "Every %1$d Days for the entire day" : "A cada %1$d dias durante o dia inteiro",
-    "Every %1$d Days for the entire day until %2$s" : "Cada %1$d dias durante todo o dia até %2$s",
-    "Every %1$d Days between %2$s - %3$s" : "Todo os %1$d Dias entre %2$s - %3$s",
-    "Every %1$d Days between %2$s - %3$s until %4$s" : "Todo os %1$d Dias entre %2$s - %3$s até %4$s",
-    "Could not generate event recurrence statement" : "Não foi possível gerar a instrução de recorrência do evento",
-    "Every Week on %1$s for the entire day" : "Todas as semanas em %1$s durante o dia inteiro",
-    "Every Week on %1$s for the entire day until %2$s" : "Toda semana em %1$s durante todo o dia até %2$s",
-    "Every Week on %1$s between %2$s - %3$s" : "Toda semana em %1$s entre %2$s - %3$s",
-    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Toda semana em %1$s entre %2$s - %3$s até %4$s",
-    "Every %1$d Weeks on %2$s for the entire day" : "Todas as  %1$d Semanas em %2$s durante o dia inteiro",
-    "Every %1$d Weeks on %2$s for the entire day until %3$s" : "Todas as  %1$d Semanas em %2$s durante todo o dia até %3$s",
-    "Every %1$d Weeks on %2$s between %3$s - %4$s" : "Todas as  %1$d Semanas em %2$s entre %3$s - %4$s",
-    "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "Todas as %1$d Semanas em %2$s entre %3$s - %4$s até %5$s",
-    "Every Month on the %1$s for the entire day" : "Todo mês em %1$s durante todo o dia",
-    "Every Month on the %1$s for the entire day until %2$s" : "Todos os meses em %1$s durante todo o dia até %2$s",
-    "Every Month on the %1$s between %2$s - %3$s" : "Todo mês nos %1$s entre %2$s - %3$s",
-    "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Todo mês nos %1$s entre %2$s - %3$s até%4$s",
-    "Every %1$d Months on the %2$s for the entire day" : "A cada %1$d Meses nos %2$s durante o dia inteiro",
-    "Every %1$d Months on the %2$s for the entire day until %3$s" : "A cada %1$d Meses no %2$s durante todo o dia até%3$s",
-    "Every %1$d Months on the %2$s between %3$s - %4$s" : "A cada %1$d Meses nos %2$s entre %3$s - %4$s",
-    "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "A cada %1$d Meses nos %2$s entre %3$s - %4$s até %5$s",
-    "Every Year in %1$s on the %2$s for the entire day" : "Todos os anos em %1$s em %2$s durante todo o dia",
-    "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Todos os anos em %1$s em %2$s durante todo o dia até %3$s",
-    "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Todos os anos em %1$s nos %2$s entre %3$s - %4$s",
-    "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Todos os anos em %1$s nos %2$s entre %3$s - %4$s até %5$s",
-    "Every %1$d Years in %2$s on the %3$s for the entire day" : "A cada %1$d Anos em %2$s nos %3$s durante o dia inteiro",
-    "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "A cada %1$d Anos em %2$s nos %3$s durante todo o dia até %4$s",
-    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s ",
-    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A cada %1$d Anos em %2$s nos %3$s entre %4$s - %5$s até%6$s",
-    "On specific dates for the entire day until %1$s" : "Em datas específicas durante todo o dia até %1$s",
-    "On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até%3$s",
+    "Could not generate when statement" : "Não foi possível gerar a indicação sobre quando",
+    "Every Day for the entire day" : "Todo Dia durante o dia inteiro",
+    "Every Day for the entire day until %1$s" : "Todo Dia para o dia inteiro até %1$s",
+    "Every Day between %1$s - %2$s" : "Todo Dia entre %1$s - %2$s",
+    "Every Day between %1$s - %2$s until %3$s" : "Todo Dia entre  %1$s - %2$s até %3$s",
+    "Every %1$d Days for the entire day" : "A Cada %1$d Dias para o dia inteiro",
+    "Every %1$d Days for the entire day until %2$s" : "A Cada %1$d Dias para o dia inteiro até %2$s",
+    "Every %1$d Days between %2$s - %3$s" : "A Cada %1$d Dias entre %2$s - %3$s",
+    "Every %1$d Days between %2$s - %3$s until %4$s" : "A Cada %1$d Dias entre %2$s - %3$s até %4$s",
+    "Could not generate event recurrence statement" : "Não foi possível gerar a indicação de recorrência do evento",
+    "Every Week on %1$s for the entire day" : "Toda Semana, %1$s para o dia inteiro",
+    "Every Week on %1$s for the entire day until %2$s" : "Toda Semana, %1$s para o dia inteiro até %2$s",
+    "Every Week on %1$s between %2$s - %3$s" : "Toda Semana, %1$s entre %2$s - %3$s",
+    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Toda Semana, %1$s entre %2$s - %3$s até %4$s",
+    "Every %1$d Weeks on %2$s for the entire day" : "A Cada %1$d Semanas, %2$s para o dia inteiro",
+    "Every %1$d Weeks on %2$s for the entire day until %3$s" : "A Cada %1$d Semanas, %2$s para o dia inteiro até %3$s",
+    "Every %1$d Weeks on %2$s between %3$s - %4$s" : "A Cada %1$d Semanas, %2$s entre %3$s - %4$s",
+    "Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s" : "A Cada %1$d Semanas, %2$s entre %3$s - %4$s até %5$s",
+    "Every Month on the %1$s for the entire day" : "Todo Mês no dia %1$s para o dia inteiro",
+    "Every Month on the %1$s for the entire day until %2$s" : "Todo Mês no dia %1$s para o dia inteiro até %2$s",
+    "Every Month on the %1$s between %2$s - %3$s" : "Todo Mês no dia %1$s entre %2$s - %3$s",
+    "Every Month on the %1$s between %2$s - %3$s until %4$s" : "Todo Mês no dia %1$s entre %2$s - %3$s até %4$s",
+    "Every %1$d Months on the %2$s for the entire day" : "A Cada %1$d Meses no dia %2$s para o dia inteiro",
+    "Every %1$d Months on the %2$s for the entire day until %3$s" : "A Cada %1$d Meses no dia %2$s para o dia inteiro até %3$s",
+    "Every %1$d Months on the %2$s between %3$s - %4$s" : "A Cada %1$d Meses no dia %2$s entre %3$s - %4$s",
+    "Every %1$d Months on the %2$s between %3$s - %4$s until %5$s" : "A Cada %1$d Meses no dia %2$s entre %3$s - %4$s até %5$s",
+    "Every Year in %1$s on the %2$s for the entire day" : "Todo Ano em %1$s no dia %2$s para o dia inteiro",
+    "Every Year in %1$s on the %2$s for the entire day until %3$s" : "Todo Ano em %1$s no dia %2$s para o dia inteiro até %3$s",
+    "Every Year in %1$s on the %2$s between %3$s - %4$s" : "Todo Ano em %1$s no dia %2$s entre %3$s - %4$s",
+    "Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s" : "Todo Ano em %1$s no dia %2$s entre %3$s - %4$s até %5$s",
+    "Every %1$d Years in %2$s on the %3$s for the entire day" : "A Cada %1$d Anos em %2$s no dia %3$s para o dia inteiro",
+    "Every %1$d Years in %2$s on the %3$s for the entire day until %4$s" : "A Cada %1$d Anos em %2$s no dia %3$s para o dia inteiro até %4$s",
+    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s" : "A Cada %1$d Anos em %2$s no dia %3$s entre %4$s - %5$s ",
+    "Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s" : "A Cada %1$d Anos em %2$s no dia %3$s entre %4$s - %5$s até %6$s",
+    "On specific dates for the entire day until %1$s" : "Em datas específicas para o dia inteiro até %1$s",
+    "On specific dates between %1$s - %2$s until %3$s" : "Em datas específicas entre %1$s - %2$s até %3$s",
    "In the past on %1$s" : "No passado em %1$s",
    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Em um minuto em %1$s","Em %n minutos em %1$s","Em %n minutos em %1$s"],
    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Em uma hora em %1$s","Em %n horas em %1$s","Em %n horas em %1$s"],
@@ -127,32 +127,32 @@
    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Em uma semana em %1$s","Em %n semanas em %1$s","Em %n semanas em %1$s"],
    "_In a month on %1$s_::_In %n months on %1$s_" : ["Em um mês em %1$s","Em %n meses em %1$s","Em %n meses em %1$s"],
    "_In a year on %1$s_::_In %n years on %1$s_" : ["Em um ano em %1$s","Em %n anos em %1$s","Em %n anos em %1$s"],
-    "In the past on %1$s then on %2$s" : "No passado em %1$s e então em %2$s",
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Em um minuto em %1$s e então em %2$s","Em %n minutos em %1$s e então em %2$s","Em %n minutos em %1$s e então em %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Em um hora em %1$s e então em %2$s","Em %n horas em %1$s e então em %2$s","Em %n horas em %1$s e então em %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Em um dia em %1$s e então em %2$s","Em %n dias em %1$s e então em %2$s","Em %n dias em %1$s e então em %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Em uma semana em %1$s e então em %2$s","Em %n semanas em %1$s e então em %2$s","Em %n semanas em %1$s e então em %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Em um mes em %1$s e então em %2$s","Em %n meses em %1$s e então em %2$s","Em %n meses em %1$s e então em %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Em um ano em %1$s e então em %2$s","Em %n anos em %1$s e então em %2$s","Em %n anos em %1$s e então em %2$s"],
-    "In the past on %1$s then on %2$s and %3$s" : "No passado em %1$s e então em %2$s e %3$s",
-    "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Em um minuto e %1$s e então em %2$s e %3$s","Em %n minutos e %1$s e então em %2$s e %3$s","Em %n minutos e %1$s e então em %2$s e %3$s"],
-    "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Em uma hora e %1$s e então em %2$s e %3$s","Em %n horas e %1$s e então em %2$s e %3$s","Em %n horas e %1$s e então em %2$s e %3$s"],
-    "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Em um dia e %1$s e então em %2$s e %3$s","Em %n dias e %1$s e então em %2$s e %3$s","Em %n dias e %1$s e então em %2$s e %3$s"],
-    "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Em uma semana e %1$s e então em %2$s e %3$s","Em %n semanas e %1$s e então em %2$s e %3$s","Em %n semanas e %1$s e então em %2$s e %3$s"],
-    "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Em um mês e %1$s e então em %2$s e %3$s","Em %n meses e %1$s e então em %2$s e %3$s","Em %n meses e %1$s e então em %2$s e %3$s"],
-    "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Em um ano e %1$s e então em %2$s e %3$s","Em %n anos e %1$s e então em %2$s e %3$s","Em %n anos e %1$s e então em %2$s e %3$s"],
-    "Could not generate next recurrence statement" : "Não foi possível gerar a próxima instrução de recorrência",
+    "In the past on %1$s then on %2$s" : "No passado em %1$s e depois em %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Em um minuto em %1$s e depois em %2$s","Em %n minutos em %1$s e depois em %2$s","Em %n minutos em %1$s e depois em %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Em um hora em %1$s e depois em %2$s","Em %n horas em %1$s e depois em %2$s","Em %n horas em %1$s e depois em %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Em um dia em %1$s e depois em %2$s","Em %n dias em %1$s e depois em %2$s","Em %n dias em %1$s e depois em %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Em uma semana em %1$s e depois em %2$s","Em %n semanas em %1$s e depois em %2$s","Em %n semanas em %1$s e depois em %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Em um mês em %1$s e depois em %2$s","Em %n meses em %1$s e depois em %2$s","Em %n meses em %1$s e depois em %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Em um ano em %1$s e depois em %2$s","Em %n anos em %1$s e depois em %2$s","Em %n anos em %1$s e depois em %2$s"],
+    "In the past on %1$s then on %2$s and %3$s" : "No passado em %1$s e depois em %2$s e %3$s",
+    "_In a minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Em um minuto e %1$s e depois em %2$s e %3$s","Em %n minutos e %1$s e depois em %2$s e %3$s","Em %n minutos e %1$s e depois em %2$s e %3$s"],
+    "_In a hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Em uma hora e %1$s e depois em %2$s e %3$s","Em %n horas e %1$s e depois em %2$s e %3$s","Em %n horas e %1$s e depois em %2$s e %3$s"],
+    "_In a day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Em um dia e %1$s e depois em %2$s e %3$s","Em %n dias e %1$s e depois em %2$s e %3$s","Em %n dias e %1$s e depois em %2$s e %3$s"],
+    "_In a week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Em uma semana e %1$s e depois em %2$s e %3$s","Em %n semanas e %1$s e depois em %2$s e %3$s","Em %n semanas e %1$s e depois em %2$s e %3$s"],
+    "_In a month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Em um mês e %1$s e depois em %2$s e %3$s","Em %n meses e %1$s e depois em %2$s e %3$s","Em %n meses e %1$s e depois em %2$s e %3$s"],
+    "_In a year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Em um ano e %1$s e depois em %2$s e %3$s","Em %n anos e %1$s e depois em %2$s e %3$s","Em %n anos e %1$s e depois em %2$s e %3$s"],
+    "Could not generate next recurrence statement" : "Não foi possível gerar a indicação da próxima recorrência",
    "Cancelled: %1$s" : "Cancelado: %1$s",
    "\"%1$s\" has been canceled" : "\"%1$s\" foi cancelado",
-    "Re: %1$s" : "Remetente: %1$s",
+    "Re: %1$s" : "Re: %1$s",
    "%1$s has accepted your invitation" : "%1$s aceitou seu convite",
-    "%1$s has tentatively accepted your invitation" : "%1$s aceitou provisoriamente o seu convite",
+    "%1$s has tentatively accepted your invitation" : "%1$s aceitou provisoriamente seu convite",
    "%1$s has declined your invitation" : "%1$s recusou seu convite",
    "%1$s has responded to your invitation" : "%1$s respondeu ao seu convite",
-    "Invitation updated: %1$s" : "Invitation updated: %1$s",
-    "%1$s updated the event \"%2$s\"" : "%1$s updated the event \"%2$s\"",
+    "Invitation updated: %1$s" : "Convite atualizado: %1$s",
+    "%1$s updated the event \"%2$s\"" : "%1$s atualizou o evento \"%2$s\"",
    "Invitation: %1$s" : "Convite: %1$s",
-    "%1$s would like to invite you to \"%2$s\"" : "%1$s gostaria de convidá-lo para \"%2$s\"",
+    "%1$s would like to invite you to \"%2$s\"" : "%1$s gostaria de convidar você para \"%2$s\"",
    "Organizer:" : "Organizador:",
    "Attendees:" : "Participantes:",
    "Title:" : "Título:",
@@ -183,52 +183,52 @@
    "October" : "Outubro",
    "November" : "Novembro",
    "December" : "Dezembro",
-    "First" : "Primeiro",
-    "Second" : "Segundo",
-    "Third" : "Terço",
-    "Fourth" : "Quarto",
-    "Fifth" : "Quinto",
-    "Last" : "Último",
-    "Second Last" : "Último segundo",
-    "Third Last" : "Terceiro Último",
-    "Fourth Last" : "Quarto Último",
-    "Fifth Last" : "Quinto Último",
+    "First" : "Primeiro/a",
+    "Second" : "Segundo/a",
+    "Third" : "Terço/a",
+    "Fourth" : "Quarto/a",
+    "Fifth" : "Quinto/a",
+    "Last" : "Último/a",
+    "Second Last" : "Penúltimo/a",
+    "Third Last" : "Terceiro/a Último/a",
+    "Fourth Last" : "Quarto/a Último/a",
+    "Fifth Last" : "Quinto/a Último/a",
    "Contacts" : "Contatos",
-    "{actor} created address book {addressbook}" : "{actor} criou o livro de endereço {addressbook}",
+    "{actor} created address book {addressbook}" : "{actor} criou o catálogo de endereços {addressbook}",
    "You created address book {addressbook}" : "Você criou o catálogo de endereços  {addressbook}",
-    "{actor} deleted address book {addressbook}" : "{actor} apagou o livro de endereços  {addressbook}",
+    "{actor} deleted address book {addressbook}" : "{actor} excluiu o catálogo de endereços {addressbook}",
    "You deleted address book {addressbook}" : "Você excluiu o catálogo de endereços {addressbook}",
-    "{actor} updated address book {addressbook}" : "{actor} atualizou o livro de endereço {addressbook}",
-    "You updated address book {addressbook}" : "Você atualizou o livro de endereço {addressbook}",
-    "{actor} shared address book {addressbook} with you" : "{actor} compartilhou o livro de endereço {addressbook} com você",
+    "{actor} updated address book {addressbook}" : "{actor} atualizou o catálogo de endereços {addressbook}",
+    "You updated address book {addressbook}" : "Você atualizou o catálogo de endereços {addressbook}",
+    "{actor} shared address book {addressbook} with you" : "{actor} compartilhou o catálogo de endereços {addressbook} com você",
    "You shared address book {addressbook} with {user}" : "Você compartilhou o catálogo de endereços {addressbook} com {user}",
-    "{actor} shared address book {addressbook} with {user}" : "{actor} compartilhou o livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from you" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com você",
-    "You unshared address book {addressbook} from {user}" : "Você retirou o compartilhamento do livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from {user}" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com {user}",
-    "{actor} unshared address book {addressbook} from themselves" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com ele mesmo",
-    "You shared address book {addressbook} with group {group}" : "Você compartilhou o livro de endereço {addressbook} com o grupo {group}",
-    "{actor} shared address book {addressbook} with group {group}" : "{actor} compartilhou o livro de endereço {addressbook} com o grupo {group}",
-    "You unshared address book {addressbook} from group {group}" : "Você retirou o compartilhamento do livro de enredeços {addressbook} com o grupo {group}",
-    "{actor} unshared address book {addressbook} from group {group}" : "{actor} retirou o compartilhamento do livro de endereço {addressbook} com o grupo {group}",
-    "{actor} created contact {card} in address book {addressbook}" : "{actor} criou o contato {card} no livro de enrereço {addressbook}",
-    "You created contact {card} in address book {addressbook}" : "Você criou o contato {card} no livro de endereço {addressbook}",
-    "{actor} deleted contact {card} from address book {addressbook}" : "{actor} excluiu o contato {card} do livro de endereço {addressbook}",
-    "You deleted contact {card} from address book {addressbook}" : "Você apagou o contato {card} do livro de endereços {addressbook}",
-    "{actor} updated contact {card} in address book {addressbook}" : "{actor} updated contact {card} no livro de endereço {addressbook}",
-    "You updated contact {card} in address book {addressbook}" : "Você atualizou o contato  {card} no livro de endereços  {addressbook}",
-    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "O <strong>contato</strong> ou <strong>livro de endereço</strong> foi modificado",
+    "{actor} shared address book {addressbook} with {user}" : "{actor} compartilhou o catálogo de endereços {addressbook} com {user}",
+    "{actor} unshared address book {addressbook} from you" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de você",
+    "You unshared address book {addressbook} from {user}" : "Você retirou o compartilhamento do catálogo de endereços {addressbook} de {user}",
+    "{actor} unshared address book {addressbook} from {user}" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de {user}",
+    "{actor} unshared address book {addressbook} from themselves" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} de si mesmo",
+    "You shared address book {addressbook} with group {group}" : "Você compartilhou o catálogo de endereços {addressbook} com o grupo {group}",
+    "{actor} shared address book {addressbook} with group {group}" : "{actor} compartilhou o catálogo de endereços {addressbook} com o grupo {group}",
+    "You unshared address book {addressbook} from group {group}" : "Você retirou o compartilhamento do catálogo de endereços {addressbook} do grupo {group}",
+    "{actor} unshared address book {addressbook} from group {group}" : "{actor} retirou o compartilhamento do catálogo de endereços {addressbook} do grupo {group}",
+    "{actor} created contact {card} in address book {addressbook}" : "{actor} criou o contato {card} no catálogo de endereços {addressbook}",
+    "You created contact {card} in address book {addressbook}" : "Você criou o contato {card} no catálogo de endereços {addressbook}",
+    "{actor} deleted contact {card} from address book {addressbook}" : "{actor} excluiu o contato {card} do catálogo de endereços {addressbook}",
+    "You deleted contact {card} from address book {addressbook}" : "Você exluiu o contato {card} do catálogo de endereços {addressbook}",
+    "{actor} updated contact {card} in address book {addressbook}" : "{actor} atualizou o contato {card} no catálogo de endereços {addressbook}",
+    "You updated contact {card} in address book {addressbook}" : "Você atualizou o contato {card} no catálogo de endereços {addressbook}",
+    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "Um <strong>contato</strong> ou <strong>catálogo de endereços</strong> foi modificado",
    "Accounts" : "Contas",
    "System address book which holds all accounts" : "Catálogo de endereços do sistema que contém todas as contas",
    "File is not updatable: %1$s" : "O arquivo não é atualizável: %1$s",
    "Failed to get storage for file" : "Falha ao obter armazenamento para arquivo",
-    "Could not write to final file, canceled by hook" : "Não foi possível gravar no arquivo final, cancelado pelo gancho",
+    "Could not write to final file, canceled by hook" : "Não foi possível gravar no arquivo final, cancelado pelo hook",
    "Could not write file contents" : "Não foi possível gravar o conteúdo do arquivo",
    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
    "Error while copying file to target location (copied: %1$s, expected filesize: %2$s)" : "Erro ao copiar o arquivo para o local de destino (copiado: %1$s, tamanho de arquivo esperado: %2$s)",
-    "Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side." : "Tamanho de arquivo esperado de %1$s mas lido (do cliente Nextcloud) e gravado (no armazenamento Nextcloud) %2$s. Pode ser um problema de rede no lado de envio ou um problema de gravação no armazenamento no lado do servidor.",
-    "Could not rename part file to final file, canceled by hook" : "Não foi possível renomear o arquivo de parte para o arquivo final, cancelado pelo gancho",
-    "Could not rename part file to final file" : "Não foi possível renomear o arquivo de parte para o arquivo final",
+    "Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side." : "Tamanho de arquivo esperado de %1$s, mas lido (do cliente Nextcloud) e gravado (no armazenamento Nextcloud) %2$s. Pode ser um problema de rede no lado de envio ou um problema de gravação no armazenamento no lado do servidor.",
+    "Could not rename part file to final file, canceled by hook" : "Não foi possível renomear o arquivo de peça para o arquivo final, cancelado pelo hook",
+    "Could not rename part file to final file" : "Não foi possível renomear o arquivo de peça para o arquivo final",
    "Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
    "Could not open file: %1$s, file does seem to exist" : "Não foi possível abrir o arquivo: %1$s, o arquivo parece existir",
    "Could not open file: %1$s, file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s, o arquivo parece não existir",
@@ -236,7 +236,7 @@
    "Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
    "Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
    "Failed to write file contents: %1$s" : "Falha ao gravar o conteúdo do arquivo:%1$s",
-    "File not found: %1$s" : "Arquivo não encontrado:%1$s",
+    "File not found: %1$s" : "Arquivo não encontrado: %1$s",
    "Invalid target path" : "Caminho de destino inválido",
    "System is in maintenance mode." : "O sistema está em modo de manutenção",
    "Upgrade needed" : "Upgrade necessário",
@@ -251,9 +251,9 @@
    "System Address Book" : "Catálogo de Endereços do Sistema",
    "The system address book contains contact information for all users in your instance." : "O catálogo de endereços do sistema contém informações de contato de todos os usuários da sua instância.",
    "Enable System Address Book" : "Ativar Catálogo de Endereços do Sistema",
-    "DAV system address book" : "Livro de endereços DAV do sistema",
-    "No outstanding DAV system address book sync." : "Não há nenhum livro de endereços DAV sendo sincronizado.",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "A sincronização do catálogo de endereços do sistema DAV ainda não foi executada porque sua instância tem mais de 1000 usuários ou porque ocorreu um erro. Execute-o manualmente chamando \"occ dav:sync-system-addressbook\".",
+    "DAV system address book" : "Catálogo de endereços DAV do sistema",
+    "No outstanding DAV system address book sync." : "Não há sincronização pendente do catálogo de endereços DAV do sistema.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "A sincronização do catálogo de endereços DAV do sistema ainda não foi executada porque sua instância tem mais de 1000 usuários ou porque ocorreu um erro. Execute-a manualmente chamando \"occ dav:sync-system-addressbook\".",
    "WebDAV endpoint" : "Endpoint WebDAV",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Não foi possível verificar se o seu servidor web está configurado corretamente para permitir a sincronização de arquivos via WebDAV. Verifique manualmente.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, porque a interface do WebDAV parece estar quebrada.",
@@ -264,16 +264,16 @@
    "WebDAV" : "WebDAV",
    "Absence saved" : "Ausência salva",
    "Failed to save your absence settings" : "Falha ao salvar suas configurações de ausência",
-    "Absence cleared" : "Ausência apagada",
+    "Absence cleared" : "Limpou a ausência",
    "Failed to clear your absence settings" : "Falha ao limpar suas configurações de ausência",
    "First day" : "Primeiro dia",
    "Last day (inclusive)" : "Último dia (inclusive)",
-    "Out of office replacement (optional)" : "Substituição fora do escritório (opcional)",
+    "Out of office replacement (optional)" : "Substituto durante sua ausência (opcional)",
    "Name of the replacement" : "Nome do substituto",
    "No results." : "Nenhum resultado.",
    "Start typing." : "Comece a digitar.",
-    "Short absence status" : "Status para ausência breve",
-    "Long absence Message" : "Mensagem longa de ausência",
+    "Short absence status" : "Status curto sobre a ausência",
+    "Long absence Message" : "Mensagem longa sobre a ausência",
    "Save" : "Salvar",
    "Disable absence" : "Desativar ausência",
    "Failed to load availability" : "Falha ao carregar a disponibilidade",
@@ -301,18 +301,18 @@
    "Hence they will not be available immediately after enabling but will show up after some time." : "Portanto, eles não estarão disponíveis imediatamente após a ativação, mas depois de algum tempo.",
    "Send notifications for events" : "Enviar notificações para eventos",
    "Notifications are sent via background jobs, so these must occur often enough." : "As notificações são enviadas via trabalhos em segundo plano, portanto, elas devem ocorrer com frequência suficiente.",
-    "Send reminder notifications to calendar sharees as well" : "Envie notificações de lembrete para compartilhamentos de calendário também",
-    "Reminders are always sent to organizers and attendees." : "Os lembretes são sempre enviados aos organizadores e participantes.",
+    "Send reminder notifications to calendar sharees as well" : "Enviar notificações de lembrete também para os compartilhadores de calendário",
+    "Reminders are always sent to organizers and attendees." : "Lembretes são sempre enviados aos organizadores e participantes.",
    "Enable notifications for events via push" : "Ativar notificações para eventos via push",
    "Cancel" : "Cancelar",
    "Import" : "Importar",
-    "Error while saving settings" : "Error while saving settings",
+    "Error while saving settings" : "Erro ao salvar as configurações",
    "Contact reset successfully" : "O contato foi reiniciado com sucesso",
    "Error while resetting contact" : "Erro ao reiniciar o contato",
    "Contact imported successfully" : "O contato foi importado com sucesso",
    "Error while importing contact" : "Erro ao importar o contato",
-    "Example Content" : "Conteúdo de Exemplo",
-    "Set example content to be created on new user first login." : "Defina o conteúdo de exemplo a ser criado no primeiro login do novo usuário.",
+    "Example Content" : "Exemplo de Conteúdo",
+    "Set example content to be created on new user first login." : "Defina o exemplo de conteúdo a ser criado no primeiro login do novo usuário.",
    "Import contact" : "Importar contato",
    "Reset to default contact" : "Redefinir para o contato padrão",
    "Import contacts" : "Importar contatos",
@@ -323,8 +323,8 @@
    "Tentative" : "Tentativa",
    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso.",
    "Time:" : "Horário:",
-    "Could not open file" : "Não pode abrir o arquivo",
-    "Invalid chunk name" : "Nome do bloco inválido",
-    "Could not rename part file assembled from chunks" : "Não foi possível renomear parte do arquivo montado a partir de pedaços"
+    "Could not open file" : "Não foi possível abrir o arquivo",
+    "Invalid chunk name" : "Nome de pedaço inválido",
+    "Could not rename part file assembled from chunks" : "Não foi possível renomear o arquivo de peça montado a partir de pedaços"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
--- a/Show More
+++ b/Show More