fix: make failed availability check apply in the same request

Signed-off-by: Robin Appelman <robin@icewind.nl>

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -3,43 +3,48 @@ name: 🚀 Feature request
 about: Suggest an idea for this project
 labels: enhancement, 0. Needs triage
 type: "Enhancement"
+
 ---
 
 <!--
-Have a security concern? Please report potential security issues via our HackerOne program (https://hackerone.com/nextcloud) instead of filing a public GitHub issue. See our security policy: https://nextcloud.com/security/
+Thanks for reporting issues back to Nextcloud!
+
+Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
+
+Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
+
+Guidelines for submitting issues:
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
+    - You can also filter by appending e. g. "state:open" to the search string.
+    - More info on search syntax within github: https://help.github.com/articles/searching-issues
+    
+* This repository https://github.com/nextcloud/server/issues is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+  
+* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
+
+* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
 -->
 
-<!--
-Thanks for taking the time to suggest improvements to Nextcloud! Use this form to request features or propose enhancements.
 
-Guidelines:
+<!--- Please keep this note for other contributors -->
 
-* Please search existing issues first; your idea may already have been discussed or implemented.
-* This repository (https://github.com/nextcloud/server/issues) is only for issues within the Nextcloud Server code. This includes shipped apps such as Files, DAV, Encryption, External Storage, Sharing, Deleted Files, Versions, Federation, and LDAP.
-* Issues for other components should be reported in their respective repositories in the Nextcloud GitHub organization: https://github.com/nextcloud/
-* Nextcloud is an open source project backed by Nextcloud GmbH. Many contributors are volunteers and primarily focus on issues affecting home users. Paid engineers prioritize customer-reported issues and critical defects.
-* This is the development issue tracker. Please do NOT use it for support questions or help diagnosing your installation.
-  - For community/user help: https://help.nextcloud.com
-  - For professional / large deployment support options: https://nextcloud.com/support
--->
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
 
-<!-- Please keep the note below for other contributors -->
-> [!TIP]
-> ### Help move this idea forward
-> * Use the 👍 reaction to show support for this feature.
-> * Avoid commenting unless you have relevant information to add; unnecessary comments create noise for subscribers.
-> * Subscribe to receive notifications about status changes and new comments.
----
-<!-- DO NOT EDIT ABOVE THIS LINE -->
 
 **Is your feature request related to a problem? Please describe.**
-<!-- Provide a clear and concise description of the problem. For example: “I'm always frustrated when …” -->
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
-<!-- Provide a clear and concise description of what you want to happen. -->
+A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-<!-- Provide a clear and concise description of any alternative solutions or features you've considered. -->
+A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-<!-- Add any other context or screenshots related to the feature request here. -->
+Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -53,15 +53,6 @@ updates:
     - "feature: dependencies"
   # Disable automatic rebasing because without a build CI will likely fail anyway
   rebase-strategy: "disabled"
-  groups:
-    vite:
-      patterns:
-        - "vite"
-        - "@nextcloud/vite-config"
-    vitest:
-      patterns:
-        - "vitest"
-        - "@vitest/*"
 
 # Latest stable release
 # Composer dependencies for linting and testing

.github/workflows/autocheckers.yml

@@ -52,13 +52,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         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
@@ -81,13 +81,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         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

.github/workflows/block-merge-eol.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Set server major version environment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -37,13 +37,13 @@ jobs:
             if (match) {
               console.log('Setting server_major to ' + match[1]);
               core.exportVariable('server_major', match[1]);
-              console.log('Setting current_day to ' + (new Date()).toISOString().substr(0, 10));
-              core.exportVariable('current_day', (new Date()).toISOString().substr(0, 10));
+              console.log('Setting current_month to ' + (new Date()).toISOString().substr(0, 7));
+              core.exportVariable('current_month', (new Date()).toISOString().substr(0, 7));
             }
 
       - name: Checking if server ${{ env.server_major }} is EOL
         if: ${{ env.server_major != '' }}
         run: |
           curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \
-            | jq '.["${{ env.server_major }}"]["eol"] // "9999-99-99" | . >= "${{ env.current_day }}"' \
+            | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \
             | grep -q true

.github/workflows/block-merge-freeze.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Register server reference to fallback to master branch
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/block-outdated-3rdparty.yml

@@ -31,7 +31,7 @@ jobs:
               - 'version.php'
 
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -41,7 +41,7 @@ jobs:
           echo "commit=$(git submodule status | grep ' 3rdparty' | egrep -o '[a-f0-9]{40}')" >> "$GITHUB_OUTPUT"
 
       - name: Register server reference to fallback to master branch
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/block-unconventional-commits.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/codeql.yml

@@ -32,18 +32,18 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         persist-credentials: false
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+      uses: github/codeql-action/init@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         config-file: ./.github/codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+      uses: github/codeql-action/analyze@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/command-compile.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Get repository from pull request comment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         id: get-repository
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
@@ -57,7 +57,7 @@ jobs:
           require: write
 
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -83,7 +83,7 @@ jobs:
         id: comment-branch
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -103,7 +103,7 @@ jobs:
           key: git-repo
 
       - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           # Needed to allow force push later
           persist-credentials: true
@@ -120,11 +120,11 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: package-engines-versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
           cache: npm
@@ -136,26 +136,26 @@ jobs:
         if: ${{ contains(needs.init.outputs.arg1, 'rebase') }}
         run: |
           git fetch origin '${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}'
-
+          
           # Start the rebase
           git rebase 'origin/${{ needs.init.outputs.base_ref }}' || {
             # Handle rebase conflicts in a loop
             while [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; do
               echo "Handling rebase conflict..."
-
+              
               # Remove and checkout /dist and /js folders from the base branch
               if [ -d "dist" ]; then
                 rm -rf dist
                 git checkout origin/${{ needs.init.outputs.base_ref }} -- dist/ 2>/dev/null || echo "No dist folder in base branch"
               fi
               if [ -d "js" ]; then
-                rm -rf js
+                rm -rf js  
                 git checkout origin/${{ needs.init.outputs.base_ref }} -- js/ 2>/dev/null || echo "No js folder in base branch"
               fi
-
+              
               # Stage all changes
               git add .
-
+              
               # Check if there are any changes after resolving conflicts
               if git diff --cached --quiet; then
                 echo "No changes after conflict resolution, skipping commit"
@@ -164,7 +164,7 @@ jobs:
                 echo "Changes found, continuing rebase without editing commit message"
                 git -c core.editor=true rebase --continue
               fi
-
+              
               # Break if rebase is complete
               if [ ! -d .git/rebase-merge ] && [ ! -d .git/rebase-apply ]; then
                 break
@@ -213,7 +213,7 @@ jobs:
         run: git push --force-with-lease origin "$HEAD_REF"
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/command-pull-3rdparty.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v3.0.1
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v3.0.1
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -38,7 +38,7 @@ jobs:
         id: comment-branch
 
       - name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -46,7 +46,7 @@ jobs:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
       - name: Register server reference to fallback to master branch
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -71,7 +71,7 @@ jobs:
           git config --local user.name 'nextcloud-command'
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v3.0.1
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v3.0.1
         if: ${{ env.server_ref == '' }}
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -91,7 +91,7 @@ jobs:
           git push
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v3.0.1
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v3.0.1
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/cypress.yml

@@ -22,7 +22,7 @@ env:
   # Usually it's the base branch of the PR, but for pushes it's the branch itself.
   # e.g. 'main', 'stable27' or 'feature/my-feature'
   # n.b. server will use head_ref, as we want to test the PR branch.
-  BRANCH: ${{ github.base_ref || github.ref_name }}
+  BRANCH: ${{ github.head_ref || github.ref_name }}
 
 
 permissions:
@@ -48,7 +48,7 @@ jobs:
           exit 1
 
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           # We need to checkout submodules for 3rdparty
@@ -58,7 +58,7 @@ jobs:
         id: check_composer
         uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
-          files: 'composer.json'
+          files: "composer.json"
 
       - name: Install composer dependencies
         if: steps.check_composer.outputs.files_exists == 'true'
@@ -68,11 +68,11 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: "^20"
+          fallbackNpm: "^10"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -84,6 +84,9 @@ jobs:
           npm ci
           TESTING=true npm run build --if-present
 
+      - name: Show cypress version
+        run: npm run cypress:version
+
       - name: Save context
         uses: buildjet/cache/save@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2
         with:
@@ -160,7 +163,7 @@ jobs:
           path: ./
 
       - name: Set up node ${{ needs.init.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ needs.init.outputs.nodeVersion }}
 
@@ -171,7 +174,7 @@ jobs:
         run: ./node_modules/cypress/bin/cypress install
 
       - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@7ef72e250a9e564efb4ed4c2433971ada4cc38b4 # v6.10.4
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
         with:
           # We already installed the dependencies in the init job
           install: false
@@ -195,10 +198,10 @@ jobs:
           SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}
 
       - name: Upload snapshots and videos
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
-          name: snapshots_${{ matrix.containers }}
+          name: snapshots_videos_${{ matrix.containers }}
           path: |
             cypress/snapshots
             cypress/videos
@@ -217,8 +220,8 @@ jobs:
         if: failure() && matrix.containers != 'component'
         run: docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} tar -cvjf - data > data.tar
 
-      - name: Upload data archive
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      - name: Upload data dir archive
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: failure() && matrix.containers != 'component'
         with:
           name: nc_data_${{ matrix.containers }}

.github/workflows/dependabot-approve-merge.yml

@@ -3,10 +3,10 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
-# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 
-name: Auto approve Dependabot PRs
+name: Dependabot
 
 on:
   pull_request_target: # zizmor: ignore[dangerous-triggers]
@@ -29,8 +29,6 @@ jobs:
     permissions:
       # for hmarr/auto-approve-action to approve PRs
       pull-requests: write
-      # for alexwilson/enable-github-automerge-action to approve PRs
-      contents: write
 
     steps:
       - name: Disabled on forks
@@ -39,20 +37,13 @@ jobs:
           echo 'Can not approve PRs from forks'
           exit 1
 
-      - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
-        id: branchname
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       # GitHub actions bot approve
-      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
-        if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
+      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      # Enable GitHub auto merge
-      - name: Auto merge
-        uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
-        if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
+      # Nextcloud bot approve and merge request
+      - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          target: minor
+          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/files-external-ftp.yml

@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
@@ -71,7 +71,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@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -104,7 +104,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-ftp

.github/workflows/files-external-s3.yml

@@ -64,13 +64,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -104,7 +104,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-s3
@@ -152,13 +152,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -185,7 +185,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-s3

.github/workflows/files-external-sftp.yml

@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
@@ -67,7 +67,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@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -93,7 +93,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-sftp

.github/workflows/files-external-smb-kerberos.yml

@@ -46,13 +46,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Checkout user_saml
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: nextcloud/user_saml

.github/workflows/files-external-smb.yml

@@ -59,13 +59,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -99,7 +99,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-smb

.github/workflows/files-external-webdav.yml

@@ -60,13 +60,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -97,7 +97,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-webdav

.github/workflows/files-external.yml

@@ -53,13 +53,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -85,7 +85,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-generic

.github/workflows/generate-release-changelog.yml

@@ -24,14 +24,14 @@ jobs:
           require: write
 
       - name: Checkout github_helper
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: nextcloud/github_helper
           path: github_helper
 
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           path: server
@@ -73,7 +73,7 @@ jobs:
          fi
 
       - name: Set up php 8.2
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: 8.2
           coverage: none

.github/workflows/integration-dav.yml

@@ -53,13 +53,13 @@ jobs:
 
     steps:
         - name: Checkout server
-          uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+          uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
           with:
             persist-credentials: false
             submodules: true
 
         - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+          uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
           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:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
         - name: Set up Python
-          uses: LizardByte/actions/actions/setup_python@329b1bcefe1cbe1ef289177471c9f2b2af98e6ca # v2025.1028.23217
+          uses: LizardByte/actions/actions/setup_python@bff0a193747a3ac7930a665fc1d4b23eba583b99 # v2025.814.40518
           with:
             python-version: '2.7'
 

.github/workflows/integration-litmus.yml

@@ -52,13 +52,13 @@ jobs:
 
     steps:
         - name: Checkout server
-          uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+          uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
           with:
             persist-credentials: false
             submodules: true
 
         - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+          uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
           with:
             php-version: ${{ matrix.php-versions }}
             # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/integration-s3-primary.yml

@@ -67,13 +67,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/integration-sqlite.yml

@@ -62,7 +62,6 @@ jobs:
           - '--tags ~@large files_features'
           - 'filesdrop_features'
           - 'file_conversions'
-          - 'files_reminders'
           - 'openldap_features'
           - 'openldap_numerical_features'
           - 'ldap_features'
@@ -97,14 +96,14 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Checkout Talk app
         if: ${{ matrix.test-suite == 'videoverification_features' }}
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: nextcloud/spreed
@@ -113,7 +112,7 @@ jobs:
 
       - name: Checkout Activity app
         if: ${{ matrix.test-suite == 'sharing_features' }}
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: nextcloud/activity
@@ -121,7 +120,7 @@ jobs:
           ref: ${{ matrix.activity-versions }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/lint-eslint.yml

@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -64,11 +64,11 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/lint-php-cs.yml

@@ -44,18 +44,18 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    name: php-cs
+    name: PHP CS fixer lint
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
-      - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+      - name: Set up php8.1
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
-          php-version: 8.2
+          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
           coverage: none
           ini-file: development

.github/workflows/lint-php.yml

@@ -53,15 +53,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         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
           coverage: none
           ini-file: development
         env:

.github/workflows/lint-stylelint.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -33,11 +33,11 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/node-test-handlebars.yml

@@ -1,99 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-#
-# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: MIT
-
-name: Node handlebars tests
-
-on:
-  pull_request:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: node-tests-handlebars-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest-low
-    permissions:
-      contents: read
-      pull-requests: read
-
-    outputs:
-      src: ${{ steps.changes.outputs.src }}
-
-    steps:
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - '.github/workflows/**'
-              - '**/__tests__/**'
-              - '**/__mocks__/**'
-              - 'apps/*/src/**'
-              - 'apps/*/appinfo/info.xml'
-              - 'core/src/**'
-              - 'package.json'
-              - '**/package-lock.json'
-              - 'tsconfig.json'
-              - '**.js'
-              - '**.ts'
-              - '**.vue'
-
-  handlebars:
-    runs-on: ubuntu-latest
-    needs: [changes]
-    if: needs.changes.outputs.src != 'false'
-
-    env:
-      CYPRESS_INSTALL_BINARY: 0
-      PUPPETEER_SKIP_DOWNLOAD: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
-        with:
-          persist-credentials: false
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
-        id: versions
-        with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
-
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
-        with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run compile
-        run: ./build/compile-handlebars-templates.sh
-
-  summary:
-    permissions:
-      contents: none
-    runs-on: ubuntu-latest-low
-    needs: [changes, handlebars]
-
-    if: always()
-
-    name: test-summary
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.handlebars.result != 'success' }}; then exit 1; fi

.github/workflows/node-test.yml

@@ -44,21 +44,25 @@ jobs:
               - 'apps/*/appinfo/info.xml'
               - 'core/src/**'
               - 'package.json'
-              - '**/package-lock.json'
+              - 'package-lock.json'
               - 'tsconfig.json'
               - '**.js'
               - '**.ts'
               - '**.vue'
 
-  test:
-    runs-on: ubuntu-latest
-
+  versions:
+    runs-on: ubuntu-latest-low
     needs: changes
-    if: needs.changes.outputs.src != 'false'
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}
+
+    outputs:
+      nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
+      npmVersion: ${{ steps.versions.outputs.npmVersion }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -66,39 +70,85 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+  test:
+    runs-on: ubuntu-latest
+    needs: [versions, changes]
+
+    if: ${{ needs.versions.result != 'failure' && needs.changes.outputs.src != 'false' }}
+
+    env:
+      CYPRESS_INSTALL_BINARY: 0
+      PUPPETEER_SKIP_DOWNLOAD: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
+          persist-credentials: false
 
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
+      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        with:
+          node-version: ${{ needs.versions.outputs.nodeVersion }}
 
-      - name: Install dependencies
-        env:
-          CYPRESS_INSTALL_BINARY: 0
+      - name: Set up npm ${{ needs.versions.outputs.npmVersion }}
+        run: npm i -g 'npm@${{ needs.versions.outputs.npmVersion }}'
+
+      - name: Install dependencies & build
         run: |
           npm ci
-
-#      - name: Test
-#        run: npm run test --if-present
+          npm run build --if-present
 
       - name: Test and process coverage
-        run: npm run test:coverage
+        run: npm run test:coverage --if-present
 
       - name: Collect coverage
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
-          files: ./coverage/lcov.info,./coverage/legacy/lcov.info
+          files: ./coverage/lcov.info
+
+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+
+  handlebars:
+    runs-on: ubuntu-latest
+    needs: [versions, changes]
+
+    if: ${{ needs.versions.result != 'failure' && needs.changes.outputs.src != 'false' }}
+
+    env:
+      CYPRESS_INSTALL_BINARY: 0
+      PUPPETEER_SKIP_DOWNLOAD: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+
+      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        with:
+          node-version: ${{ needs.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ needs.versions.outputs.npmVersion }}
+        run: npm i -g 'npm@${{ needs.versions.outputs.npmVersion }}'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run compile
+        run: ./build/compile-handlebars-templates.sh
 
   summary:
     permissions:
       contents: none
     runs-on: ubuntu-latest-low
-    needs: [changes, test]
+    needs: [changes, test, handlebars]
 
     if: always()
 
@@ -106,4 +156,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.test.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.changes.outputs.src != 'false' && (needs.test.result != 'success' || needs.handlebars.result != 'success') }}; then exit 1; fi

.github/workflows/node.yml

@@ -37,14 +37,14 @@ jobs:
               - '.github/workflows/**'
               - '**/src/**'
               - '**/appinfo/info.xml'
-              - 'core/css/*'
-              - 'core/img/**'
               - 'package.json'
-              - '**/package-lock.json'
+              - 'package-lock.json'
               - 'tsconfig.json'
               - '**.js'
               - '**.ts'
               - '**.vue'
+              - 'core/css/*'
+              - 'core/img/**'
               - 'version.php'
 
   build:
@@ -56,7 +56,7 @@ jobs:
     name: NPM build
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -64,24 +64,17 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
         run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
-      # This does not work on server as we have some git dependencies that "npm-package-lock-add-resolved" cannot handle
-      # - name: Validate package-lock.json # See https://github.com/npm/cli/issues/4460
-      #   run: |
-      #     npm i -g npm-package-lock-add-resolved@1.1.4
-      #     npm-package-lock-add-resolved
-      #     git --no-pager diff --exit-code
-
       - name: Install dependencies & build
         env:
           CYPRESS_INSTALL_BINARY: 0
@@ -90,7 +83,7 @@ jobs:
           npm ci
           npm run build --if-present
 
-      - name: Check build changes
+      - name: Check webpack build changes
         run: |
           bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
 

.github/workflows/npm-audit-fix.yml

@@ -24,17 +24,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches:
-          - ${{ github.event.repository.default_branch }}
-          - 'stable32'
-          - 'stable31'
+        branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
 
     name: npm-audit-fix-${{ matrix.branches }}
 
     steps:
       - name: Checkout
         id: checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           ref: ${{ matrix.branches }}
@@ -44,11 +41,11 @@ jobs:
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
-          fallbackNode: '^24'
-          fallbackNpm: '^11.3'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -69,7 +66,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.checkout.outcome == 'success'
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: 'fix(deps): Fix npm audit'

.github/workflows/object-storage-azure.yml

@@ -73,13 +73,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -110,7 +110,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-azure

.github/workflows/object-storage-s3.yml

@@ -74,13 +74,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-s3

.github/workflows/object-storage-swift.yml

@@ -71,13 +71,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -106,7 +106,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-swift

.github/workflows/openapi.yml

@@ -26,12 +26,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: '8.2'
           extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib

.github/workflows/performance.yml

@@ -35,14 +35,14 @@ jobs:
           exit 1
 
       - name: Checkout server before PR
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
           ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         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
@@ -98,14 +98,14 @@ jobs:
 
       - name: Upload profiles
         if: always()
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: profiles
           path: |
             before.json
             after.json
 
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v7
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         if: failure() && steps.compare.outcome == 'failure'
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/phpunit-32bits.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
@@ -46,7 +46,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@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite, apcu, ldap
@@ -68,4 +68,4 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test -- --exclude-group PRIMARY-azure --exclude-group PRIMARY-s3 --exclude-group PRIMARY-swift --exclude-group Memcached --exclude-group Redis --exclude-group RoutingWeirdness
+        run: composer run test -- --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness

.github/workflows/phpunit-mariadb.yml

@@ -90,13 +90,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -129,7 +129,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mariadb

.github/workflows/phpunit-memcached.yml

@@ -72,13 +72,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -99,11 +99,11 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml ${{ 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@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.xml
           flags: phpunit-memcached

.github/workflows/phpunit-mysql-sharding.yml

@@ -121,13 +121,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -161,7 +161,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mysql

.github/workflows/phpunit-mysql.yml

@@ -90,13 +90,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -129,7 +129,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mysql

.github/workflows/phpunit-nodb.yml

@@ -75,13 +75,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -105,11 +105,11 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml ${{ 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@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.nodb.xml
           flags: phpunit-nodb

.github/workflows/phpunit-object-store-primary.yml

@@ -72,13 +72,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         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

.github/workflows/phpunit-oci.yml

@@ -60,6 +60,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - oracle-versions: '11'
+            php-versions: '8.2'
           - oracle-versions: '18'
             php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
@@ -99,13 +101,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -131,7 +133,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-oci

.github/workflows/phpunit-pgsql.yml

@@ -61,13 +61,13 @@ jobs:
       matrix:
         php-versions: ['8.2']
         # To keep the matrix smaller we ignore PostgreSQL versions in between as we already test the minimum and the maximum
-        postgres-versions: ['14', '18']
+        postgres-versions: ['13', '17']
         include:
           - php-versions: '8.3'
-            postgres-versions: '18'
+            postgres-versions: '17'
             coverage: ${{ github.event_name != 'pull_request' }}
           - php-versions: '8.4'
-            postgres-versions: '18'
+            postgres-versions: '17'
 
     name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -86,17 +86,17 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: rootpassword
           POSTGRES_DB: nextcloud
-        options: --mount type=tmpfs,destination=/var/lib/postgresql --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
+        options: --mount type=tmpfs,destination=/var/lib/postgresql/data --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -124,7 +124,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-postgres

.github/workflows/phpunit-sqlite.yml

@@ -75,13 +75,13 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -110,7 +110,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: ./clover.db.xml
           flags: phpunit-sqlite

.github/workflows/pr-feedback.yml

@@ -36,7 +36,7 @@ jobs:
           blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
           echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
 
-      - uses: nextcloud/pr-feedback-action@f0cab224dea8e1f282f9451de322f323c78fc7a5 # main
+      - uses: nextcloud/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4 # main
         with:
           feedback-message: |
             Hello there,
@@ -50,6 +50,6 @@ jobs:
 
             (If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
           days-before-feedback: 14
-          start-date: '2025-06-12'
+          start-date: '2024-04-30'
           exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
           exempt-bots: true

.github/workflows/reuse.yml

@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest-low
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0
+        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0

.github/workflows/stale.yml

@@ -20,7 +20,7 @@ jobs:
       issues: write
 
     steps:
-    - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v9
+    - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v9
       with:
         repo-token: ${{ secrets.COMMAND_BOT_PAT }}
         stale-issue-message: >

.github/workflows/static-code-analysis.yml

@@ -28,13 +28,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: '8.2'
           extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -59,13 +59,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -83,7 +83,7 @@ jobs:
 
       - name: Upload Security Analysis results to GitHub
         if: always()
-        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
         with:
           sarif_file: results.sarif
 
@@ -94,13 +94,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -125,13 +125,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           persist-credentials: false
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f #v2.35.5
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
           php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip

.github/workflows/update-cacert-bundle.yml

@@ -22,7 +22,7 @@ jobs:
     name: update-ca-certificate-bundle-${{ matrix.branches }}
 
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           ref: ${{ matrix.branches }}
@@ -32,7 +32,7 @@ jobs:
         run: curl --etag-compare build/ca-bundle-etag.txt --etag-save build/ca-bundle-etag.txt --output resources/config/ca-bundle.crt https://curl.se/ca/cacert.pem
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: 'fix(security): Update CA certificate bundle'

.github/workflows/update-code-signing-crl.yml

@@ -22,7 +22,7 @@ jobs:
     name: update-code-signing-crl-${{ matrix.branches }}
 
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           ref: ${{ matrix.branches }}
@@ -35,7 +35,7 @@ jobs:
         run: openssl crl -verify -in resources/codesigning/root.crl -CAfile resources/codesigning/root.crt -noout
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: 'fix(security): Update code signing revocation list'

.github/workflows/update-min-supported-desktop.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest-low
 
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           submodules: true
@@ -107,7 +107,7 @@ jobs:
           fi
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         if: steps.update-files.outputs.CHANGES_MADE == 'true'
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/update-stable-titles.yml

@@ -24,7 +24,7 @@ jobs:
         run: sleep 15
 
       - name: Get PR details and update title
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.htaccess

@@ -1,178 +1,100 @@
 <IfModule mod_headers.c>
-    <IfModule mod_setenvif.c>
-        <IfModule mod_fcgid.c>
-            SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
-            RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
-        </IfModule>
-        <IfModule mod_proxy_fcgi.c>
-            SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
-        </IfModule>
-        <IfModule mod_lsapi.c>
-            SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
-            RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
-        </IfModule>
+  <IfModule mod_setenvif.c>
+    <IfModule mod_fcgid.c>
+       SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+       RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
     </IfModule>
-
-    <IfModule mod_env.c>
-        # Add security and privacy related headers
-        # Avoid doubled headers by unsetting headers in "onsuccess" table,
-        # then add headers to "always" table: https://github.com/nextcloud/server/pull/19002
-
-        <If "%{REQUEST_URI} =~ m#/login$#">
-            # Only on the login page we need any Origin or Referer header set.
-            Header onsuccess unset Referrer-Policy
-            Header always set Referrer-Policy "same-origin"
-        </If>
-        <Else>
-            Header onsuccess unset Referrer-Policy
-            Header always set Referrer-Policy "no-referrer"
-        </Else>
-
-        Header onsuccess unset X-Content-Type-Options
-        Header always set X-Content-Type-Options "nosniff"
-
-        Header onsuccess unset X-Frame-Options
-        Header always set X-Frame-Options "SAMEORIGIN"
-
-        Header onsuccess unset X-Permitted-Cross-Domain-Policies
-        Header always set X-Permitted-Cross-Domain-Policies "none"
-
-        Header onsuccess unset X-Robots-Tag
-        Header always set X-Robots-Tag "noindex, nofollow"
-
-        SetEnv modHeadersAvailable true
+    <IfModule mod_proxy_fcgi.c>
+       SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
     </IfModule>
+    <IfModule mod_lsapi.c>
+      SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+      RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+    </IfModule>
+  </IfModule>
 
-    # Add cache control for static resources
-    <FilesMatch "\.(css|js|mjs|svg|gif|png|jpg|webp|ico|wasm|tflite)$">
-        <If "%{QUERY_STRING} =~ /(^|&)v=/">
-            Header set Cache-Control "max-age=15778463, immutable"
-        </If>
-        <Else>
-            Header set Cache-Control "max-age=15778463"
-        </Else>
-    </FilesMatch>
+  <IfModule mod_env.c>
+    # Add security and privacy related headers
+    # Avoid doubled headers by unsetting headers in "onsuccess" table,
+    # then add headers to "always" table: https://github.com/nextcloud/server/pull/19002
 
-    # Let browsers cache OTF and WOFF files for a week
-    <FilesMatch "\.(otf|woff2?)$">
-        Header set Cache-Control "max-age=604800"
-    </FilesMatch>
+    <If "%{REQUEST_URI} =~ m#/login$#">
+      # Only on the login page we need any Origin or Referer header set.
+      Header onsuccess unset Referrer-Policy
+      Header always set Referrer-Policy "same-origin"
+    </If>
+    <Else>
+      Header onsuccess unset Referrer-Policy
+      Header always set Referrer-Policy "no-referrer"
+    </Else>
+
+    Header onsuccess unset X-Content-Type-Options
+    Header always set X-Content-Type-Options "nosniff"
+
+    Header onsuccess unset X-Frame-Options
+    Header always set X-Frame-Options "SAMEORIGIN"
+
+    Header onsuccess unset X-Permitted-Cross-Domain-Policies
+    Header always set X-Permitted-Cross-Domain-Policies "none"
+
+    Header onsuccess unset X-Robots-Tag
+    Header always set X-Robots-Tag "noindex, nofollow"
+
+    SetEnv modHeadersAvailable true
+  </IfModule>
+
+  # Add cache control for static resources
+  <FilesMatch "\.(css|js|mjs|svg|gif|png|jpg|webp|ico|wasm|tflite)$">
+    <If "%{QUERY_STRING} =~ /(^|&)v=/">
+      Header set Cache-Control "max-age=15778463, immutable"
+    </If>
+    <Else>
+      Header set Cache-Control "max-age=15778463"
+    </Else>
+  </FilesMatch>
+
+  # Let browsers cache OTF and WOFF files for a week
+  <FilesMatch "\.(otf|woff2?)$">
+    Header set Cache-Control "max-age=604800"
+  </FilesMatch>
 </IfModule>
 
 <IfModule mod_php.c>
-    php_value default_charset 'UTF-8'
-    php_value output_buffering 0
-    <IfModule mod_env.c>
-        SetEnv htaccessWorking true
-    </IfModule>
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
 </IfModule>
 
 <IfModule mod_mime.c>
-    AddType image/svg+xml svg svgz
-    AddType application/wasm wasm
-    AddEncoding gzip svgz
-    # Serve ESM javascript files (.mjs) with correct mime type
-    AddType text/javascript js mjs
+  AddType image/svg+xml svg svgz
+  AddType application/wasm wasm
+  AddEncoding gzip svgz
+  # Serve ESM javascript files (.mjs) with correct mime type
+  AddType text/javascript js mjs
 </IfModule>
 
 <IfModule mod_dir.c>
-    DirectoryIndex index.php index.html
+  DirectoryIndex index.php index.html
 </IfModule>
 
 <IfModule pagespeed_module>
-    ModPagespeed Off
+  ModPagespeed Off
 </IfModule>
 
-#############
-#### Rewrites
-#############
-
 <IfModule mod_rewrite.c>
-    RewriteEngine on
-
-##
-## Rule: Workaround for WebDAV with apache+php-cgi
-##
-## Context:
-##    - Sets the environment variable `HTTP_AUTHORIZATION` to the value of the `Authorization` request header
-##    - Always executed before and along with other rules (no `L` used)
-##    - XXX: *May* be replaced with an equivalent SetEnvIf in theory
-##    - XXX: SetEnvIf approach is already in use above for mod_proxy_cgi / mod_lsapi / mod_fcgid
-##
-
-    RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-##
-## Rule: Workaround for WebDAV with MS DavClnt
-##
-## Context: 
-##    - DavClnt attempts an OPTIONS request against `/` instead of the specified endpoint
-##    - Redirects the client to the endpoint rather than the login page (which confuses DavClnt)
-##
-
-    RewriteCond %{HTTP_USER_AGENT} DavClnt
-    RewriteRule ^$ /remote.php/webdav/ [L,R=302]
-
-##
-## Rule: Map the RFC 8615 / RFC 6764 compliant well-known URI for CardDAV to our Remote DAV endpoint
-##
-
-    RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
-
-##
-## Rule: Map the RFC 8615 / RFC 6764 compliant well-known URI for CalDAV to our Remote DAV endpoint
-##
-
-    RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
-
-##
-## Rule: Map /remote* --> /remote.php* including the query string
-##
-## Context:
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
-##    - XXX: Is this even used anymore? Seems a relic from <NC12
-##
-
-    RewriteRule ^remote/(.*) remote.php [QSA,L]
-
-##
-## Rule: Prevent access to non-public files
-##
-
-    RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-
-##
-## Rule: Maps most RFC 8615 compliant well-known URIs to our main frontend controller (/index.php) by default
-##
-## Context:
-##    - Intentionally excludes URIs used for HTTPS certificate verifications
-##        - RFC 8555 / ACME HTTP Challenges (acme-challenge) 
-##        - File-based Validations (pki-validation)
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
-##    - XXX: Sometimes we are using `/index.php` and other times `index.php` as our replacement URI; this may be incorrect
-##
-
-    RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
-
-##
-## Rule: Map the ocm-provider handling to our main frontend controller (/index.php)
-##
-## Context:
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
-##    - XXX: Sometimes we are using `/index.php` and other times `index.php` as our replacement URI; this may be incorrect
-##
-
-    RewriteRule ^ocm-provider/?$ index.php [QSA,L]
-
-##
-## Rule: Prevent access to more non-public files
-##
-## Context:
-##    - XXX It may make sense to merge some of these with the others (i.e. the ones that don't need to be last)
-##
-
-    RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
-
+  RewriteEngine on
+  RewriteCond %{HTTP_USER_AGENT} DavClnt
+  RewriteRule ^$ /remote.php/webdav/ [L,R=302]
+  RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+  RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
+  RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
+  RewriteRule ^remote/(.*) remote.php [QSA,L]
+  RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
+  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
+  RewriteRule ^ocm-provider/?$ index.php [QSA,L]
+  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 
 # Clients like xDavv5 on Android, or Cyberduck, use chunked requests.
@@ -183,18 +105,16 @@
 # Here are more information about the issue:
 #  - https://docs.cyberduck.io/mountainduck/issues/fastcgi/
 #  - https://docs.nextcloud.com/server/latest/admin_manual/issues/general_troubleshooting.html#troubleshooting-webdav
-
 <IfModule mod_setenvif.c>
-    SetEnvIfNoCase Transfer-Encoding "chunked" proxy-sendcl=1
+  SetEnvIfNoCase Transfer-Encoding "chunked" proxy-sendcl=1
 </IfModule>
 
 # Apache disabled the sending of the server-side content-length header
 # in their 2.4.59 patch updated which breaks some use-cases in Nextcloud.
 # Setting ap_trust_cgilike_cl allows to bring back the usual behaviour.
 # See https://bz.apache.org/bugzilla/show_bug.cgi?id=68973
-
 <IfModule mod_env.c>
-    SetEnv ap_trust_cgilike_cl
+  SetEnv ap_trust_cgilike_cl
 </IfModule>
 
 AddDefaultCharset utf-8

REUSE.toml

@@ -400,7 +400,7 @@ SPDX-FileCopyrightText = "2019 Fabian Wiktor <https://www.pexels.com/photo/green
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
-path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json", "build/eslint-baseline-legacy.json"]
+path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

__mocks__

@@ -1 +0,0 @@
-build/frontend/__mocks__

__tests__

@@ -1 +0,0 @@
-build/frontend/__tests__

apps/admin_audit/l10n/lo.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "ການກວດສອບ / ການບັນທຶກ",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "ສະໜອງຄວາມສາມາດໃນການບັນທຶກສຳລັບ Nextcloud ເຊັ່ນ ການບັນທຶກການເຂົ້າເຖິງໄຟລ໌ ຫຼື ການກະທຳອື່ນໆທີ່ອ່ອນໄຫວ."
-},
-"nplurals=1; plural=0;");

apps/admin_audit/l10n/lo.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "ການກວດສອບ / ການບັນທຶກ",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "ສະໜອງຄວາມສາມາດໃນການບັນທຶກສຳລັບ Nextcloud ເຊັ່ນ ການບັນທຶກການເຂົ້າເຖິງໄຟລ໌ ຫຼື ການກະທຳອື່ນໆທີ່ອ່ອນໄຫວ."
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/comments/l10n/cs.js

@@ -17,7 +17,7 @@ OC.L10N.register(
     "Delete comment" : "Smazat komentář",
     "Cancel edit" : "Zrušit úpravu",
     "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
+    "Write a comment …" : "Napsat komentář …",
     "Post comment" : "Odeslat komentář",
     "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
     "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -32,6 +32,6 @@ OC.L10N.register(
     "Comment deleted" : "Komentář smazán",
     "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
     "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář …"
+    "Write a comment …" : "Napsat komentář…"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/comments/l10n/cs.json

@@ -15,7 +15,7 @@
     "Delete comment" : "Smazat komentář",
     "Cancel edit" : "Zrušit úpravu",
     "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
+    "Write a comment …" : "Napsat komentář …",
     "Post comment" : "Odeslat komentář",
     "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
     "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -30,6 +30,6 @@
     "Comment deleted" : "Komentář smazán",
     "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
     "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář …"
+    "Write a comment …" : "Napsat komentář…"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/comments/l10n/lo.js

@@ -1,37 +0,0 @@
-OC.L10N.register(
-    "comments",
-    {
-    "Comments" : "ຄໍາເຫັນ",
-    "You commented" : "ທ່ານໄດ້ສະແດງຄຳເຫັນ",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "Files" : "ຟາຍ",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "You were mentioned on \"{file}\", in a comment by an account that has since been deleted",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
-    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
-    "Edit comment" : "ແກ້ໄຂຄຳເຫັນ",
-    "Delete comment" : "ລົບຄຳເຫັນ",
-    "Cancel edit" : "Cancel edit",
-    "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
-    "Post comment" : "Post comment",
-    "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
-    "Could not reload comments" : "Could not reload comments",
-    "Failed to mark comments as read" : "Failed to mark comments as read",
-    "Unable to load the comments list" : "Unable to load the comments list",
-    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
-    "No more messages" : "No more messages",
-    "Retry" : "Retry",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} new comments"],
-    "Comment" : "Comment",
-    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
-    "Comment deleted" : "Comment deleted",
-    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
-    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
-    "Write a comment …" : "Write a comment …"
-},
-"nplurals=1; plural=0;");

apps/comments/l10n/lo.json

@@ -1,35 +0,0 @@
-{ "translations": {
-    "Comments" : "ຄໍາເຫັນ",
-    "You commented" : "ທ່ານໄດ້ສະແດງຄຳເຫັນ",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "Files" : "ຟາຍ",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "You were mentioned on \"{file}\", in a comment by an account that has since been deleted",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
-    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
-    "Edit comment" : "ແກ້ໄຂຄຳເຫັນ",
-    "Delete comment" : "ລົບຄຳເຫັນ",
-    "Cancel edit" : "Cancel edit",
-    "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
-    "Post comment" : "Post comment",
-    "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
-    "Could not reload comments" : "Could not reload comments",
-    "Failed to mark comments as read" : "Failed to mark comments as read",
-    "Unable to load the comments list" : "Unable to load the comments list",
-    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
-    "No more messages" : "No more messages",
-    "Retry" : "Retry",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} new comments"],
-    "Comment" : "Comment",
-    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
-    "Comment deleted" : "Comment deleted",
-    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
-    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
-    "Write a comment …" : "Write a comment …"
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/comments/l10n/ug.js

@@ -4,11 +4,11 @@ OC.L10N.register(
     "Comments" : "باھا",
     "You commented" : "باھا بەردىڭىز",
     "{author} commented" : "{author} باھا بەردى",
-    "You commented on %1$s" : "سىز %1$s غا باھا بەردىڭىز",
+    "You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
     "You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
-    "%1$s commented on %2$s" : "%1$s بولسا %2$s غا باھا بەردى",
+    "%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
     "{author} commented on {file}" : "{author} بولسا {file} گە باھا بەردى",
-    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </strong>",
+    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
     "Files" : "ھۆججەتلەر",
     "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "باھانى ئۆچۈرۈڭ",
     "Cancel edit" : "تەھرىرلەشنى ئەمەلدىن قالدۇرۇڭ",
     "New comment" : "يېڭى باھا",
-    "Write a comment …" : "بىر ئىنكاس يېزىڭ  ...",
     "Post comment" : "ئىنكاس يېزىڭ",
     "@ for mentions, : for emoji, / for smart picker" : "@ تىلغا ئېلىش ئۈچۈن ،: emoji ئۈچۈن ، / ئەقلىي ئىقتىدارلىق تاللىغۇچ ئۈچۈن",
     "Could not reload comments" : "ئىنكاسلارنى قايتا يۈكلىيەلمىدى",
@@ -26,7 +25,6 @@ OC.L10N.register(
     "No comments yet, start the conversation!" : "تېخى باھا يوق ، سۆھبەتنى باشلاڭ!",
     "No more messages" : "باشقا ئۇچۇر يوق",
     "Retry" : "قايتا سىناڭ",
-    "_1 new comment_::_{unread} new comments_" : ["1 يېڭى ئىنكاس","{unread} يېڭى ئىنكاسلار"],
     "Comment" : "باھا",
     "An error occurred while trying to edit the comment" : "باھانى تەھرىرلىمەكچى بولغاندا خاتالىق كۆرۈلدى",
     "Comment deleted" : "باھا ئۆچۈرۈلدى",

apps/comments/l10n/ug.json

@@ -2,11 +2,11 @@
     "Comments" : "باھا",
     "You commented" : "باھا بەردىڭىز",
     "{author} commented" : "{author} باھا بەردى",
-    "You commented on %1$s" : "سىز %1$s غا باھا بەردىڭىز",
+    "You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
     "You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
-    "%1$s commented on %2$s" : "%1$s بولسا %2$s غا باھا بەردى",
+    "%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
     "{author} commented on {file}" : "{author} بولسا {file} گە باھا بەردى",
-    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </strong>",
+    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
     "Files" : "ھۆججەتلەر",
     "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
@@ -15,7 +15,6 @@
     "Delete comment" : "باھانى ئۆچۈرۈڭ",
     "Cancel edit" : "تەھرىرلەشنى ئەمەلدىن قالدۇرۇڭ",
     "New comment" : "يېڭى باھا",
-    "Write a comment …" : "بىر ئىنكاس يېزىڭ  ...",
     "Post comment" : "ئىنكاس يېزىڭ",
     "@ for mentions, : for emoji, / for smart picker" : "@ تىلغا ئېلىش ئۈچۈن ،: emoji ئۈچۈن ، / ئەقلىي ئىقتىدارلىق تاللىغۇچ ئۈچۈن",
     "Could not reload comments" : "ئىنكاسلارنى قايتا يۈكلىيەلمىدى",
@@ -24,7 +23,6 @@
     "No comments yet, start the conversation!" : "تېخى باھا يوق ، سۆھبەتنى باشلاڭ!",
     "No more messages" : "باشقا ئۇچۇر يوق",
     "Retry" : "قايتا سىناڭ",
-    "_1 new comment_::_{unread} new comments_" : ["1 يېڭى ئىنكاس","{unread} يېڭى ئىنكاسلار"],
     "Comment" : "باھا",
     "An error occurred while trying to edit the comment" : "باھانى تەھرىرلىمەكچى بولغاندا خاتالىق كۆرۈلدى",
     "Comment deleted" : "باھا ئۆچۈرۈلدى",

apps/comments/src/components/Comment.vue

@@ -72,7 +72,7 @@
 						:contenteditable="!loading"
 						:label="editor ? t('comments', 'New comment') : t('comments', 'Edit comment')"
 						:placeholder="t('comments', 'Write a comment …')"
-						:model-value="localMessage"
+						:value="localMessage"
 						:user-data="userData"
 						aria-describedby="tab-comments__editor-description"
 						@update:value="updateLocalMessage"
@@ -103,7 +103,6 @@
 				:class="{ 'comment__message--expanded': expanded }"
 				:text="richContent.message"
 				:arguments="richContent.mentions"
-				use-markdown
 				@click.native="onExpand" />
 		</div>
 	</component>
@@ -377,19 +376,13 @@ $comment-padding: 10px;
 	&__message {
 		white-space: pre-wrap;
 		word-break: normal;
-		max-height: 200px;
-		overflow: auto;
-		scrollbar-gutter: stable;
-		scrollbar-width: thin;
+		max-height: 70px;
+		overflow: hidden;
 		margin-top: -6px;
 		&--expanded {
 			max-height: none;
 			overflow: visible;
 		}
-		:deep(img) {
-			max-width: 100%;
-			height: auto;
-		}
 	}
 }
 

apps/contactsinteraction/lib/Db/RecentContactMapper.php

@@ -94,7 +94,7 @@ class RecentContactMapper extends QBMapper {
 			->setMaxResults(1);
 
 		$cursor = $select->executeQuery();
-		$row = $cursor->fetchAssociative();
+		$row = $cursor->fetch();
 
 		if ($row === false) {
 			return null;

apps/contactsinteraction/lib/Migration/FixVcardCategory.php

@@ -53,7 +53,7 @@ class FixVcardCategory implements IRepairStep {
 			->set('card', $query->createParameter('card'))
 			->where($query->expr()->eq('id', $query->createParameter('id')));
 
-		while ($card = $cardsWithTranslatedCategory->fetchAssociative()) {
+		while ($card = $cardsWithTranslatedCategory->fetch()) {
 			$output->advance(1);
 
 			try {

apps/dashboard/l10n/ug.js

@@ -14,13 +14,10 @@ OC.L10N.register(
     "Good evening, {name}" : "خەيرلىك كەچ ، {name}",
     "Hello" : "ياخشىمۇسىز",
     "Hello, {name}" : "ياخشىمۇسىز ، {name}",
-    "Happy birthday 🥳🤩🎂🎉" : "تۇغۇلغان كۈنىڭىزگە مۇبارەك 🥳🤩🎂🎉",
-    "Happy birthday, {name} 🥳🤩🎂🎉" : "{name}! تۇغۇلغان كۈنىڭىزگە مۇبارەك 🥳🤩🎂🎉",
-    "Customize" : "خاسلاشتۇر",
+    "Customize" : "Customize",
     "Edit widgets" : "كىچىك قوراللارنى تەھرىرلەش",
     "Get more widgets from the App Store" : "ئەپ دۇكىنىدىن تېخىمۇ كۆپ كىچىك قوراللارغا ئېرىشىڭ",
     "Weather service" : "ھاۋارايى مۇلازىمىتى",
-    "For your privacy, the weather data is requested by your {productName} server on your behalf so the weather service receives no personal information." : "شەخسىي مەخپىيەتلىكىڭىز ئۈچۈن، {productName} مۇلازىمېتىرىڭىز سىزنىڭ نامىڭىزدا ھاۋارايى سانلىق مەلۇماتلىرىنى تەلەپ قىلىدۇ، شۇڭا ھاۋارايى مۇلازىمىتى ھېچقانداق شەخسىي ئۇچۇر تاپشۇرۇۋالمايدۇ.",
     "Weather data from Met.no" : "Met.no دىن كەلگەن ھاۋارايى سانلىق مەلۇماتلىرى",
     "geocoding with Nominatim" : "Nominatim بىلەن جۇغراپىيىلىك كودلاش",
     "elevation data from OpenTopoData" : "OpenTopoData دىن ئېگىزلىك سانلىق مەلۇماتلىرى",

apps/dashboard/l10n/ug.json

@@ -12,13 +12,10 @@
     "Good evening, {name}" : "خەيرلىك كەچ ، {name}",
     "Hello" : "ياخشىمۇسىز",
     "Hello, {name}" : "ياخشىمۇسىز ، {name}",
-    "Happy birthday 🥳🤩🎂🎉" : "تۇغۇلغان كۈنىڭىزگە مۇبارەك 🥳🤩🎂🎉",
-    "Happy birthday, {name} 🥳🤩🎂🎉" : "{name}! تۇغۇلغان كۈنىڭىزگە مۇبارەك 🥳🤩🎂🎉",
-    "Customize" : "خاسلاشتۇر",
+    "Customize" : "Customize",
     "Edit widgets" : "كىچىك قوراللارنى تەھرىرلەش",
     "Get more widgets from the App Store" : "ئەپ دۇكىنىدىن تېخىمۇ كۆپ كىچىك قوراللارغا ئېرىشىڭ",
     "Weather service" : "ھاۋارايى مۇلازىمىتى",
-    "For your privacy, the weather data is requested by your {productName} server on your behalf so the weather service receives no personal information." : "شەخسىي مەخپىيەتلىكىڭىز ئۈچۈن، {productName} مۇلازىمېتىرىڭىز سىزنىڭ نامىڭىزدا ھاۋارايى سانلىق مەلۇماتلىرىنى تەلەپ قىلىدۇ، شۇڭا ھاۋارايى مۇلازىمىتى ھېچقانداق شەخسىي ئۇچۇر تاپشۇرۇۋالمايدۇ.",
     "Weather data from Met.no" : "Met.no دىن كەلگەن ھاۋارايى سانلىق مەلۇماتلىرى",
     "geocoding with Nominatim" : "Nominatim بىلەن جۇغراپىيىلىك كودلاش",
     "elevation data from OpenTopoData" : "OpenTopoData دىن ئېگىزلىك سانلىق مەلۇماتلىرى",

apps/dashboard/src/main.js

@@ -5,11 +5,14 @@
 
 import { getCSPNonce } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
+import VTooltip from '@nextcloud/vue/directives/Tooltip'
 import Vue from 'vue'
 import DashboardApp from './DashboardApp.vue'
 
 __webpack_nonce__ = getCSPNonce()
 
+Vue.directive('Tooltip', VTooltip)
+
 Vue.prototype.t = t
 
 const Dashboard = Vue.extend(DashboardApp)

apps/dav/l10n/ar.js

@@ -73,7 +73,19 @@ OC.L10N.register(
     "Where: %s" : "المكان: %s",
     "%1$s via %2$s" : "%1$s عبر %2$s",
     "In the past on %1$s for the entire day" : "في الماضي في %1$s لكامل اليوم",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في  %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["في %n أسبوع في %1$s طيلة اليوم","في أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسابيع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["في %n شهر في %1$s طيلة اليوم","في شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n أشهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["في %n سنة في %1$s طيلة اليوم","في سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنوات في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم"],
     "In the past on %1$s between %2$s - %3$s" : "في الماضي في %1$s بين %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["في %n دقيقة في %1$s بين %2$s - %3$s","في دقيقة فقي %1$s بين %2$s - %3$s","في %n دقيقة فقي %1$s بين %2$s - %3$s","في %n دقائق في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["في %n ساعة في %1$s بين %2$s - %3$s","في ساعة واحدة %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعات في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["في%n يوم في %1$s بين %2$s - %3$s","في يوم واحد في %1$s بين %2$s - %3$s","في %n يوم %1$s بين %2$s - %3$s","في %n أيام في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["في %n أسبوع في %1$s بين %2$s - %3$s","في أسبوع واحد في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسابيع في %1$s في %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %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_" : ["في %n شهر في %1$s بين %2$s - %3$s","في شهر واحد في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","في %n شهور في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","In %n months on %1$s between %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_" : ["في %n سنة في %1$s بين %2$s - %3$s","في سنة واحدة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنوات في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s"],
     "Could not generate when statement" : "يتعذّر تكوين عبارة \"متى\"",
     "Every Day for the entire day" : "كل يوم لكامل اليوم",
     "Every Day for the entire day until %1$s" : "كل يوم كامل اليوم حتى %1$s",
@@ -111,8 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "في تورايخ محددة كامل اليوم حتى%1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "في تواريخ محددة بين %1$s - %2$s حتى %3$s",
     "In the past on %1$s" : "في الماضي في %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["في %n دقيقة في %1$s","في دقيقة واحدة في %1$s","في %n دقيقة في %1$s","في %n دقائق في %1$s","في %n دقيقة في %1$s","في %n دقيقة في %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["في %n ساعة في %1$s","في ساعة واحدة في%1$s","في %n ساعة في %1$s","في %n ساعات في %1$s","في %n ساعة في %1$s","في %n ساعة في %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["في %n يوم في %1$s","في يوم واحد في%1$s","في %n يوم في %1$s","في %n أيام في %1$s","في %n يوم في%1$s","في %n يوم في %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["في %n أسبوع في %1$s","في أسبوع واحد في %1$s","في %n أسبوع في %1$s","في %n أسابيع في %1$s","في %n أسبوع في %1$s","في %n أسبوع في %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["في %n شهر في %1$s","في شهر واحد في %1$s","في %n شهر في %1$s","في %n أشهر في %1$s","في %n شهر في %1$s","في %n شهر في %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["في %n سنة في %1$s","في سنة واحدة في %1$s","في %n سنة في %1$s","في %n سنوات في %1$s","في %n سنة في %1$s","في %n سنة في %1$s"],
     "In the past on %1$s then on %2$s" : "في الماضي في %1$s ثم في %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["في %n دقيقة في %1$s ثم في %2$s","في دقيقة واحدة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","فيب %n دقائق في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["في %n ساعة في %1$s ثم في %2$s","في ساعة واحدة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعات في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["في %n يوم في %1$s ثم في %2$s","في يوم واحد في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n أيام في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["في %n أسبوع في %1$s ثم في %2$s","في أسبوع واحد في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسابيع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["في %n شهر في %1$s ثم في %2$s","في شهر واحد في %1$s ثم في %2$s","في %n شهر في %1$s ثم في %2$s","في %n شهور في %1$s ثم في %2$s","في %n شهر في %1$sثم في %2$s","في %n شهر في %1$s ثم في %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["في %n سنة في %1$s ثم في %2$s","في سنة واحدة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنوات في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "في الماضي في %1$s ثم في %2$s و %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_" : ["في %n دقيقة في %1$s ثم في %2$s و %3$s","في دقيقة واحدة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقائق في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %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_" : ["في %n ساعة في %1$s ثم في %2$s و %3$s","في ساعة واحدة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعات في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %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_" : ["في %n يوم في %1$s ثم في %2$s و %3$s","في يوم واحد في %1$s ثم ف %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n أيام في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %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_" : ["في %n أسبوع في %1$s ثم في %2$s و %3$s","في أسبوع واحد في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسابيع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %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_" : ["في %n شهر في %1$s ثم في %2$s و %3$s","في شهر واحد في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهور في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %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_" : ["في%n سنة في %1$s ثم في %2$s و %3$s","في سنة واحدة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنوات في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s"],
     "Could not generate next recurrence statement" : "يتعذّر توليد عبارة التكرار التالي",
     "Cancelled: %1$s" : "مُلغىً: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" تمّ إلغاؤه",
@@ -289,36 +319,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "هل تقبل الدعوة؟",
     "Tentative" : "مبدئي",
     "Your attendance was updated successfully." : "حضورك تم تحديثه بنجاحٍ",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في  %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["في %n أسبوع في %1$s طيلة اليوم","في أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسابيع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["في %n شهر في %1$s طيلة اليوم","في شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n أشهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["في %n سنة في %1$s طيلة اليوم","في سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنوات في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["في %n دقيقة في %1$s بين %2$s - %3$s","في دقيقة فقي %1$s بين %2$s - %3$s","في %n دقيقة فقي %1$s بين %2$s - %3$s","في %n دقائق في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["في %n ساعة في %1$s بين %2$s - %3$s","في ساعة واحدة %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعات في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["في%n يوم في %1$s بين %2$s - %3$s","في يوم واحد في %1$s بين %2$s - %3$s","في %n يوم %1$s بين %2$s - %3$s","في %n أيام في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["في %n أسبوع في %1$s بين %2$s - %3$s","في أسبوع واحد في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسابيع في %1$s في %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %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_" : ["في %n شهر في %1$s بين %2$s - %3$s","في شهر واحد في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","في %n شهور في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","In %n months on %1$s between %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_" : ["في %n سنة في %1$s بين %2$s - %3$s","في سنة واحدة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنوات في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["في %n دقيقة في %1$s","في دقيقة واحدة في %1$s","في %n دقيقة في %1$s","في %n دقائق في %1$s","في %n دقيقة في %1$s","في %n دقيقة في %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["في %n ساعة في %1$s","في ساعة واحدة في%1$s","في %n ساعة في %1$s","في %n ساعات في %1$s","في %n ساعة في %1$s","في %n ساعة في %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["في %n يوم في %1$s","في يوم واحد في%1$s","في %n يوم في %1$s","في %n أيام في %1$s","في %n يوم في%1$s","في %n يوم في %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["في %n أسبوع في %1$s","في أسبوع واحد في %1$s","في %n أسبوع في %1$s","في %n أسابيع في %1$s","في %n أسبوع في %1$s","في %n أسبوع في %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["في %n شهر في %1$s","في شهر واحد في %1$s","في %n شهر في %1$s","في %n أشهر في %1$s","في %n شهر في %1$s","في %n شهر في %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["في %n سنة في %1$s","في سنة واحدة في %1$s","في %n سنة في %1$s","في %n سنوات في %1$s","في %n سنة في %1$s","في %n سنة في %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["في %n دقيقة في %1$s ثم في %2$s","في دقيقة واحدة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","فيب %n دقائق في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["في %n ساعة في %1$s ثم في %2$s","في ساعة واحدة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعات في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["في %n يوم في %1$s ثم في %2$s","في يوم واحد في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n أيام في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["في %n أسبوع في %1$s ثم في %2$s","في أسبوع واحد في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسابيع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["في %n شهر في %1$s ثم في %2$s","في شهر واحد في %1$s ثم في %2$s","في %n شهر في %1$s ثم في %2$s","في %n شهور في %1$s ثم في %2$s","في %n شهر في %1$sثم في %2$s","في %n شهر في %1$s ثم في %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["في %n سنة في %1$s ثم في %2$s","في سنة واحدة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنوات في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$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_" : ["في %n دقيقة في %1$s ثم في %2$s و %3$s","في دقيقة واحدة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقائق في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %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_" : ["في %n ساعة في %1$s ثم في %2$s و %3$s","في ساعة واحدة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعات في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %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_" : ["في %n يوم في %1$s ثم في %2$s و %3$s","في يوم واحد في %1$s ثم ف %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n أيام في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %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_" : ["في %n أسبوع في %1$s ثم في %2$s و %3$s","في أسبوع واحد في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسابيع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %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_" : ["في %n شهر في %1$s ثم في %2$s و %3$s","في شهر واحد في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهور في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %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_" : ["في%n سنة في %1$s ثم في %2$s و %3$s","في سنة واحدة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنوات في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s"],
     "No results." : "لا نتائج",
     "Start typing." : "أبدا الكتابة",
     "Time zone:" : "منطقة زمنية:"

apps/dav/l10n/ar.json

@@ -71,7 +71,19 @@
     "Where: %s" : "المكان: %s",
     "%1$s via %2$s" : "%1$s عبر %2$s",
     "In the past on %1$s for the entire day" : "في الماضي في %1$s لكامل اليوم",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في  %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["في %n أسبوع في %1$s طيلة اليوم","في أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسابيع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["في %n شهر في %1$s طيلة اليوم","في شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n أشهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["في %n سنة في %1$s طيلة اليوم","في سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنوات في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم"],
     "In the past on %1$s between %2$s - %3$s" : "في الماضي في %1$s بين %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["في %n دقيقة في %1$s بين %2$s - %3$s","في دقيقة فقي %1$s بين %2$s - %3$s","في %n دقيقة فقي %1$s بين %2$s - %3$s","في %n دقائق في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["في %n ساعة في %1$s بين %2$s - %3$s","في ساعة واحدة %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعات في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["في%n يوم في %1$s بين %2$s - %3$s","في يوم واحد في %1$s بين %2$s - %3$s","في %n يوم %1$s بين %2$s - %3$s","في %n أيام في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["في %n أسبوع في %1$s بين %2$s - %3$s","في أسبوع واحد في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسابيع في %1$s في %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %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_" : ["في %n شهر في %1$s بين %2$s - %3$s","في شهر واحد في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","في %n شهور في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","In %n months on %1$s between %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_" : ["في %n سنة في %1$s بين %2$s - %3$s","في سنة واحدة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنوات في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s"],
     "Could not generate when statement" : "يتعذّر تكوين عبارة \"متى\"",
     "Every Day for the entire day" : "كل يوم لكامل اليوم",
     "Every Day for the entire day until %1$s" : "كل يوم كامل اليوم حتى %1$s",
@@ -109,8 +121,26 @@
     "On specific dates for the entire day until %1$s" : "في تورايخ محددة كامل اليوم حتى%1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "في تواريخ محددة بين %1$s - %2$s حتى %3$s",
     "In the past on %1$s" : "في الماضي في %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["في %n دقيقة في %1$s","في دقيقة واحدة في %1$s","في %n دقيقة في %1$s","في %n دقائق في %1$s","في %n دقيقة في %1$s","في %n دقيقة في %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["في %n ساعة في %1$s","في ساعة واحدة في%1$s","في %n ساعة في %1$s","في %n ساعات في %1$s","في %n ساعة في %1$s","في %n ساعة في %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["في %n يوم في %1$s","في يوم واحد في%1$s","في %n يوم في %1$s","في %n أيام في %1$s","في %n يوم في%1$s","في %n يوم في %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["في %n أسبوع في %1$s","في أسبوع واحد في %1$s","في %n أسبوع في %1$s","في %n أسابيع في %1$s","في %n أسبوع في %1$s","في %n أسبوع في %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["في %n شهر في %1$s","في شهر واحد في %1$s","في %n شهر في %1$s","في %n أشهر في %1$s","في %n شهر في %1$s","في %n شهر في %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["في %n سنة في %1$s","في سنة واحدة في %1$s","في %n سنة في %1$s","في %n سنوات في %1$s","في %n سنة في %1$s","في %n سنة في %1$s"],
     "In the past on %1$s then on %2$s" : "في الماضي في %1$s ثم في %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["في %n دقيقة في %1$s ثم في %2$s","في دقيقة واحدة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","فيب %n دقائق في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["في %n ساعة في %1$s ثم في %2$s","في ساعة واحدة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعات في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["في %n يوم في %1$s ثم في %2$s","في يوم واحد في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n أيام في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["في %n أسبوع في %1$s ثم في %2$s","في أسبوع واحد في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسابيع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["في %n شهر في %1$s ثم في %2$s","في شهر واحد في %1$s ثم في %2$s","في %n شهر في %1$s ثم في %2$s","في %n شهور في %1$s ثم في %2$s","في %n شهر في %1$sثم في %2$s","في %n شهر في %1$s ثم في %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["في %n سنة في %1$s ثم في %2$s","في سنة واحدة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنوات في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "في الماضي في %1$s ثم في %2$s و %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_" : ["في %n دقيقة في %1$s ثم في %2$s و %3$s","في دقيقة واحدة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقائق في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %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_" : ["في %n ساعة في %1$s ثم في %2$s و %3$s","في ساعة واحدة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعات في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %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_" : ["في %n يوم في %1$s ثم في %2$s و %3$s","في يوم واحد في %1$s ثم ف %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n أيام في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %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_" : ["في %n أسبوع في %1$s ثم في %2$s و %3$s","في أسبوع واحد في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسابيع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %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_" : ["في %n شهر في %1$s ثم في %2$s و %3$s","في شهر واحد في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهور في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %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_" : ["في%n سنة في %1$s ثم في %2$s و %3$s","في سنة واحدة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنوات في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s"],
     "Could not generate next recurrence statement" : "يتعذّر توليد عبارة التكرار التالي",
     "Cancelled: %1$s" : "مُلغىً: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" تمّ إلغاؤه",
@@ -287,36 +317,6 @@
     "Are you accepting the invitation?" : "هل تقبل الدعوة؟",
     "Tentative" : "مبدئي",
     "Your attendance was updated successfully." : "حضورك تم تحديثه بنجاحٍ",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["في %n دقيقة في %1$s لكامل اليوم","في  %1$s for the entire day","في %n دقيقة في %1$s لكامل اليوم","في %n دقائق في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم","في %n دقيقة في %1$s لكامل اليوم"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["في %n ساعة في %1$s لكامل اليوم","في ساعة واحدة في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعات في %1$s لكامل اليوم","في %n ساعة في %1$s لكامل اليوم","في %n ساعة في %1$s لكل اليوم"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["في%n يوم في %1$s لكامل اليوم","في يوم واحد في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم","في %n أيام في %1$s لكامل ايوم","في %n يوم في %1$s لكامل اليوم","في %n يوم في %1$s لكامل اليوم"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["في %n أسبوع في %1$s طيلة اليوم","في أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسابيع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم","في %n أسبوع في %1$s طيلة اليوم"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["في %n شهر في %1$s طيلة اليوم","في شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n أشهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم","في %n شهر في %1$s طيلة اليوم"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["في %n سنة في %1$s طيلة اليوم","في سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنوات في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم","في %n سنة في %1$s طيلة اليوم"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["في %n دقيقة في %1$s بين %2$s - %3$s","في دقيقة فقي %1$s بين %2$s - %3$s","في %n دقيقة فقي %1$s بين %2$s - %3$s","في %n دقائق في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s","في %n دقيقة في %1$s بين %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["في %n ساعة في %1$s بين %2$s - %3$s","في ساعة واحدة %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعات في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s","في %n ساعة في %1$s بين %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["في%n يوم في %1$s بين %2$s - %3$s","في يوم واحد في %1$s بين %2$s - %3$s","في %n يوم %1$s بين %2$s - %3$s","في %n أيام في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s","في %n يوم في %1$s بين %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["في %n أسبوع في %1$s بين %2$s - %3$s","في أسبوع واحد في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسابيع في %1$s في %2$s - %3$s","في %n أسبوع في %1$s بين %2$s - %3$s","في %n أسبوع في %1$s بين %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_" : ["في %n شهر في %1$s بين %2$s - %3$s","في شهر واحد في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","في %n شهور في %1$s بين %2$s - %3$s","في %n شهر في %1$s بين %2$s - %3$s","In %n months on %1$s between %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_" : ["في %n سنة في %1$s بين %2$s - %3$s","في سنة واحدة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنوات في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s","في %n سنة في %1$s بين %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["في %n دقيقة في %1$s","في دقيقة واحدة في %1$s","في %n دقيقة في %1$s","في %n دقائق في %1$s","في %n دقيقة في %1$s","في %n دقيقة في %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["في %n ساعة في %1$s","في ساعة واحدة في%1$s","في %n ساعة في %1$s","في %n ساعات في %1$s","في %n ساعة في %1$s","في %n ساعة في %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["في %n يوم في %1$s","في يوم واحد في%1$s","في %n يوم في %1$s","في %n أيام في %1$s","في %n يوم في%1$s","في %n يوم في %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["في %n أسبوع في %1$s","في أسبوع واحد في %1$s","في %n أسبوع في %1$s","في %n أسابيع في %1$s","في %n أسبوع في %1$s","في %n أسبوع في %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["في %n شهر في %1$s","في شهر واحد في %1$s","في %n شهر في %1$s","في %n أشهر في %1$s","في %n شهر في %1$s","في %n شهر في %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["في %n سنة في %1$s","في سنة واحدة في %1$s","في %n سنة في %1$s","في %n سنوات في %1$s","في %n سنة في %1$s","في %n سنة في %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["في %n دقيقة في %1$s ثم في %2$s","في دقيقة واحدة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","فيب %n دقائق في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s","في %n دقيقة في %1$s ثم في %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["في %n ساعة في %1$s ثم في %2$s","في ساعة واحدة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعات في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s","في %n ساعة في %1$s ثم في %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["في %n يوم في %1$s ثم في %2$s","في يوم واحد في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n أيام في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s","في %n يوم في %1$s ثم في %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["في %n أسبوع في %1$s ثم في %2$s","في أسبوع واحد في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسابيع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s","في %n أسبوع في %1$s ثم في %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["في %n شهر في %1$s ثم في %2$s","في شهر واحد في %1$s ثم في %2$s","في %n شهر في %1$s ثم في %2$s","في %n شهور في %1$s ثم في %2$s","في %n شهر في %1$sثم في %2$s","في %n شهر في %1$s ثم في %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["في %n سنة في %1$s ثم في %2$s","في سنة واحدة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنوات في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$s","في %n سنة في %1$s ثم في %2$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_" : ["في %n دقيقة في %1$s ثم في %2$s و %3$s","في دقيقة واحدة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقائق في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %3$s","في %n دقيقة في %1$s ثم في %2$s و %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_" : ["في %n ساعة في %1$s ثم في %2$s و %3$s","في ساعة واحدة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعات في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %3$s","في %n ساعة في %1$s ثم في %2$s و %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_" : ["في %n يوم في %1$s ثم في %2$s و %3$s","في يوم واحد في %1$s ثم ف %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n أيام في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %3$s","في %n يوم في %1$s ثم في %2$s و %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_" : ["في %n أسبوع في %1$s ثم في %2$s و %3$s","في أسبوع واحد في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسابيع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %3$s","في %n أسبوع في %1$s ثم في %2$s و %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_" : ["في %n شهر في %1$s ثم في %2$s و %3$s","في شهر واحد في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهور في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %3$s","في %n شهر في %1$s ثم في %2$s و %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_" : ["في%n سنة في %1$s ثم في %2$s و %3$s","في سنة واحدة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنوات في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s","في %n سنة في %1$s ثم في %2$s و %3$s"],
     "No results." : "لا نتائج",
     "Start typing." : "أبدا الكتابة",
     "Time zone:" : "منطقة زمنية:"

apps/dav/l10n/ca.js

@@ -73,7 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Ubicació: %s",
     "%1$s via %2$s" : "%1$s mitjançant %2$s",
     "In the past on %1$s for the entire day" : "En el passat a %1$s durant tot el dia",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["En una hora a %1$s durant tot el dia","En %n hores a %1$s durant tot el dia"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["En un dia a %1$s durant tot el dia","En %n dies a %1$s durant tot el dia"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["En una setmana a %1$s durant tot el dia","En %n setmanes a %1$s durant tot el dia"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["En un mes el %1$s durant tot el dia","En %n mesos el %1$s durant tot el dia"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["En un any a %1$s durant tot el dia","En %n anys a %1$s durant tot el dia"],
     "In the past on %1$s between %2$s - %3$s" : "En el passat el dia %1$s entre les %2$s i les %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["D'aquí a un minut el %1$s entre les %2$s i les %3$s","D’aquí a %n minuts el %1$s entre les %2$s i les %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["D'aquí a una hora el %1$s entre les %2$s i les %3$s","D’aquí a %n hores el %1$s entre les %2$s i les %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["En un dia el %1$s entre les %2$s i les %3$s","En %n dies el %1$s entre les %2$s i les %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["En una setmana el %1$s entre les %2$s i les %3$s","En %n setmanes el %1$s entre les %2$s i les %3$s"],
+    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["D'aquí a un mes el %1$s entre les %2$s i les %3$s","D’aquí a %n mesos el %1$s entre les %2$s i les %3$s"],
+    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["D'aquí a un any el %1$s entre les %2$s i les %3$s","D’aquí %n anys el %1$s entre les %2$s i les %3$s"],
     "Could not generate when statement" : "No s'ha pogut generar la declaració de quan",
     "Every Day for the entire day" : "Cada dia durant tot el dia",
     "Every Day for the entire day until %1$s" : "Cada dia durant tot el dia fins a les %1$s",
@@ -111,8 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "En dates específiques durant tot el dia fins a les %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "En dates específiques entre les %1$s i les %2$s fins a %3$s",
     "In the past on %1$s" : "En el passat a %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["D'aquí a una hora a %1$s","D’aquí %n hores a %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["En un dia el %1$s","En %n dies el %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["D'aquí a una setmana el %1$s","D’aquí %n setmanes el %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["D'aquí a un mes el %1$s","D’aquí %n mesos el %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["D'aquí a un any el %1$s","D’aquí %n anys el %1$s"],
     "In the past on %1$s then on %2$s" : "En el passat el %1$s i després el %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["D'aquí a un minut el %1$s i després el %2$s","D’aquí a %n minuts el %1$s i després el %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["D'aquí a una hora el %1$s i després el %2$s","D’aquí %n hores el %1$s i després el %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["En un dia el %1$s i després el %2$s","En %n dies el %1$s i després el %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["D'aquí a una setmana el %1$s i després el %2$s","D’aquí %n setmanes el %1$s i després el %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["D'aquí a un mes el %1$s i després el %2$s","D’aquí %n mesos el %1$s i després el %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["D'aquí a un any el %1$s i després el %2$s","D’aquí %n anys el %1$s i després el %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "En el passat el %1$s, després el %2$s i el %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_" : ["D'aquí a un minut el %1$s i després el %2$s i el %3$s","D’aquí a %n minuts el %1$s i després el %2$s i el %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_" : ["D'aquí a una hora el %1$s i després el %2$s i el %3$s","D’aquí a %n hores el %1$s i després el %2$s i el %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_" : ["D'aquí a un dia el %1$s i després el %2$s i el %3$s","D’aquí a %n dies el %1$s i després el %2$s i el %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_" : ["D'aquí a una setmana el %1$s i després el %2$s i el %3$s","D’aquí a %n setmanes el %1$s i després el %2$s i el %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_" : ["D'aquí a un mes el %1$s i després el %2$s i el %3$s","D’aquí a %n mesos el %1$s i després el %2$s i el %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_" : ["D'aquí a un any el %1$s i després el %2$s i el %3$s","D’aquí a %n anys el %1$s i després el %2$s i el %3$s"],
     "Could not generate next recurrence statement" : "No s'ha pogut generar la següent instrucció de recurrència",
     "Cancelled: %1$s" : "S'ha cancel·lat: %1$s",
     "\"%1$s\" has been canceled" : "S'ha cancel·lat «%1$s»",
@@ -282,36 +312,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Your attendance was updated successfully." : "S'ha actualitzat correctament l'assistència.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["En una hora a %1$s durant tot el dia","En %n hores a %1$s durant tot el dia"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["En un dia a %1$s durant tot el dia","En %n dies a %1$s durant tot el dia"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["En una setmana a %1$s durant tot el dia","En %n setmanes a %1$s durant tot el dia"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["En un mes el %1$s durant tot el dia","En %n mesos el %1$s durant tot el dia"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["En un any a %1$s durant tot el dia","En %n anys a %1$s durant tot el dia"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["D'aquí a un minut el %1$s entre les %2$s i les %3$s","D’aquí a %n minuts el %1$s entre les %2$s i les %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["D'aquí a una hora el %1$s entre les %2$s i les %3$s","D’aquí a %n hores el %1$s entre les %2$s i les %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["En un dia el %1$s entre les %2$s i les %3$s","En %n dies el %1$s entre les %2$s i les %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["En una setmana el %1$s entre les %2$s i les %3$s","En %n setmanes el %1$s entre les %2$s i les %3$s"],
-    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["D'aquí a un mes el %1$s entre les %2$s i les %3$s","D’aquí a %n mesos el %1$s entre les %2$s i les %3$s"],
-    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["D'aquí a un any el %1$s entre les %2$s i les %3$s","D’aquí %n anys el %1$s entre les %2$s i les %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["D'aquí a una hora a %1$s","D’aquí %n hores a %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["En un dia el %1$s","En %n dies el %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["D'aquí a una setmana el %1$s","D’aquí %n setmanes el %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["D'aquí a un mes el %1$s","D’aquí %n mesos el %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["D'aquí a un any el %1$s","D’aquí %n anys el %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["D'aquí a un minut el %1$s i després el %2$s","D’aquí a %n minuts el %1$s i després el %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["D'aquí a una hora el %1$s i després el %2$s","D’aquí %n hores el %1$s i després el %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["En un dia el %1$s i després el %2$s","En %n dies el %1$s i després el %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["D'aquí a una setmana el %1$s i després el %2$s","D’aquí %n setmanes el %1$s i després el %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["D'aquí a un mes el %1$s i després el %2$s","D’aquí %n mesos el %1$s i després el %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["D'aquí a un any el %1$s i després el %2$s","D’aquí %n anys el %1$s i després el %2$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_" : ["D'aquí a un minut el %1$s i després el %2$s i el %3$s","D’aquí a %n minuts el %1$s i després el %2$s i el %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_" : ["D'aquí a una hora el %1$s i després el %2$s i el %3$s","D’aquí a %n hores el %1$s i després el %2$s i el %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_" : ["D'aquí a un dia el %1$s i després el %2$s i el %3$s","D’aquí a %n dies el %1$s i després el %2$s i el %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_" : ["D'aquí a una setmana el %1$s i després el %2$s i el %3$s","D’aquí a %n setmanes el %1$s i després el %2$s i el %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_" : ["D'aquí a un mes el %1$s i després el %2$s i el %3$s","D’aquí a %n mesos el %1$s i després el %2$s i el %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_" : ["D'aquí a un any el %1$s i després el %2$s i el %3$s","D’aquí a %n anys el %1$s i després el %2$s i el %3$s"],
     "No results." : "Cap resultat.",
     "Start typing." : "Comença a escriure.",
     "Time zone:" : "Fus horari:"

apps/dav/l10n/ca.json

@@ -71,7 +71,19 @@
     "Where: %s" : "Ubicació: %s",
     "%1$s via %2$s" : "%1$s mitjançant %2$s",
     "In the past on %1$s for the entire day" : "En el passat a %1$s durant tot el dia",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["En una hora a %1$s durant tot el dia","En %n hores a %1$s durant tot el dia"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["En un dia a %1$s durant tot el dia","En %n dies a %1$s durant tot el dia"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["En una setmana a %1$s durant tot el dia","En %n setmanes a %1$s durant tot el dia"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["En un mes el %1$s durant tot el dia","En %n mesos el %1$s durant tot el dia"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["En un any a %1$s durant tot el dia","En %n anys a %1$s durant tot el dia"],
     "In the past on %1$s between %2$s - %3$s" : "En el passat el dia %1$s entre les %2$s i les %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["D'aquí a un minut el %1$s entre les %2$s i les %3$s","D’aquí a %n minuts el %1$s entre les %2$s i les %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["D'aquí a una hora el %1$s entre les %2$s i les %3$s","D’aquí a %n hores el %1$s entre les %2$s i les %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["En un dia el %1$s entre les %2$s i les %3$s","En %n dies el %1$s entre les %2$s i les %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["En una setmana el %1$s entre les %2$s i les %3$s","En %n setmanes el %1$s entre les %2$s i les %3$s"],
+    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["D'aquí a un mes el %1$s entre les %2$s i les %3$s","D’aquí a %n mesos el %1$s entre les %2$s i les %3$s"],
+    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["D'aquí a un any el %1$s entre les %2$s i les %3$s","D’aquí %n anys el %1$s entre les %2$s i les %3$s"],
     "Could not generate when statement" : "No s'ha pogut generar la declaració de quan",
     "Every Day for the entire day" : "Cada dia durant tot el dia",
     "Every Day for the entire day until %1$s" : "Cada dia durant tot el dia fins a les %1$s",
@@ -109,8 +121,26 @@
     "On specific dates for the entire day until %1$s" : "En dates específiques durant tot el dia fins a les %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "En dates específiques entre les %1$s i les %2$s fins a %3$s",
     "In the past on %1$s" : "En el passat a %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["D'aquí a una hora a %1$s","D’aquí %n hores a %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["En un dia el %1$s","En %n dies el %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["D'aquí a una setmana el %1$s","D’aquí %n setmanes el %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["D'aquí a un mes el %1$s","D’aquí %n mesos el %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["D'aquí a un any el %1$s","D’aquí %n anys el %1$s"],
     "In the past on %1$s then on %2$s" : "En el passat el %1$s i després el %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["D'aquí a un minut el %1$s i després el %2$s","D’aquí a %n minuts el %1$s i després el %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["D'aquí a una hora el %1$s i després el %2$s","D’aquí %n hores el %1$s i després el %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["En un dia el %1$s i després el %2$s","En %n dies el %1$s i després el %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["D'aquí a una setmana el %1$s i després el %2$s","D’aquí %n setmanes el %1$s i després el %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["D'aquí a un mes el %1$s i després el %2$s","D’aquí %n mesos el %1$s i després el %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["D'aquí a un any el %1$s i després el %2$s","D’aquí %n anys el %1$s i després el %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "En el passat el %1$s, després el %2$s i el %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_" : ["D'aquí a un minut el %1$s i després el %2$s i el %3$s","D’aquí a %n minuts el %1$s i després el %2$s i el %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_" : ["D'aquí a una hora el %1$s i després el %2$s i el %3$s","D’aquí a %n hores el %1$s i després el %2$s i el %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_" : ["D'aquí a un dia el %1$s i després el %2$s i el %3$s","D’aquí a %n dies el %1$s i després el %2$s i el %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_" : ["D'aquí a una setmana el %1$s i després el %2$s i el %3$s","D’aquí a %n setmanes el %1$s i després el %2$s i el %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_" : ["D'aquí a un mes el %1$s i després el %2$s i el %3$s","D’aquí a %n mesos el %1$s i després el %2$s i el %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_" : ["D'aquí a un any el %1$s i després el %2$s i el %3$s","D’aquí a %n anys el %1$s i després el %2$s i el %3$s"],
     "Could not generate next recurrence statement" : "No s'ha pogut generar la següent instrucció de recurrència",
     "Cancelled: %1$s" : "S'ha cancel·lat: %1$s",
     "\"%1$s\" has been canceled" : "S'ha cancel·lat «%1$s»",
@@ -280,36 +310,6 @@
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Your attendance was updated successfully." : "S'ha actualitzat correctament l'assistència.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["En una hora a %1$s durant tot el dia","En %n hores a %1$s durant tot el dia"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["En un dia a %1$s durant tot el dia","En %n dies a %1$s durant tot el dia"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["En una setmana a %1$s durant tot el dia","En %n setmanes a %1$s durant tot el dia"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["En un mes el %1$s durant tot el dia","En %n mesos el %1$s durant tot el dia"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["En un any a %1$s durant tot el dia","En %n anys a %1$s durant tot el dia"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["D'aquí a un minut el %1$s entre les %2$s i les %3$s","D’aquí a %n minuts el %1$s entre les %2$s i les %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["D'aquí a una hora el %1$s entre les %2$s i les %3$s","D’aquí a %n hores el %1$s entre les %2$s i les %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["En un dia el %1$s entre les %2$s i les %3$s","En %n dies el %1$s entre les %2$s i les %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["En una setmana el %1$s entre les %2$s i les %3$s","En %n setmanes el %1$s entre les %2$s i les %3$s"],
-    "_In a month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["D'aquí a un mes el %1$s entre les %2$s i les %3$s","D’aquí a %n mesos el %1$s entre les %2$s i les %3$s"],
-    "_In a year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["D'aquí a un any el %1$s entre les %2$s i les %3$s","D’aquí %n anys el %1$s entre les %2$s i les %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["En un minut a %1$s durant tot el dia","En %n minuts a %1$s durant tot el dia"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["D'aquí a una hora a %1$s","D’aquí %n hores a %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["En un dia el %1$s","En %n dies el %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["D'aquí a una setmana el %1$s","D’aquí %n setmanes el %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["D'aquí a un mes el %1$s","D’aquí %n mesos el %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["D'aquí a un any el %1$s","D’aquí %n anys el %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["D'aquí a un minut el %1$s i després el %2$s","D’aquí a %n minuts el %1$s i després el %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["D'aquí a una hora el %1$s i després el %2$s","D’aquí %n hores el %1$s i després el %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["En un dia el %1$s i després el %2$s","En %n dies el %1$s i després el %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["D'aquí a una setmana el %1$s i després el %2$s","D’aquí %n setmanes el %1$s i després el %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["D'aquí a un mes el %1$s i després el %2$s","D’aquí %n mesos el %1$s i després el %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["D'aquí a un any el %1$s i després el %2$s","D’aquí %n anys el %1$s i després el %2$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_" : ["D'aquí a un minut el %1$s i després el %2$s i el %3$s","D’aquí a %n minuts el %1$s i després el %2$s i el %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_" : ["D'aquí a una hora el %1$s i després el %2$s i el %3$s","D’aquí a %n hores el %1$s i després el %2$s i el %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_" : ["D'aquí a un dia el %1$s i després el %2$s i el %3$s","D’aquí a %n dies el %1$s i després el %2$s i el %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_" : ["D'aquí a una setmana el %1$s i després el %2$s i el %3$s","D’aquí a %n setmanes el %1$s i després el %2$s i el %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_" : ["D'aquí a un mes el %1$s i després el %2$s i el %3$s","D’aquí a %n mesos el %1$s i després el %2$s i el %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_" : ["D'aquí a un any el %1$s i després el %2$s i el %3$s","D’aquí a %n anys el %1$s i després el %2$s i el %3$s"],
     "No results." : "Cap resultat.",
     "Start typing." : "Comença a escriure.",
     "Time zone:" : "Fus horari:"

apps/dav/l10n/cs.js

@@ -73,19 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Kde: %s",
     "%1$s via %2$s" : "%1$s prostřednictvím %2$s",
     "In the past on %1$s for the entire day" : "V minulosti %1$s po celý den",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za %n minutu v %2$s po celý den","Za %n minuty v %2$s po celý den","Za %n minut v %2$s po celý den","Za %n minuty v %1$s po celý den"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za %n hodinu v %1$s po celý den","Za %n hodiny v %1$s po celý den","Za %n hodin v %1$s po celý den","Za %n hodiny v %1$s po celý den"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za %n den v %1$s po celý den","Za %n dny v %1$s po celý den","Za %n dnů v %1$s po celý den","Za %n dny v %1$s po celý den"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za %n týden v %1$s po celý den","Za %n týdny v %1$s po celý den","Za %n týdnů v %1$s po celý den","Za %n týdny v %1$s po celý den"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za %n měsíc v %2$s po celý den","Za %n měsíce v %2$s po celý den","Za %n měsíců v %2$s po celý den","Za %n měsíce v %2$s po celý den"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za %n rok v %1$s po celý den","Za %n roky v %1$s po celý den","Za %n let v %1$s po celý den","Za %n roky v %1$s po celý den"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
     "In the past on %1$s between %2$s - %3$s" : "V minulosti %1$s mezi %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za %n minutu v %1$s mezi %2$s - %3$s","Za %n minuty v %1$s mezi %2$s - %3$s","Za %n minut v %1$s mezi %2$s - %3$s","Za %n minuty v %1$s mezi %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za %n hodinu v %1$s mezi %2$s - %3$s ","Za %n hodiny v %1$s mezi %2$s - %3$s ","Za %n hodin v %1$s mezi %2$s - %3$s ","Za %n hodiny v %1$s mezi %2$s - %3$s "],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za %n den v %1$s mezi %2$s - %3$s","Za %n dny v %1$s mezi %2$s - %3$s","Za %n dnů v %1$s mezi %2$s - %3$s","Za %n dny v %1$s mezi %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za %n týden v %1$s mezi %2$s - %3$s","Za %n týdny v %1$s mezi %2$s - %3$s","Za %n týdnů v %1$s mezi %2$s - %3$s","Za %n týdny v %1$s mezi %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Za %n měsíc v %1$s mezi %2$s - %3$s","Za %n měsíce v %1$s mezi %2$s - %3$s","Za %n měsíců v %1$s mezi %2$s - %3$s","Za %n měsíce v %1$s mezi %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Za %n rok v %1$s mezi %2$s - %3$s","Za %n roky v %1$s mezi %2$s - %3$s","Za %n let v %1$s mezi %2$s - %3$s","Za %n roky v %1$s mezi %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %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_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %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_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
     "Could not generate when statement" : "Nepodařilo se vytvořit výrok kdy",
     "Every Day for the entire day" : "Každý den pro celý den",
     "Every Day for the entire day until %1$s" : "Každý den pro celý den až do %1$s",
@@ -123,26 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "V konkrétních datech pro celý den až do %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "V konkrétních datech mezi %1$s - %2$s až do %3$s",
     "In the past on %1$s" : "V minulosti %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["Za %n minutu v %1$s","Za %n minuty v %1$s","Za %n minut v %1$s","Za %n minuty v %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["Za %n hodinu v %1$s","Za %n hodiny v %1$s","Za %n hodin v %1$s","Za %n hodiny v %1$s"],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["Za %n den v %1$s","Za %n dny v %1$s","Za %n dnů v %1$s","Za %n dny v %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["Za %n týden na %1$s","Za %n týdny na %1$s","Za %n týdnů na %1$s","Za %n týdny na %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["Za %n měsíc v %1$s","Za %n měsíce v %1$s","Za %n měsíců v %1$s","Za %n měsíce v %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["Za %n rok v %1$s","Za %n roky v %1$s","Za %n let v %1$s","Za %n roky v %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
     "In the past on %1$s then on %2$s" : "V minulosti %1$s, pak %2$s ",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za %n minutu v %1$s, poté v %2$s","Za %n minuty v %1$s, poté v %2$s","Za %n minut v %1$s, poté v %2$s","Za %n minuty v %1$s, poté v %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za %n hodinu v %1$s, poté v %2$s","Za %n hodiny v %1$s, poté v %2$s","Za %n hodin v %1$s, poté v %2$s","Za %n hodiny v %1$s, poté v %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za %n den v %1$s, poté v %2$s","Za %n dny v %1$s, poté v %2$s","Za %n dnů v %1$s, poté v %2$s","Za %n dny v %1$s, poté v %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za %n týden v %1$s, poté v %2$s","Za %n týdny v %1$s, poté v %2$s","Za %n týdnů v %1$s, poté v %2$s","Za %n týdny v %1$s, poté v %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za %n měsíc v %1$s, poté v %2$s","Za %n měsíce v %1$s, poté v %2$s","Za %n měsíců v %1$s, poté v %2$s","Za %n měsíce v %1$s, poté v %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za %n rok v %1$s, poté v %2$s","Za %n roky v %1$s, poté v %2$s","Za %n let v %1$s, poté v %2$s","Za %n roky v %1$s, poté v %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "V minulosti %1$s, poté %2$s a %3$s ",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Za %n minutu v %1$s, poté v %2$s a %3$s ","Za %n minuty v %1$s, poté v %2$s a %3$s ","Za %n minut v %1$s, poté v %2$s a %3$s ","Za %n minuty v %1$s, poté v %2$s a %3$s "],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Za %n hodinu v %1$s, poté v %2$s a %3$s","Za %n hodiny v %1$s, poté v %2$s a %3$s","Za %n hodin v %1$s, poté v %2$s a %3$s","Za %n hodiny v %1$s, poté v %2$s a %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Za %n den v %1$s, poté v %2$s a %3$s","Za %n dny v %1$s, poté v %2$s a %3$s","Za %n dnů v %1$s, poté v %2$s a %3$s","Za %n dny v %1$s, poté v %2$s a %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Za %n týden v %1$s, poté v %2$s a %3$s","Za %n týdny v %1$s, poté v %2$s a %3$s","Za %n týdnů v %1$s, poté v %2$s a %3$s","Za %n týdny v %1$s, poté v %2$s a %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Za %n měsíc v %1$s, poté v %2$s a %3$s","Za %n měsíce v %1$s, poté v %2$s a %3$s","Za %n měsíců v %1$s, poté v %2$s a %3$s","Za %n měsíce v %1$s, poté v %2$s a %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Za %n rok v %1$s, poté v %2$s a %3$s","Za %n roky v %1$s, poté v %2$s a %3$s","Za %n let v %1$s, poté v %2$s a %3$s","Za %n roky v %1$s, poté v %2$s a %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_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %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_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %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_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %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_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %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_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %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_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
     "Could not generate next recurrence statement" : "Nepodařilo se vytvořit výrok o příštím opakování",
     "Cancelled: %1$s" : "Zrušeno: %1$s",
     "\"%1$s\" has been canceled" : "„%1$s“ bylo zrušeno",
@@ -164,7 +164,7 @@ OC.L10N.register(
     "Occurring:" : "Opakuje se::",
     "Accept" : "Přijmout",
     "Decline" : "Odmítnout",
-    "More options …" : "Další volby …",
+    "More options …" : "Další volby…",
     "More options at %s" : "Další volby viz %s",
     "Monday" : "pondělí",
     "Tuesday" : "úterý",
@@ -337,36 +337,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Přijímáte pozvání?",
     "Tentative" : "Nezávazně",
     "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %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_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %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_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$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_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %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_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %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_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %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_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %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_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %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_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
     "No results." : "Nic nenalezeno.",
     "Start typing." : "Začněte psát.",
     "Time zone:" : "Časové pásmo:"

apps/dav/l10n/cs.json

@@ -71,19 +71,19 @@
     "Where: %s" : "Kde: %s",
     "%1$s via %2$s" : "%1$s prostřednictvím %2$s",
     "In the past on %1$s for the entire day" : "V minulosti %1$s po celý den",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za %n minutu v %2$s po celý den","Za %n minuty v %2$s po celý den","Za %n minut v %2$s po celý den","Za %n minuty v %1$s po celý den"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za %n hodinu v %1$s po celý den","Za %n hodiny v %1$s po celý den","Za %n hodin v %1$s po celý den","Za %n hodiny v %1$s po celý den"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za %n den v %1$s po celý den","Za %n dny v %1$s po celý den","Za %n dnů v %1$s po celý den","Za %n dny v %1$s po celý den"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za %n týden v %1$s po celý den","Za %n týdny v %1$s po celý den","Za %n týdnů v %1$s po celý den","Za %n týdny v %1$s po celý den"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za %n měsíc v %2$s po celý den","Za %n měsíce v %2$s po celý den","Za %n měsíců v %2$s po celý den","Za %n měsíce v %2$s po celý den"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za %n rok v %1$s po celý den","Za %n roky v %1$s po celý den","Za %n let v %1$s po celý den","Za %n roky v %1$s po celý den"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
     "In the past on %1$s between %2$s - %3$s" : "V minulosti %1$s mezi %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za %n minutu v %1$s mezi %2$s - %3$s","Za %n minuty v %1$s mezi %2$s - %3$s","Za %n minut v %1$s mezi %2$s - %3$s","Za %n minuty v %1$s mezi %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za %n hodinu v %1$s mezi %2$s - %3$s ","Za %n hodiny v %1$s mezi %2$s - %3$s ","Za %n hodin v %1$s mezi %2$s - %3$s ","Za %n hodiny v %1$s mezi %2$s - %3$s "],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za %n den v %1$s mezi %2$s - %3$s","Za %n dny v %1$s mezi %2$s - %3$s","Za %n dnů v %1$s mezi %2$s - %3$s","Za %n dny v %1$s mezi %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za %n týden v %1$s mezi %2$s - %3$s","Za %n týdny v %1$s mezi %2$s - %3$s","Za %n týdnů v %1$s mezi %2$s - %3$s","Za %n týdny v %1$s mezi %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["Za %n měsíc v %1$s mezi %2$s - %3$s","Za %n měsíce v %1$s mezi %2$s - %3$s","Za %n měsíců v %1$s mezi %2$s - %3$s","Za %n měsíce v %1$s mezi %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["Za %n rok v %1$s mezi %2$s - %3$s","Za %n roky v %1$s mezi %2$s - %3$s","Za %n let v %1$s mezi %2$s - %3$s","Za %n roky v %1$s mezi %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %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_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %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_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
     "Could not generate when statement" : "Nepodařilo se vytvořit výrok kdy",
     "Every Day for the entire day" : "Každý den pro celý den",
     "Every Day for the entire day until %1$s" : "Každý den pro celý den až do %1$s",
@@ -121,26 +121,26 @@
     "On specific dates for the entire day until %1$s" : "V konkrétních datech pro celý den až do %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "V konkrétních datech mezi %1$s - %2$s až do %3$s",
     "In the past on %1$s" : "V minulosti %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["Za %n minutu v %1$s","Za %n minuty v %1$s","Za %n minut v %1$s","Za %n minuty v %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["Za %n hodinu v %1$s","Za %n hodiny v %1$s","Za %n hodin v %1$s","Za %n hodiny v %1$s"],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["Za %n den v %1$s","Za %n dny v %1$s","Za %n dnů v %1$s","Za %n dny v %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["Za %n týden na %1$s","Za %n týdny na %1$s","Za %n týdnů na %1$s","Za %n týdny na %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["Za %n měsíc v %1$s","Za %n měsíce v %1$s","Za %n měsíců v %1$s","Za %n měsíce v %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["Za %n rok v %1$s","Za %n roky v %1$s","Za %n let v %1$s","Za %n roky v %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
     "In the past on %1$s then on %2$s" : "V minulosti %1$s, pak %2$s ",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za %n minutu v %1$s, poté v %2$s","Za %n minuty v %1$s, poté v %2$s","Za %n minut v %1$s, poté v %2$s","Za %n minuty v %1$s, poté v %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za %n hodinu v %1$s, poté v %2$s","Za %n hodiny v %1$s, poté v %2$s","Za %n hodin v %1$s, poté v %2$s","Za %n hodiny v %1$s, poté v %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za %n den v %1$s, poté v %2$s","Za %n dny v %1$s, poté v %2$s","Za %n dnů v %1$s, poté v %2$s","Za %n dny v %1$s, poté v %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za %n týden v %1$s, poté v %2$s","Za %n týdny v %1$s, poté v %2$s","Za %n týdnů v %1$s, poté v %2$s","Za %n týdny v %1$s, poté v %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za %n měsíc v %1$s, poté v %2$s","Za %n měsíce v %1$s, poté v %2$s","Za %n měsíců v %1$s, poté v %2$s","Za %n měsíce v %1$s, poté v %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za %n rok v %1$s, poté v %2$s","Za %n roky v %1$s, poté v %2$s","Za %n let v %1$s, poté v %2$s","Za %n roky v %1$s, poté v %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "V minulosti %1$s, poté %2$s a %3$s ",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["Za %n minutu v %1$s, poté v %2$s a %3$s ","Za %n minuty v %1$s, poté v %2$s a %3$s ","Za %n minut v %1$s, poté v %2$s a %3$s ","Za %n minuty v %1$s, poté v %2$s a %3$s "],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["Za %n hodinu v %1$s, poté v %2$s a %3$s","Za %n hodiny v %1$s, poté v %2$s a %3$s","Za %n hodin v %1$s, poté v %2$s a %3$s","Za %n hodiny v %1$s, poté v %2$s a %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["Za %n den v %1$s, poté v %2$s a %3$s","Za %n dny v %1$s, poté v %2$s a %3$s","Za %n dnů v %1$s, poté v %2$s a %3$s","Za %n dny v %1$s, poté v %2$s a %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["Za %n týden v %1$s, poté v %2$s a %3$s","Za %n týdny v %1$s, poté v %2$s a %3$s","Za %n týdnů v %1$s, poté v %2$s a %3$s","Za %n týdny v %1$s, poté v %2$s a %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["Za %n měsíc v %1$s, poté v %2$s a %3$s","Za %n měsíce v %1$s, poté v %2$s a %3$s","Za %n měsíců v %1$s, poté v %2$s a %3$s","Za %n měsíce v %1$s, poté v %2$s a %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["Za %n rok v %1$s, poté v %2$s a %3$s","Za %n roky v %1$s, poté v %2$s a %3$s","Za %n let v %1$s, poté v %2$s a %3$s","Za %n roky v %1$s, poté v %2$s a %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_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %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_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %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_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %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_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %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_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %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_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
     "Could not generate next recurrence statement" : "Nepodařilo se vytvořit výrok o příštím opakování",
     "Cancelled: %1$s" : "Zrušeno: %1$s",
     "\"%1$s\" has been canceled" : "„%1$s“ bylo zrušeno",
@@ -162,7 +162,7 @@
     "Occurring:" : "Opakuje se::",
     "Accept" : "Přijmout",
     "Decline" : "Odmítnout",
-    "More options …" : "Další volby …",
+    "More options …" : "Další volby…",
     "More options at %s" : "Další volby viz %s",
     "Monday" : "pondělí",
     "Tuesday" : "úterý",
@@ -335,36 +335,6 @@
     "Are you accepting the invitation?" : "Přijímáte pozvání?",
     "Tentative" : "Nezávazně",
     "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Za minutu %2$s po celý den","Za %n minuty %1$s po celý den","Za %n minut %1$s po celý den","Za %n minuty %1$s po celý den"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Za hodinu %1$s po celý den","Za %n hodiny %1$s po celý den","Za %n hodin %1$s po celý den","Za %n hodiny %1$s po celý den"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Za den %1$s po celý den","Za %n dny %1$s po celý den","Za %n dnů %1$s po celý den","Za %n dny %1$s po celý den"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Za týden %1$s po celý den","Za %n týdny %1$s po celý den","Za %n týdnů %1$s po celý den","Za %n týdny %1$s po celý den"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Za měsíc %2$s po celý den","Za %n měsíce %1$s po celý den","Za %n měsíců %1$s po celý den","Za %n měsíce %1$s po celý den"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Za rok %1$s po celý den","Za %n roky %1$s po celý den","Za %n let %1$s po celý den","Za %n roky %1$s po celý den"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Za minutu %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s","Za %n minut %1$s mezi %2$s - %3$s","Za %n minuty %1$s mezi %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Za hodinu %1$s mezi %2$s - %3$s ","Za %n hodiny %1$s mezi %2$s - %3$s","Za %n hodin %1$s mezi %2$s - %3$s","Za %n hodiny %1$s mezi %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Za den %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s","Za %n dnů %1$s mezi %2$s - %3$s","Za %n dny %1$s mezi %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Za týden %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %2$s - %3$s","Za %n týdnů %1$s mezi %2$s - %3$s","Za %n týdny %1$s mezi %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_" : ["Za měsíc %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %2$s - %3$s","Za %n měsíců %1$s mezi %2$s - %3$s","Za %n měsíce %1$s mezi %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_" : ["Za rok %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s","Za %n let %1$s mezi %2$s - %3$s","Za %n roky %1$s mezi %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Za minutu %1$s","Za %n minuty %1$s","Za %n minut %1$s","Za %n minuty %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Za hodinu %1$s","Za %n hodiny %1$s","Za %n hodin %1$s","Za %n hodiny %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["Za den %1$s","Za %n dny %1$s","Za %n dnů %1$s","Za %n dny %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Za týden %1$s","Za %n týdny %1$s","Za %n týdnů %1$s","Za %n týdny %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["Za měsíce %1$s","Za %n měsíce %1$s","Za %n měsíců %1$s","Za %n měsíce %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["Za rok %1$s","Za %n roky %1$s","Za %n let %1$s","Za %n roky %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Za minutu %1$s, poté %2$s","Za %n minuty %1$s, poté %2$s","Za %n minut %1$s, poté %2$s ","Za %n minuty %1$s, poté %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Za hodinu %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s","Za %n hodin %1$s, poté %2$s","Za %n hodiny %1$s, poté %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Za den %1$s, poté %2$s","Za %n dny %1$s, poté %2$s","Za %n dnů %1$s, poté %2$s","Za %n dny %1$s, poté %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Za týden %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s","Za %n týdnů %1$s, poté %2$s","Za %n týdny %1$s, poté %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Za měsíc %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s","Za %n měsíců %1$s, poté %2$s","Za %n měsíce %1$s, poté %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Za rok %1$s, poté %2$s","Za %n roky %1$s, poté %2$s","Za %n let %1$s, poté %2$s","Za %n roky %1$s, poté %2$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_" : ["Za minutu %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %3$s ","Za %n minut %1$s, poté %2$s a %3$s ","Za %n minuty %1$s, poté %2$s a %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_" : ["Za hodinu %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %3$s","Za %n hodin %1$s, poté %2$s a %3$s","Za %n hodiny %1$s, poté %2$s a %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_" : ["Za den %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %3$s","Za %n dnů %1$s, poté %2$s a %3$s","Za %n dny %1$s, poté %2$s a %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_" : ["Za týden %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %3$s","Za %n týdnů %1$s, poté %2$s a %3$s","Za %n týdny %1$s, poté %2$s a %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_" : ["Za měsíc %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %3$s","Za %n měsíců %1$s, poté %2$s a %3$s","Za %n měsíce %1$s, poté %2$s a %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_" : ["Za rok %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s","Za %n let %1$s, poté %2$s a %3$s","Za %n roky %1$s, poté %2$s a %3$s"],
     "No results." : "Nic nenalezeno.",
     "Start typing." : "Začněte psát.",
     "Time zone:" : "Časové pásmo:"

apps/dav/l10n/da.js

@@ -73,7 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Hvor: %s",
     "%1$s via %2$s" : "%1$s via %2$s",
     "In the past on %1$s for the entire day" : "Tidligere den %1$s for hele dagen",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Om et minut på %1$s for hele dagen","Om %n minutter den %1$s for hele dagen"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Om en time på %1$s for hele dagen","Om %n timer den %1$s for hele dagen"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Om en dag på %1$s for hele dagen","Om %n dage den %1$s for hele dagen"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Om en uge på %1$s for hele dagen","Om %n uger den %1$s for hele dagen"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Om en måned på %1$s for hele dagen","Om %n måneder den %1$s for hele dagen"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Om et år på %1$s for hele dagen","Om %n år den %1$s for hele dagen"],
     "In the past on %1$s between %2$s - %3$s" : "Tidligere den %1$s mellem %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Om et minut på %1$s mellem %2$s - %3$s","Om %n minutter den %1$s mellem %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Om en time på %1$s mellem %2$s - %3$s","Om %n timer den %1$s mellem %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Om en dag på %1$s mellem %2$s - %3$s","Om %n dage den %1$s mellem %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Om en uge på %1$s mellem %2$s - %3$s","Om %n uger den %1$s mellem %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_" : ["Om en måned på %1$s mellem %2$s - %3$s","Om %n måneder den %1$s mellem %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_" : ["Om et år på %1$s mellem %2$s - %3$s","Om %n år den %1$s mellem %2$s - %3$s"],
     "Could not generate when statement" : "Kunne ikke generere when sætning",
     "Every Day for the entire day" : "Hver dag hele dagen",
     "Every Day for the entire day until %1$s" : "Hver dag hele dagen indtil %1$s",
@@ -111,8 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "På specifikke datoer for hele dagen indtil %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "På specifikke datoer mellem %1$s - %2$s indtil %3$s",
     "In the past on %1$s" : "Tidligere den %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Om et minut på %1$s","Om %n minutter den %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Om en time på %1$s","Om %n timer den %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["I en dag på %1$s","Om %n dage den %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I en uge på %1$s","Om %n uger den %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["I en måned på %1$s","Om %n måneder den %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["I et år på %1$s","Om %n år den %1$s"],
     "In the past on %1$s then on %2$s" : "Tidligere på %1$s derefter den %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Om et minut på %1$s så på %2$s","Om %n minutter den %1$s derefter den %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I en time på %1$s så på %2$s","Om %n timer den %1$s derefter den %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I en dag på %1$s så på %2$s","Om %n dage den %1$s derefter den %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I en uge på %1$s så på %2$s","Om %n uger den %1$s derefter den %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I en måned på %1$s så på %2$s","Om %n måneder den %1$s derefter den %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I et år på %1$s så på %2$s","Om %n år den %1$s derefter den %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "Tidligere den %1$s derefter den %2$s og %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_" : ["I et minut på %1$s så på %2$s og %3$s","Om %n minutter den %1$s derefter den %2$s og %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_" : ["I en time på %1$s så på %2$s og %3$s","Om %n timer den %1$s derefter den %2$s og %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_" : ["I en dag på %1$s så på %2$s og %3$s","Om %n dage den %1$s derefter den %2$s og %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_" : ["I en uge på %1$s så på %2$s og %3$s","Om %n uger den %1$s derefter den %2$s og %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_" : ["I en måned på %1$s så på %2$s og %3$s","Om %n måneder den %1$s derefter den %2$s og %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_" : ["I et år på %1$s så på %2$s og %3$s","Om %n år den %1$s derefter den %2$s og %3$s"],
     "Could not generate next recurrence statement" : "Kunne ikke generere næste gentagelseserklæring",
     "Cancelled: %1$s" : "Annullerede: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" er blevet annulleret",
@@ -307,36 +337,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Accepter du invitationen?",
     "Tentative" : "Foreløbig",
     "Your attendance was updated successfully." : "Dit tilstedeværelse blev opdateret.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Om et minut på %1$s for hele dagen","Om %n minutter den %1$s for hele dagen"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Om en time på %1$s for hele dagen","Om %n timer den %1$s for hele dagen"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Om en dag på %1$s for hele dagen","Om %n dage den %1$s for hele dagen"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Om en uge på %1$s for hele dagen","Om %n uger den %1$s for hele dagen"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Om en måned på %1$s for hele dagen","Om %n måneder den %1$s for hele dagen"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Om et år på %1$s for hele dagen","Om %n år den %1$s for hele dagen"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Om et minut på %1$s mellem %2$s - %3$s","Om %n minutter den %1$s mellem %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Om en time på %1$s mellem %2$s - %3$s","Om %n timer den %1$s mellem %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Om en dag på %1$s mellem %2$s - %3$s","Om %n dage den %1$s mellem %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Om en uge på %1$s mellem %2$s - %3$s","Om %n uger den %1$s mellem %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_" : ["Om en måned på %1$s mellem %2$s - %3$s","Om %n måneder den %1$s mellem %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_" : ["Om et år på %1$s mellem %2$s - %3$s","Om %n år den %1$s mellem %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Om et minut på %1$s","Om %n minutter den %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Om en time på %1$s","Om %n timer den %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["I en dag på %1$s","Om %n dage den %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I en uge på %1$s","Om %n uger den %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["I en måned på %1$s","Om %n måneder den %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["I et år på %1$s","Om %n år den %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Om et minut på %1$s så på %2$s","Om %n minutter den %1$s derefter den %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I en time på %1$s så på %2$s","Om %n timer den %1$s derefter den %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I en dag på %1$s så på %2$s","Om %n dage den %1$s derefter den %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I en uge på %1$s så på %2$s","Om %n uger den %1$s derefter den %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I en måned på %1$s så på %2$s","Om %n måneder den %1$s derefter den %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I et år på %1$s så på %2$s","Om %n år den %1$s derefter den %2$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_" : ["I et minut på %1$s så på %2$s og %3$s","Om %n minutter den %1$s derefter den %2$s og %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_" : ["I en time på %1$s så på %2$s og %3$s","Om %n timer den %1$s derefter den %2$s og %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_" : ["I en dag på %1$s så på %2$s og %3$s","Om %n dage den %1$s derefter den %2$s og %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_" : ["I en uge på %1$s så på %2$s og %3$s","Om %n uger den %1$s derefter den %2$s og %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_" : ["I en måned på %1$s så på %2$s og %3$s","Om %n måneder den %1$s derefter den %2$s og %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_" : ["I et år på %1$s så på %2$s og %3$s","Om %n år den %1$s derefter den %2$s og %3$s"],
     "No results." : "Ingen resultater.",
     "Start typing." : "Begynd at skrive.",
     "Time zone:" : "Tidszone:"

apps/dav/l10n/da.json

@@ -71,7 +71,19 @@
     "Where: %s" : "Hvor: %s",
     "%1$s via %2$s" : "%1$s via %2$s",
     "In the past on %1$s for the entire day" : "Tidligere den %1$s for hele dagen",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Om et minut på %1$s for hele dagen","Om %n minutter den %1$s for hele dagen"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Om en time på %1$s for hele dagen","Om %n timer den %1$s for hele dagen"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Om en dag på %1$s for hele dagen","Om %n dage den %1$s for hele dagen"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Om en uge på %1$s for hele dagen","Om %n uger den %1$s for hele dagen"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Om en måned på %1$s for hele dagen","Om %n måneder den %1$s for hele dagen"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Om et år på %1$s for hele dagen","Om %n år den %1$s for hele dagen"],
     "In the past on %1$s between %2$s - %3$s" : "Tidligere den %1$s mellem %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Om et minut på %1$s mellem %2$s - %3$s","Om %n minutter den %1$s mellem %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Om en time på %1$s mellem %2$s - %3$s","Om %n timer den %1$s mellem %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Om en dag på %1$s mellem %2$s - %3$s","Om %n dage den %1$s mellem %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Om en uge på %1$s mellem %2$s - %3$s","Om %n uger den %1$s mellem %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_" : ["Om en måned på %1$s mellem %2$s - %3$s","Om %n måneder den %1$s mellem %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_" : ["Om et år på %1$s mellem %2$s - %3$s","Om %n år den %1$s mellem %2$s - %3$s"],
     "Could not generate when statement" : "Kunne ikke generere when sætning",
     "Every Day for the entire day" : "Hver dag hele dagen",
     "Every Day for the entire day until %1$s" : "Hver dag hele dagen indtil %1$s",
@@ -109,8 +121,26 @@
     "On specific dates for the entire day until %1$s" : "På specifikke datoer for hele dagen indtil %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "På specifikke datoer mellem %1$s - %2$s indtil %3$s",
     "In the past on %1$s" : "Tidligere den %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Om et minut på %1$s","Om %n minutter den %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Om en time på %1$s","Om %n timer den %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["I en dag på %1$s","Om %n dage den %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I en uge på %1$s","Om %n uger den %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["I en måned på %1$s","Om %n måneder den %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["I et år på %1$s","Om %n år den %1$s"],
     "In the past on %1$s then on %2$s" : "Tidligere på %1$s derefter den %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Om et minut på %1$s så på %2$s","Om %n minutter den %1$s derefter den %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I en time på %1$s så på %2$s","Om %n timer den %1$s derefter den %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I en dag på %1$s så på %2$s","Om %n dage den %1$s derefter den %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I en uge på %1$s så på %2$s","Om %n uger den %1$s derefter den %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I en måned på %1$s så på %2$s","Om %n måneder den %1$s derefter den %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I et år på %1$s så på %2$s","Om %n år den %1$s derefter den %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "Tidligere den %1$s derefter den %2$s og %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_" : ["I et minut på %1$s så på %2$s og %3$s","Om %n minutter den %1$s derefter den %2$s og %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_" : ["I en time på %1$s så på %2$s og %3$s","Om %n timer den %1$s derefter den %2$s og %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_" : ["I en dag på %1$s så på %2$s og %3$s","Om %n dage den %1$s derefter den %2$s og %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_" : ["I en uge på %1$s så på %2$s og %3$s","Om %n uger den %1$s derefter den %2$s og %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_" : ["I en måned på %1$s så på %2$s og %3$s","Om %n måneder den %1$s derefter den %2$s og %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_" : ["I et år på %1$s så på %2$s og %3$s","Om %n år den %1$s derefter den %2$s og %3$s"],
     "Could not generate next recurrence statement" : "Kunne ikke generere næste gentagelseserklæring",
     "Cancelled: %1$s" : "Annullerede: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" er blevet annulleret",
@@ -305,36 +335,6 @@
     "Are you accepting the invitation?" : "Accepter du invitationen?",
     "Tentative" : "Foreløbig",
     "Your attendance was updated successfully." : "Dit tilstedeværelse blev opdateret.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Om et minut på %1$s for hele dagen","Om %n minutter den %1$s for hele dagen"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Om en time på %1$s for hele dagen","Om %n timer den %1$s for hele dagen"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Om en dag på %1$s for hele dagen","Om %n dage den %1$s for hele dagen"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Om en uge på %1$s for hele dagen","Om %n uger den %1$s for hele dagen"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Om en måned på %1$s for hele dagen","Om %n måneder den %1$s for hele dagen"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Om et år på %1$s for hele dagen","Om %n år den %1$s for hele dagen"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Om et minut på %1$s mellem %2$s - %3$s","Om %n minutter den %1$s mellem %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Om en time på %1$s mellem %2$s - %3$s","Om %n timer den %1$s mellem %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Om en dag på %1$s mellem %2$s - %3$s","Om %n dage den %1$s mellem %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Om en uge på %1$s mellem %2$s - %3$s","Om %n uger den %1$s mellem %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_" : ["Om en måned på %1$s mellem %2$s - %3$s","Om %n måneder den %1$s mellem %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_" : ["Om et år på %1$s mellem %2$s - %3$s","Om %n år den %1$s mellem %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Om et minut på %1$s","Om %n minutter den %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Om en time på %1$s","Om %n timer den %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["I en dag på %1$s","Om %n dage den %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["I en uge på %1$s","Om %n uger den %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["I en måned på %1$s","Om %n måneder den %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["I et år på %1$s","Om %n år den %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Om et minut på %1$s så på %2$s","Om %n minutter den %1$s derefter den %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["I en time på %1$s så på %2$s","Om %n timer den %1$s derefter den %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["I en dag på %1$s så på %2$s","Om %n dage den %1$s derefter den %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["I en uge på %1$s så på %2$s","Om %n uger den %1$s derefter den %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["I en måned på %1$s så på %2$s","Om %n måneder den %1$s derefter den %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["I et år på %1$s så på %2$s","Om %n år den %1$s derefter den %2$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_" : ["I et minut på %1$s så på %2$s og %3$s","Om %n minutter den %1$s derefter den %2$s og %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_" : ["I en time på %1$s så på %2$s og %3$s","Om %n timer den %1$s derefter den %2$s og %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_" : ["I en dag på %1$s så på %2$s og %3$s","Om %n dage den %1$s derefter den %2$s og %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_" : ["I en uge på %1$s så på %2$s og %3$s","Om %n uger den %1$s derefter den %2$s og %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_" : ["I en måned på %1$s så på %2$s og %3$s","Om %n måneder den %1$s derefter den %2$s og %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_" : ["I et år på %1$s så på %2$s og %3$s","Om %n år den %1$s derefter den %2$s og %3$s"],
     "No results." : "Ingen resultater.",
     "Start typing." : "Begynd at skrive.",
     "Time zone:" : "Tidszone:"

apps/dav/l10n/de.js

@@ -73,19 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In %n Minute am %1$s ganztägig","In %n Minuten am %1$s ganztägig"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In %n Stunde am %1$s ganztägig","In %n Stunden am %1$s ganztägig"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In %n Tag am %1$s ganztägig","In %n Tagen am %1$s ganztägig"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In %n Woche am %1$s ganztägig","In %n Wochen am %1$s ganztägig"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In %n Monat am %1$s ganztägig","In %n Monaten am %1$s ganztägig"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In %n Jahr am %1$s ganztägig","In %n Jahren am %1$s ganztägig"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
     "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In %n Minute am %1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In %n Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am %1$s zwischen %2$s - %3$s"],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In %n Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$s zwischen %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In %n Woche am %1$s zwischen %2$s - %3$s","In %n Wochen am %1$s zwischen %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In %n Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In %n Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am %1$s zwischen %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
     "Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden.",
     "Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
     "Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -123,26 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
     "In the past on %1$s" : "In der Vergangenheit am %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["In %n Minute am %1$s","In %n Minuten am %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["In %n Stunde am %1$s","In %n Stunden am %1$s "],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["In %n Tag am %1$s","In %n Tagen am %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["In %n Woche am %1$s","In %n Wochen am %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["In %n Monat am %1$s","In %n Monaten am %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["In %n Jahr am %1$s","In %n Jahren am %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
     "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In %n Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In %n Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In %n Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In %n Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In %n Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In %n Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In %n Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In %n Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In %n Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In %n Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In %n Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In %n Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "Could not generate next recurrence statement" : "Angabe für nächste Wiederholung konnte nicht erzeugt werden.",
     "Cancelled: %1$s" : "Abgesagt: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -337,36 +337,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Die Einladung annehmen?",
     "Tentative" : "Vorläufig",
     "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "No results." : "Keine Ergebnisse",
     "Start typing." : "Mit dem Schreiben beginnen.",
     "Time zone:" : "Zeitzone:"

apps/dav/l10n/de.json

@@ -71,19 +71,19 @@
     "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In %n Minute am %1$s ganztägig","In %n Minuten am %1$s ganztägig"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In %n Stunde am %1$s ganztägig","In %n Stunden am %1$s ganztägig"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In %n Tag am %1$s ganztägig","In %n Tagen am %1$s ganztägig"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In %n Woche am %1$s ganztägig","In %n Wochen am %1$s ganztägig"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In %n Monat am %1$s ganztägig","In %n Monaten am %1$s ganztägig"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In %n Jahr am %1$s ganztägig","In %n Jahren am %1$s ganztägig"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
     "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In %n Minute am %1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In %n Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am %1$s zwischen %2$s - %3$s"],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In %n Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$s zwischen %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In %n Woche am %1$s zwischen %2$s - %3$s","In %n Wochen am %1$s zwischen %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In %n Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In %n Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am %1$s zwischen %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
     "Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden.",
     "Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
     "Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -121,26 +121,26 @@
     "On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
     "In the past on %1$s" : "In der Vergangenheit am %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["In %n Minute am %1$s","In %n Minuten am %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["In %n Stunde am %1$s","In %n Stunden am %1$s "],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["In %n Tag am %1$s","In %n Tagen am %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["In %n Woche am %1$s","In %n Wochen am %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["In %n Monat am %1$s","In %n Monaten am %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["In %n Jahr am %1$s","In %n Jahren am %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
     "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In %n Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In %n Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In %n Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In %n Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In %n Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In %n Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In %n Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In %n Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In %n Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In %n Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In %n Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In %n Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "Could not generate next recurrence statement" : "Angabe für nächste Wiederholung konnte nicht erzeugt werden.",
     "Cancelled: %1$s" : "Abgesagt: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -335,36 +335,6 @@
     "Are you accepting the invitation?" : "Die Einladung annehmen?",
     "Tentative" : "Vorläufig",
     "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "No results." : "Keine Ergebnisse",
     "Start typing." : "Mit dem Schreiben beginnen.",
     "Time zone:" : "Zeitzone:"

apps/dav/l10n/de_DE.js

@@ -73,19 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In %n Minute am %1$s ganztägig","In %n Minuten am %1$s ganztägig"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In %n Stunde am %1$s ganztägig","In %n Stunden am %1$s ganztägig"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In %n Tag am %1$s ganztägig","In %n Tagen am %1$s ganztägig"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In %n Woche am %1$s ganztägig","In %n Wochen am %1$s ganztägig"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In %n Monat am %1$s ganztägig","In %n Monaten am %1$s ganztägig"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In %n Jahr am %1$s ganztägig","In %n Jahren am %1$s ganztägig"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
     "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In %n Minute am %1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In %n Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am %1$s zwischen %2$s - %3$s"],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In %n Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$s zwischen %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In %n Woche am %1$s zwischen %2$s - %3$s","In %n Wochen am %1$s zwischen %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In %n Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In %n Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am %1$s zwischen %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
     "Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden",
     "Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
     "Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -123,26 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
     "In the past on %1$s" : "In der Vergangenheit am %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["In %n Minute am %1$s","In %n Minuten am %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["In %n Stunde am %1$s","In %n Stunden am %1$s "],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["In %n Tag am %1$s","In %n Tagen am %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["In %n Woche am %1$s","In %n Wochen am %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["In %n Monat am %1$s","In %n Monaten am %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["In %n Jahr am %1$s","In %n Jahren am %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
     "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In %n Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In %n Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In %n Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In %n Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In %n Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In %n Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In %n Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In %n Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In %n Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In %n Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In %n Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In %n Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "Could not generate next recurrence statement" : "Nächste Wiederholungsangabe konnte nicht erzeugt werden",
     "Cancelled: %1$s" : "Abgesagt: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -337,36 +337,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Die Einladung annehmen?",
     "Tentative" : "Vorläufig",
     "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "No results." : "Keine Ergebnisse.",
     "Start typing." : "Anfangen zu tippen.",
     "Time zone:" : "Zeitzone:"

apps/dav/l10n/de_DE.json

@@ -71,19 +71,19 @@
     "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "In the past on %1$s for the entire day" : "In der Vergangenheit am %1$s für den ganzen Tag",
-    "_In %n minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In %n Minute am %1$s ganztägig","In %n Minuten am %1$s ganztägig"],
-    "_In %n hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In %n Stunde am %1$s ganztägig","In %n Stunden am %1$s ganztägig"],
-    "_In %n day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In %n Tag am %1$s ganztägig","In %n Tagen am %1$s ganztägig"],
-    "_In %n week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In %n Woche am %1$s ganztägig","In %n Wochen am %1$s ganztägig"],
-    "_In %n month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In %n Monat am %1$s ganztägig","In %n Monaten am %1$s ganztägig"],
-    "_In %n year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In %n Jahr am %1$s ganztägig","In %n Jahren am %1$s ganztägig"],
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
     "In the past on %1$s between %2$s - %3$s" : "In der Vergangenheit am %1$s zwischen %2$s - %3$s",
-    "_In %n minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In %n Minute am %1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In %n hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In %n Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am %1$s zwischen %2$s - %3$s"],
-    "_In %n day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In %n Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$s zwischen %2$s - %3$s"],
-    "_In %n week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In %n Woche am %1$s zwischen %2$s - %3$s","In %n Wochen am %1$s zwischen %2$s - %3$s"],
-    "_In %n month on %1$s between %2$s - %3$s_::_In %n months on %1$s between %2$s - %3$s_" : ["In %n Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %2$s - %3$s"],
-    "_In %n year on %1$s between %2$s - %3$s_::_In %n years on %1$s between %2$s - %3$s_" : ["In %n Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am %1$s zwischen %2$s - %3$s"],
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
     "Could not generate when statement" : "Wann-Angabe konnte nicht erzeugt werden",
     "Every Day for the entire day" : "Jeden Tag für den ganzen Tag",
     "Every Day for the entire day until %1$s" : "Jeden Tag für den ganzen Tag bis %1$s",
@@ -121,26 +121,26 @@
     "On specific dates for the entire day until %1$s" : "An bestimmten Tagen für den ganzen Tag bis %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "An bestimmten Tagen zwischen %1$s - %2$s bis %3$s",
     "In the past on %1$s" : "In der Vergangenheit am %1$s",
-    "_In %n minute on %1$s_::_In %n minutes on %1$s_" : ["In %n Minute am %1$s","In %n Minuten am %1$s"],
-    "_In %n hour on %1$s_::_In %n hours on %1$s_" : ["In %n Stunde am %1$s","In %n Stunden am %1$s "],
-    "_In %n day on %1$s_::_In %n days on %1$s_" : ["In %n Tag am %1$s","In %n Tagen am %1$s"],
-    "_In %n week on %1$s_::_In %n weeks on %1$s_" : ["In %n Woche am %1$s","In %n Wochen am %1$s"],
-    "_In %n month on %1$s_::_In %n months on %1$s_" : ["In %n Monat am %1$s","In %n Monaten am %1$s"],
-    "_In %n year on %1$s_::_In %n years on %1$s_" : ["In %n Jahr am %1$s","In %n Jahren am %1$s"],
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
     "In the past on %1$s then on %2$s" : "In der Vergangenheit am %1$s danach am %2$s",
-    "_In %n minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In %n Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In %n hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In %n Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In %n day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In %n Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In %n week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In %n Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In %n month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In %n Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In %n year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In %n Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "In der Vergangenheit am %1$s danach am %2$s und %3$s",
-    "_In %n minute on %1$s then on %2$s and %3$s_::_In %n minutes on %1$s then on %2$s and %3$s_" : ["In %n Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %3$s"],
-    "_In %n hour on %1$s then on %2$s and %3$s_::_In %n hours on %1$s then on %2$s and %3$s_" : ["In %n Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %3$s"],
-    "_In %n day on %1$s then on %2$s and %3$s_::_In %n days on %1$s then on %2$s and %3$s_" : ["In %n Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %3$s"],
-    "_In %n week on %1$s then on %2$s and %3$s_::_In %n weeks on %1$s then on %2$s and %3$s_" : ["In %n Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %3$s"],
-    "_In %n month on %1$s then on %2$s and %3$s_::_In %n months on %1$s then on %2$s and %3$s_" : ["In %n Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %3$s"],
-    "_In %n year on %1$s then on %2$s and %3$s_::_In %n years on %1$s then on %2$s and %3$s_" : ["In %n Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "Could not generate next recurrence statement" : "Nächste Wiederholungsangabe konnte nicht erzeugt werden",
     "Cancelled: %1$s" : "Abgesagt: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" wurde abgesagt.",
@@ -335,36 +335,6 @@
     "Are you accepting the invitation?" : "Die Einladung annehmen?",
     "Tentative" : "Vorläufig",
     "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["In einer Minute um %1$s für den ganzen Tag","In %n Minuten um %1$s für den ganzen Tag"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["In einer Stunde um %1$s für den ganzen Tag","In %n Stunden um %1$s für den ganzen Tag"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["In einem Tag am %1$s für den ganzen Tag","In %n Tagen am %1$s für den ganzen Tag"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["In einer Woche am %1$s den ganzen Tag","In %n Wochen am %1$s den ganzen Tag"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["In einem Monat am %1$s den ganzen Tag","In %n Monaten am %1$s den ganzen Tag"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["In einem Jahr am %1$s für den ganzen Tag","In %n Jahren am %1$s für den ganzen Tag"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["In einer Minute am%1$s zwischen %2$s - %3$s","In %n Minuten am %1$s zwischen %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["In einer Stunde am %1$s zwischen %2$s - %3$s","In %n Stunden am%1$s zwischen %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["In einem Tag am %1$s zwischen %2$s - %3$s","In %n Tagen am %1$szwischen %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["In einer Woche am %1$s zwischen%2$s - %3$s","In %n Wochen am%1$s zwischen %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_" : ["In einem Monat am %1$s zwischen %2$s - %3$s","In %n Monaten am %1$s zwischen %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_" : ["In einem Jahr am %1$s zwischen %2$s - %3$s","In %n Jahren am%1$s zwischen %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["In einer Minute am %1$s","In %n Minuten am %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["In einer Stunde am %1$s","In %n Stunden am %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["In einem Tag am %1$s","In %n Tagen am %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["In einer Woche am %1$s","In %n Wochen am %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["In einem Monat am %1$s","In %n Monaten am %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["In einem Jahr am %1$s","In %n Jahren am %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["In einer Minute am %1$s danach am %2$s","In %n Minuten am %1$s danach am %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["In einer Stunde am %1$s danach am %2$s","In %n Stunden am %1$s danach am %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["In einem Tag am %1$s danach am %2$s","In %n Tagen am %1$s danach am %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["In einer Woche am %1$s danach am %2$s","In %n Wochen am %1$s danach am %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["In einem Monat am %1$s danach am %2$s","In %n Monaten am %1$s danach am %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["In einem Jahr am %1$s danach am %2$s","In %n Jahren am %1$s danach am %2$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_" : ["In einer Minute am %1$s danach am %2$s und %3$s","In %n Minuten am %1$s danach am %2$s und %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_" : ["In einer Stunde am %1$s danach am %2$s und %3$s","In %n Stunden am %1$s danach am %2$s und %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_" : ["In einem Tag am %1$s danach am %2$s und %3$s","In %n Tagen am %1$s danach am %2$s und %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_" : ["In einer Woche am %1$s danach am %2$s und %3$s","In %n Wochen am %1$s danach am %2$s und %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_" : ["In einem Monat am %1$s danach am %2$s und %3$s","In %n Monaten am %1$s danach am %2$s und %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_" : ["In einem Jahr am %1$s danach am %2$s und %3$s","In %n Jahren am %1$s danach am %2$s und %3$s"],
     "No results." : "Keine Ergebnisse.",
     "Start typing." : "Anfangen zu tippen.",
     "Time zone:" : "Zeitzone:"

apps/dav/l10n/el.js

@@ -73,7 +73,19 @@ OC.L10N.register(
     "Where: %s" : "Που:%s",
     "%1$s via %2$s" : "%1$s μέσω %2$s",
     "In the past on %1$s for the entire day" : "Στο παρελθόν στις %1$s για ολόκληρη την ημέρα",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Σε ένα λεπτό στις %1$s για ολόκληρη την ημέρα","Σε %n λεπτά στις %1$s για ολόκληρη την ημέρα"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Σε μία ώρα στις %1$s για ολόκληρη την ημέρα","Σε %n ώρες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Σε μία ημέρα στις %1$s για ολόκληρη την ημέρα","Σε %n ημέρες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Σε μία εβδομάδα στις %1$s για ολόκληρη την ημέρα","Σε %n εβδομάδες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Σε έναν μήνα στις %1$s για ολόκληρη την ημέρα","Σε %n μήνες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Σε έναν χρόνο στις %1$s για ολόκληρη την ημέρα","Σε %n χρόνια στις %1$s για ολόκληρη την ημέρα"],
     "In the past on %1$s between %2$s - %3$s" : "Στο παρελθόν στις %1$s μεταξύ %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Σε ένα λεπτό στις %1$s μεταξύ %2$s - %3$s","Σε %n λεπτά στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Σε μία ώρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ώρες στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Σε μία ημέρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ημέρες στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Σε μία εβδομάδα στις %1$s μεταξύ %2$s - %3$s","Σε %n εβδομάδες στις %1$s μεταξύ %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_" : ["Σε έναν μήνα στις %1$s μεταξύ %2$s - %3$s","Σε %n μήνες στις %1$s μεταξύ %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_" : ["Σε έναν χρόνο στις %1$s μεταξύ %2$s - %3$s","Σε %n χρόνια στις %1$s μεταξύ %2$s - %3$s"],
     "Could not generate when statement" : "Αδυναμία δημιουργίας δήλωσης χρονισμού",
     "Every Day for the entire day" : "Κάθε Ημέρα για ολόκληρη την ημέρα",
     "Every Day for the entire day until %1$s" : "Κάθε Ημέρα για ολόκληρη την ημέρα έως %1$s",
@@ -111,8 +123,26 @@ OC.L10N.register(
     "On specific dates for the entire day until %1$s" : "Σε συγκεκριμένες ημερομηνίες για ολόκληρη την ημέρα έως %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "Σε συγκεκριμένες ημερομηνίες μεταξύ %1$s - %2$s έως %3$s",
     "In the past on %1$s" : "Στο παρελθόν στις %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Σε ένα λεπτό στις %1$s","Σε %n λεπτά στις %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Σε μια ώρα %1$s","Σε %n ώρες στις %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["Σε μία ημέρα στις %1$s","Σε %n ημέρες στις %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Σε μία εβδομάδα στις %1$s","Σε %n εβδομάδες στις %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["Σε έναν μήνα στις %1$s","Σε %n μήνες στις %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["Σε έναν χρόνο στις %1$s","Σε %n χρόνια στις %1$s"],
     "In the past on %1$s then on %2$s" : "Στο παρελθόν στις %1$s και έπειτα στις %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Σε μία ώρα στις %1$s και έπειτα στις %2$s","Σε %n ώρες στις %1$s και έπειτα στις %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s","Σε %n εβδομάδες στις %1$s και έπειτα στις %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "Στο παρελθόν στις %1$s και έπειτα στις %2$s και %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_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s και %3$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μια ώρα στο %1$s και μετά στο %2$s και %3$s","Σε %n  ώρες στις %1$s και στη συνέχεια στις %2$s και %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_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n εβδομάδες στις %极$s και έπειτα στις %2$s και %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_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s και %3$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s και %3$s"],
     "Could not generate next recurrence statement" : "Αδυναμία δημιουργίας δήλωσης επόμενης επανάληψης",
     "Cancelled: %1$s" : "Ακυρώθηκε: %1$s",
     "\"%1$s\" has been canceled" : "Το \"%1$s\" έχει ακυρωθεί",
@@ -307,36 +337,6 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Tentative" : "Δοκιμαστικό",
     "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Σε ένα λεπτό στις %1$s για ολόκληρη την ημέρα","Σε %n λεπτά στις %1$s για ολόκληρη την ημέρα"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Σε μία ώρα στις %1$s για ολόκληρη την ημέρα","Σε %n ώρες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Σε μία ημέρα στις %1$s για ολόκληρη την ημέρα","Σε %n ημέρες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Σε μία εβδομάδα στις %1$s για ολόκληρη την ημέρα","Σε %n εβδομάδες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Σε έναν μήνα στις %1$s για ολόκληρη την ημέρα","Σε %n μήνες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Σε έναν χρόνο στις %1$s για ολόκληρη την ημέρα","Σε %n χρόνια στις %1$s για ολόκληρη την ημέρα"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Σε ένα λεπτό στις %1$s μεταξύ %2$s - %3$s","Σε %n λεπτά στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Σε μία ώρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ώρες στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Σε μία ημέρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ημέρες στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Σε μία εβδομάδα στις %1$s μεταξύ %2$s - %3$s","Σε %n εβδομάδες στις %1$s μεταξύ %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_" : ["Σε έναν μήνα στις %1$s μεταξύ %2$s - %3$s","Σε %n μήνες στις %1$s μεταξύ %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_" : ["Σε έναν χρόνο στις %1$s μεταξύ %2$s - %3$s","Σε %n χρόνια στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Σε ένα λεπτό στις %1$s","Σε %n λεπτά στις %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Σε μια ώρα %1$s","Σε %n ώρες στις %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["Σε μία ημέρα στις %1$s","Σε %n ημέρες στις %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Σε μία εβδομάδα στις %1$s","Σε %n εβδομάδες στις %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["Σε έναν μήνα στις %1$s","Σε %n μήνες στις %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["Σε έναν χρόνο στις %1$s","Σε %n χρόνια στις %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Σε μία ώρα στις %1$s και έπειτα στις %2$s","Σε %n ώρες στις %1$s και έπειτα στις %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s","Σε %n εβδομάδες στις %1$s και έπειτα στις %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$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_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s και %3$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μια ώρα στο %1$s και μετά στο %2$s και %3$s","Σε %n  ώρες στις %1$s και στη συνέχεια στις %2$s και %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_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n εβδομάδες στις %极$s και έπειτα στις %2$s και %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_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s και %3$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s και %3$s"],
     "No results." : "Κανένα αποτέλεσμα.",
     "Start typing." : "Ξεκινήστε να πληκτρολογείτε.",
     "Time zone:" : "Ζώνη ώρας:"

apps/dav/l10n/el.json

@@ -71,7 +71,19 @@
     "Where: %s" : "Που:%s",
     "%1$s via %2$s" : "%1$s μέσω %2$s",
     "In the past on %1$s for the entire day" : "Στο παρελθόν στις %1$s για ολόκληρη την ημέρα",
+    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Σε ένα λεπτό στις %1$s για ολόκληρη την ημέρα","Σε %n λεπτά στις %1$s για ολόκληρη την ημέρα"],
+    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Σε μία ώρα στις %1$s για ολόκληρη την ημέρα","Σε %n ώρες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Σε μία ημέρα στις %1$s για ολόκληρη την ημέρα","Σε %n ημέρες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Σε μία εβδομάδα στις %1$s για ολόκληρη την ημέρα","Σε %n εβδομάδες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Σε έναν μήνα στις %1$s για ολόκληρη την ημέρα","Σε %n μήνες στις %1$s για ολόκληρη την ημέρα"],
+    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Σε έναν χρόνο στις %1$s για ολόκληρη την ημέρα","Σε %n χρόνια στις %1$s για ολόκληρη την ημέρα"],
     "In the past on %1$s between %2$s - %3$s" : "Στο παρελθόν στις %1$s μεταξύ %2$s - %3$s",
+    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Σε ένα λεπτό στις %1$s μεταξύ %2$s - %3$s","Σε %n λεπτά στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Σε μία ώρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ώρες στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Σε μία ημέρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ημέρες στις %1$s μεταξύ %2$s - %3$s"],
+    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Σε μία εβδομάδα στις %1$s μεταξύ %2$s - %3$s","Σε %n εβδομάδες στις %1$s μεταξύ %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_" : ["Σε έναν μήνα στις %1$s μεταξύ %2$s - %3$s","Σε %n μήνες στις %1$s μεταξύ %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_" : ["Σε έναν χρόνο στις %1$s μεταξύ %2$s - %3$s","Σε %n χρόνια στις %1$s μεταξύ %2$s - %3$s"],
     "Could not generate when statement" : "Αδυναμία δημιουργίας δήλωσης χρονισμού",
     "Every Day for the entire day" : "Κάθε Ημέρα για ολόκληρη την ημέρα",
     "Every Day for the entire day until %1$s" : "Κάθε Ημέρα για ολόκληρη την ημέρα έως %1$s",
@@ -109,8 +121,26 @@
     "On specific dates for the entire day until %1$s" : "Σε συγκεκριμένες ημερομηνίες για ολόκληρη την ημέρα έως %1$s",
     "On specific dates between %1$s - %2$s until %3$s" : "Σε συγκεκριμένες ημερομηνίες μεταξύ %1$s - %2$s έως %3$s",
     "In the past on %1$s" : "Στο παρελθόν στις %1$s",
+    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Σε ένα λεπτό στις %1$s","Σε %n λεπτά στις %1$s"],
+    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Σε μια ώρα %1$s","Σε %n ώρες στις %1$s"],
+    "_In a day on %1$s_::_In %n days on %1$s_" : ["Σε μία ημέρα στις %1$s","Σε %n ημέρες στις %1$s"],
+    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Σε μία εβδομάδα στις %1$s","Σε %n εβδομάδες στις %1$s"],
+    "_In a month on %1$s_::_In %n months on %1$s_" : ["Σε έναν μήνα στις %1$s","Σε %n μήνες στις %1$s"],
+    "_In a year on %1$s_::_In %n years on %1$s_" : ["Σε έναν χρόνο στις %1$s","Σε %n χρόνια στις %1$s"],
     "In the past on %1$s then on %2$s" : "Στο παρελθόν στις %1$s και έπειτα στις %2$s",
+    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s"],
+    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Σε μία ώρα στις %1$s και έπειτα στις %2$s","Σε %n ώρες στις %1$s και έπειτα στις %2$s"],
+    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s"],
+    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s","Σε %n εβδομάδες στις %1$s και έπειτα στις %2$s"],
+    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s"],
+    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s"],
     "In the past on %1$s then on %2$s and %3$s" : "Στο παρελθόν στις %1$s και έπειτα στις %2$s και %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_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s και %3$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μια ώρα στο %1$s και μετά στο %2$s και %3$s","Σε %n  ώρες στις %1$s και στη συνέχεια στις %2$s και %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_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n εβδομάδες στις %极$s και έπειτα στις %2$s και %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_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s και %3$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s και %3$s"],
     "Could not generate next recurrence statement" : "Αδυναμία δημιουργίας δήλωσης επόμενης επανάληψης",
     "Cancelled: %1$s" : "Ακυρώθηκε: %1$s",
     "\"%1$s\" has been canceled" : "Το \"%1$s\" έχει ακυρωθεί",
@@ -305,36 +335,6 @@
     "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Tentative" : "Δοκιμαστικό",
     "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
-    "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Σε ένα λεπτό στις %1$s για ολόκληρη την ημέρα","Σε %n λεπτά στις %1$s για ολόκληρη την ημέρα"],
-    "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Σε μία ώρα στις %1$s για ολόκληρη την ημέρα","Σε %n ώρες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Σε μία ημέρα στις %1$s για ολόκληρη την ημέρα","Σε %n ημέρες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Σε μία εβδομάδα στις %1$s για ολόκληρη την ημέρα","Σε %n εβδομάδες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Σε έναν μήνα στις %1$s για ολόκληρη την ημέρα","Σε %n μήνες στις %1$s για ολόκληρη την ημέρα"],
-    "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Σε έναν χρόνο στις %1$s για ολόκληρη την ημέρα","Σε %n χρόνια στις %1$s για ολόκληρη την ημέρα"],
-    "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Σε ένα λεπτό στις %1$s μεταξύ %2$s - %3$s","Σε %n λεπτά στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a hour on %1$s between %2$s - %3$s_::_In %n hours on %1$s between %2$s - %3$s_" : ["Σε μία ώρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ώρες στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a day on %1$s between %2$s - %3$s_::_In %n days on %1$s between %2$s - %3$s_" : ["Σε μία ημέρα στις %1$s μεταξύ %2$s - %3$s","Σε %n ημέρες στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a week on %1$s between %2$s - %3$s_::_In %n weeks on %1$s between %2$s - %3$s_" : ["Σε μία εβδομάδα στις %1$s μεταξύ %2$s - %3$s","Σε %n εβδομάδες στις %1$s μεταξύ %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_" : ["Σε έναν μήνα στις %1$s μεταξύ %2$s - %3$s","Σε %n μήνες στις %1$s μεταξύ %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_" : ["Σε έναν χρόνο στις %1$s μεταξύ %2$s - %3$s","Σε %n χρόνια στις %1$s μεταξύ %2$s - %3$s"],
-    "_In a minute on %1$s_::_In %n minutes on %1$s_" : ["Σε ένα λεπτό στις %1$s","Σε %n λεπτά στις %1$s"],
-    "_In a hour on %1$s_::_In %n hours on %1$s_" : ["Σε μια ώρα %1$s","Σε %n ώρες στις %1$s"],
-    "_In a day on %1$s_::_In %n days on %1$s_" : ["Σε μία ημέρα στις %1$s","Σε %n ημέρες στις %1$s"],
-    "_In a week on %1$s_::_In %n weeks on %1$s_" : ["Σε μία εβδομάδα στις %1$s","Σε %n εβδομάδες στις %1$s"],
-    "_In a month on %1$s_::_In %n months on %1$s_" : ["Σε έναν μήνα στις %1$s","Σε %n μήνες στις %1$s"],
-    "_In a year on %1$s_::_In %n years on %1$s_" : ["Σε έναν χρόνο στις %1$s","Σε %n χρόνια στις %1$s"],
-    "_In a minute on %1$s then on %2$s_::_In %n minutes on %1$s then on %2$s_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s"],
-    "_In a hour on %1$s then on %2$s_::_In %n hours on %1$s then on %2$s_" : ["Σε μία ώρα στις %1$s και έπειτα στις %2$s","Σε %n ώρες στις %1$s και έπειτα στις %2$s"],
-    "_In a day on %1$s then on %2$s_::_In %n days on %1$s then on %2$s_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s"],
-    "_In a week on %1$s then on %2$s_::_In %n weeks on %1$s then on %2$s_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s","Σε %n εβδομάδες στις %1$s και έπειτα στις %2$s"],
-    "_In a month on %1$s then on %2$s_::_In %n months on %1$s then on %2$s_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s"],
-    "_In a year on %1$s then on %2$s_::_In %n years on %1$s then on %2$s_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$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_" : ["Σε ένα λεπτό στις %1$s και έπειτα στις %2$s και %3$s","Σε %n λεπτά στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μια ώρα στο %1$s και μετά στο %2$s και %3$s","Σε %n  ώρες στις %1$s και στη συνέχεια στις %2$s και %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_" : ["Σε μία ημέρα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n ημέρες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε μία εβδομάδα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n εβδομάδες στις %极$s και έπειτα στις %2$s και %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_" : ["Σε έναν μήνα στις %1$s και έπειτα στις %2$s και %3$s","Σε %n μήνες στις %1$s και έπειτα στις %2$s και %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_" : ["Σε έναν χρόνο στις %1$s και έπειτα στις %2$s και %3$s","Σε %n χρόνια στις %1$s και έπειτα στις %2$s και %3$s"],
     "No results." : "Κανένα αποτέλεσμα.",
     "Start typing." : "Ξεκινήστε να πληκτρολογείτε.",
     "Time zone:" : "Ζώνη ώρας:"