From 3783902b5c014840cb918546a3178c7e2525c888 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 11 Jul 2024 22:59:47 +0200
Subject: [PATCH 01/12] feat(DigestSender): Make `and X more` a link

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 lib/DigestSender.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/DigestSender.php b/lib/DigestSender.php
index 5824d028f..9243ca22c 100644
--- a/lib/DigestSender.php
+++ b/lib/DigestSender.php
@@ -157,7 +157,12 @@ public function sendDigestForUser(string $uid, int $now, string $timezone, strin
 		}
 
 		if ($skippedCount) {
-			$template->addBodyListItem($l10n->n('and %n more ', 'and %n more ', $skippedCount));
+			$andMoreText = $l10n->n('and %n more…', 'and %n more…', $skippedCount);
+			$url = $this->urlGenerator->linkToRouteAbsolute('activity.Activities.showList', [ 'filter' => 'all' ]);
+			$template->addBodyListItem(
+				'<a href="' . $url . '">' . htmlspecialchars($andMoreText) . '</a>',
+				plainText: $andMoreText,
+			);
 		}
 
 		$template->addFooter('', $language);

From d89dbe823cba410156d09100c79111fae69f4697 Mon Sep 17 00:00:00 2001
From: skjnldsv <skjnldsv@protonmail.com>
Date: Sat, 13 Jul 2024 10:11:34 +0200
Subject: [PATCH 02/12] chore: update workflows from templates

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 .github/workflows/block-merge-eol.yml         | 13 +++--
 .github/workflows/block-merge-freeze.yml      | 13 +++--
 .github/workflows/command-compile.yml         | 40 +++++++++------
 .github/workflows/cypress.yml                 | 50 +++++++++++--------
 .../workflows/dependabot-approve-merge.yml    |  9 ++--
 .github/workflows/fixup.yml                   |  7 ++-
 .github/workflows/lint-info-xml.yml           |  7 ++-
 .github/workflows/lint-php-cs.yml             | 16 ++++--
 .github/workflows/lint-php.yml                | 24 +++++++--
 .github/workflows/lint-stylelint.yml          | 13 +++--
 .github/workflows/node-test.yml               | 29 +++++++----
 .github/workflows/node.yml                    |  7 ++-
 .github/workflows/npm-audit-fix.yml           | 26 +++++-----
 .github/workflows/phpunit-mariadb.yml         | 47 +++++++++++------
 .github/workflows/phpunit-mysql.yml           | 22 +++++---
 .github/workflows/phpunit-oci.yml             | 49 ++++++++++++------
 .github/workflows/phpunit-pgsql.yml           | 49 ++++++++++++------
 .github/workflows/phpunit-sqlite.yml          | 47 ++++++++++++-----
 .github/workflows/pr-feedback.yml             |  6 +--
 .github/workflows/psalm.yml                   | 16 ++++--
 .github/workflows/update-nextcloud-ocp.yml    | 29 ++++++-----
 21 files changed, 349 insertions(+), 170 deletions(-)

diff --git a/.github/workflows/block-merge-eol.yml b/.github/workflows/block-merge-eol.yml
index 4099cf62b..292494c72 100644
--- a/.github/workflows/block-merge-eol.yml
+++ b/.github/workflows/block-merge-eol.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Block merges for EOL
 
@@ -20,18 +23,18 @@ jobs:
 
     # Only run on stableXX branches
     if: startsWith( github.base_ref, 'stable')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
 
     steps:
-      - name: Download updater config
-        run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php
-
       - name: Set server major version environment
         run: |
           # retrieve version number from branch reference
           server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p')
           echo "server_major=$server_major" >> $GITHUB_ENV
+          echo "current_month=$(date +%Y-%m)" >> $GITHUB_ENV
 
       - name: Checking if ${{ env.server_major }} is EOL
         run: |
-          php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol // .beta[$version]["100"].eol // "NotEOL"' | grep -q "NotEOL"
+          curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \
+            | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \
+            | grep -q true
diff --git a/.github/workflows/block-merge-freeze.yml b/.github/workflows/block-merge-freeze.yml
index f2d029c99..bbbe1ab0d 100644
--- a/.github/workflows/block-merge-freeze.yml
+++ b/.github/workflows/block-merge-freeze.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Block merges during freezes
 
@@ -22,11 +25,15 @@ jobs:
 
     if: github.event.pull_request.draft == false
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
 
     steps:
-      - name: Download version.php from ${{ github.base_ref }}
-        run: curl https://raw.githubusercontent.com/nextcloud/server/${{ github.base_ref }}/version.php --output version.php
+      - name: Register server reference to fallback to master branch
+        run: |
+          server_ref="$(if [ '${{ github.base_ref }}' = 'main' ]; then echo -n 'master'; else echo -n '${{ github.base_ref }}'; fi)"
+          echo "server_ref=$server_ref" >> $GITHUB_ENV
+      - name: Download version.php from ${{ env.server_ref }}
+        run: curl 'https://raw.githubusercontent.com/nextcloud/server/${{ env.server_ref }}/version.php' --output version.php
 
       - name: Run check
         run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC'
diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml
index d70e0312d..5df64a3e7 100644
--- a/.github/workflows/command-compile.yml
+++ b/.github/workflows/command-compile.yml
@@ -1,3 +1,11 @@
+# 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: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 name: Compile Command
 on:
   issue_comment:
@@ -29,10 +37,10 @@ jobs:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
           comment-id: ${{ github.event.comment.id }}
-          reactions: "+1"
+          reactions: '+1'
 
       - name: Parse command
-        uses: skjnldsv/parse-command-comment@d8c0034c481b791dd6348fcacd9c510dc3a4cb4f # v2
+        uses: skjnldsv/parse-command-comment@5c955203c52424151e6d0e58fb9de8a9f6a605a1 # v2
         id: command
 
       # Init path depending on which command is run
@@ -61,7 +69,7 @@ jobs:
           key: git-repo
 
       - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           fetch-depth: 0
@@ -69,30 +77,30 @@ jobs:
 
       - name: Setup git
         run: |
-          git config --local user.email "nextcloud-command@users.noreply.github.com"
-          git config --local user.name "nextcloud-command"
+          git config --local user.email 'nextcloud-command@users.noreply.github.com'
+          git config --local user.name 'nextcloud-command'
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: package-engines-versions
         with:
           fallbackNode: '^20'
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
         with:
           node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
           cache: npm
 
       - name: Set up npm ${{ steps.package-engines-versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.package-engines-versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.package-engines-versions.outputs.npmVersion }}'
       
       - name: Rebase to ${{ needs.init.outputs.base_ref }}
         if: ${{ contains(needs.init.outputs.arg1, 'rebase') }}
         run: |
-          git fetch origin ${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}
-          git rebase origin/${{ needs.init.outputs.base_ref }}
+          git fetch origin '${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}'
+          git rebase 'origin/${{ needs.init.outputs.base_ref }}'
 
       - name: Install dependencies & build
         env:
@@ -105,30 +113,30 @@ jobs:
       - name: Commit default
         if: ${{ !contains(needs.init.outputs.arg1, 'fixup') && !contains(needs.init.outputs.arg1, 'amend') }}
         run: |
-          git add ${{ github.workspace }}${{ needs.init.outputs.git_path }}
+          git add '${{ github.workspace }}${{ needs.init.outputs.git_path }}'
           git commit --signoff -m 'chore(assets): Recompile assets'
  
       - name: Commit fixup
         if: ${{ contains(needs.init.outputs.arg1, 'fixup') }}
         run: |
-          git add ${{ github.workspace }}${{ needs.init.outputs.git_path }}
+          git add '${{ github.workspace }}${{ needs.init.outputs.git_path }}'
           git commit --fixup=HEAD --signoff
 
       - name: Commit amend
         if: ${{ contains(needs.init.outputs.arg1, 'amend') }}
         run: |
-          git add ${{ github.workspace }}${{ needs.init.outputs.git_path }}
+          git add '${{ github.workspace }}${{ needs.init.outputs.git_path }}'
           git commit --amend --no-edit --signoff
           # Remove any [skip ci] from the amended commit
           git commit --amend -m "$(git log -1 --format='%B' | sed '/\[skip ci\]/d')"
  
       - name: Push normally
         if: ${{ !contains(needs.init.outputs.arg1, 'rebase') && !contains(needs.init.outputs.arg1, 'amend') }}
-        run: git push origin ${{ needs.init.outputs.head_ref }}
+        run: git push origin '${{ needs.init.outputs.head_ref }}'
 
       - name: Force push
         if: ${{ contains(needs.init.outputs.arg1, 'rebase') || contains(needs.init.outputs.arg1, 'amend') }}
-        run: git push --force origin ${{ needs.init.outputs.head_ref }}
+        run: git push --force origin '${{ needs.init.outputs.head_ref }}'
 
       - name: Add reaction on failure
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
@@ -137,4 +145,4 @@ jobs:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
           comment-id: ${{ github.event.comment.id }}
-          reactions: "-1"
+          reactions: '-1'
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 3f0a8b5fc..aca91ae80 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -1,3 +1,11 @@
+# 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: Cypress
 
 on: pull_request
@@ -12,13 +20,13 @@ env:
 
   # This represents the server branch to checkout.
   # 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
+  # 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 }}
 
 jobs:
   init:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     outputs:
       nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
       npmVersion: ${{ steps.versions.outputs.npmVersion }}
@@ -28,11 +36,11 @@ jobs:
 
     steps:
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Check composer.json
         id: check_composer
-        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: "composer.json"
 
@@ -41,19 +49,19 @@ jobs:
         run: composer install --no-dev
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
           fallbackNode: "^20"
-          fallbackNpm: "^9"
+          fallbackNpm: "^10"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
       - name: Install node dependencies & build app
         run: |
@@ -75,7 +83,7 @@ jobs:
       matrix:
         # Run multiple copies of the current job in parallel
         # Please increase the number or runners as your tests suite grows
-        containers: [1, 2]
+        containers: ['component', '1', '2', '3']
 
     name: runner ${{ matrix.containers }}
 
@@ -88,24 +96,24 @@ jobs:
           path: ./
 
       - name: Set up node ${{ needs.init.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: ${{ needs.init.outputs.nodeVersion }}
 
       - name: Set up npm ${{ needs.init.outputs.npmVersion }}
-        run: npm i -g npm@"${{ needs.init.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ needs.init.outputs.npmVersion }}'
 
       - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
+        uses: cypress-io/github-action@8d3918616d8ac34caa2b49afc8b408b6a872a6f5 # v6.7.1
         with:
-          record: true
-          parallel: true
+          record: ${{ secrets.CYPRESS_RECORD_KEY && true }}
+          parallel: ${{ secrets.CYPRESS_RECORD_KEY && true }}
           # cypress run type
           component: ${{ matrix.containers == 'component' }}
-          group: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }}
+          group: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_GROUP }}
           # cypress env
-          ci-build-id: ${{ github.sha }}-${{ github.run_number }}
-          tag: ${{ github.event_name }}
+          ci-build-id: ${{ secrets.CYPRESS_RECORD_KEY && env.CYPRESS_BUILD_ID }}
+          tag: ${{ secrets.CYPRESS_RECORD_KEY && github.event_name }}
         env:
           # Needs to be prefixed with CYPRESS_
           CYPRESS_BRANCH: ${{ env.BRANCH }}
@@ -115,9 +123,11 @@ jobs:
           TESTING: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          CYPRESS_BUILD_ID: ${{ github.sha }}-${{ github.run_number }}
+          CYPRESS_GROUP: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }}
 
       - name: Upload snapshots
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: always()
         with:
           name: snapshots_${{ matrix.containers }}
@@ -128,14 +138,14 @@ jobs:
         run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log
 
       - name: Upload NC logs
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: failure() && matrix.containers != 'component'
         with:
           name: nc_logs_${{ matrix.containers }}
           path: nextcloud.log
 
   summary:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [init, cypress]
 
     if: always()
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
index 9951547f7..0d6b2c26d 100644
--- a/.github/workflows/dependabot-approve-merge.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Dependabot
 
@@ -21,14 +24,14 @@ concurrency:
 
 jobs:
   auto-approve-merge:
-    if: github.actor == 'dependabot[bot]'
-    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]' || github.actor == 'renovate[bot]'
+    runs-on: ubuntu-latest-low
     permissions:
       # for hmarr/auto-approve-action to approve PRs
       pull-requests: write
 
     steps:
-      # Github actions bot approve
+      # GitHub actions bot approve
       - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml
index 9548d19f2..69da2bbb0 100644
--- a/.github/workflows/fixup.yml
+++ b/.github/workflows/fixup.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Block fixup and squash commits
 
@@ -24,10 +27,10 @@ jobs:
       pull-requests: write
     name: Block fixup and squash commits
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
 
     steps:
       - name: Run check
-        uses: skjnldsv/block-fixup-merge-action@42d26e1b536ce61e5cf467d65fb76caf4aa85acf # v1
+        uses: skjnldsv/block-fixup-merge-action@c138ea99e45e186567b64cf065ce90f7158c236a # v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml
index e81edd2f2..e040764b4 100644
--- a/.github/workflows/lint-info-xml.yml
+++ b/.github/workflows/lint-info-xml.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Lint info.xml
 
@@ -16,12 +19,12 @@ concurrency:
 
 jobs:
   xml-linters:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
 
     name: info.xml lint
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Download schema
         run: wget -O info.xsd https://raw.githubusercontent.com/nextcloud/server/master/resources/app-info-shipped.xsd
diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml
index 163706eaa..b6f12320d 100644
--- a/.github/workflows/lint-php-cs.yml
+++ b/.github/workflows/lint-php-cs.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Lint php-cs
 
@@ -22,12 +25,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get php version
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
 
-      - name: Set up php8.2
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+      - name: Set up php${{ steps.versions.outputs.php-available }}
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
-          php-version: 8.2
+          php-version: ${{ steps.versions.outputs.php-available }}
+          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:
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index dfe724673..fc4303762 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Lint php
 
@@ -15,22 +18,35 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-versions: ${{ steps.versions.outputs.php-versions }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.0.0
+
   php-lint:
     runs-on: ubuntu-latest
+    needs: matrix
     strategy:
       matrix:
-        php-versions: [ '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}}
 
     name: php-lint
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
+          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
         env:
@@ -42,7 +58,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: php-lint
 
     if: always()
diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml
index 684bb6198..047b6d74b 100644
--- a/.github/workflows/lint-stylelint.yml
+++ b/.github/workflows/lint-stylelint.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Lint stylelint
 
@@ -22,22 +25,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
           fallbackNode: '^20'
-          fallbackNpm: '^9'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
       - name: Install dependencies
         env:
diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
index 43a19ed2b..9686a166e 100644
--- a/.github/workflows/node-test.yml
+++ b/.github/workflows/node-test.yml
@@ -1,3 +1,11 @@
+# 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 tests
 
 on:
@@ -17,13 +25,16 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
       src: ${{ steps.changes.outputs.src}}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         continue-on-error: true
         with:
@@ -49,22 +60,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
           fallbackNode: '^20'
-          fallbackNpm: '^9'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
       - name: Install dependencies & build
         env:
@@ -80,14 +91,14 @@ jobs:
         run: npm run test:coverage --if-present
 
       - name: Collect coverage
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           files: ./coverage/lcov.info
 
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [changes, test]
 
     if: always()
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 9b26478e1..f918b5c41 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -20,6 +20,9 @@ concurrency:
 jobs:
   changes:
     runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
       src: ${{ steps.changes.outputs.src}}
@@ -50,7 +53,7 @@ jobs:
     name: NPM build
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Read package.json node and npm engines version
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
@@ -65,7 +68,7 @@ jobs:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
       - name: Install dependencies & build
         env:
diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index 7c79bcb42..0e7ba4b5d 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -2,6 +2,9 @@
 #
 # 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: Npm audit fix and compile
 
@@ -24,28 +27,28 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ matrix.branches }}
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
         id: versions
         with:
           fallbackNode: '^20'
-          fallbackNpm: '^9'
+          fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
 
       - name: Fix npm audit
-        run: |
-          npm audit fix
+        id: npm-audit
+        uses: nextcloud-libraries/npm-audit-action@2a60bd2e79cc77f2cc4d9a3fe40f1a69896f3a87 # v0.1.0
 
       - name: Run npm ci and npm run build
         if: always()
@@ -57,17 +60,16 @@ jobs:
 
       - name: Create Pull Request
         if: always()
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: "chore(deps): fix npm audit"
+          commit-message: 'fix(deps): Fix npm audit'
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
           branch: automated/noid/${{ matrix.branches }}-fix-npm-audit
-          title: "[${{ matrix.branches }}] Fix npm audit"
-          body: |
-            Auto-generated fix of npm audit
+          title: '[${{ matrix.branches }}] Fix npm audit'
+          body: ${{ steps.npm-audit.outputs.markdown }}
           labels: |
             dependencies
             3. to review
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index 2cc98bd69..f621539f0 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -2,8 +2,11 @@
 #
 # 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: PHPUnit mariadb
+name: PHPUnit MariaDB
 
 on: pull_request
 
@@ -15,14 +18,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-version: ${{ steps.versions.outputs.php-available-list }}
+      server-max: ${{ steps.versions.outputs.branches-max-list }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
       src: ${{ steps.changes.outputs.src}}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         continue-on-error: true
         with:
@@ -42,14 +61,14 @@ jobs:
   phpunit-mariadb:
     runs-on: ubuntu-latest
 
-    needs: changes
+    needs: [changes, matrix]
     if: needs.changes.outputs.src != 'false'
 
     strategy:
       matrix:
-        php-versions: ['8.2']
+        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
         mariadb-versions: ['10.6', '10.11']
-        server-versions: ['master']
 
     name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
@@ -69,19 +88,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -94,11 +113,11 @@ jobs:
       - name: Enable ONLY_FULL_GROUP_BY MariaDB option
         run: |
           echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
-          echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+          echo 'SELECT @@sql_mode;' | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
 
       - name: Check composer file existence
         id: check_composer
-        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: apps/${{ env.APP_NAME }}/composer.json
 
@@ -121,7 +140,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:unit " | wc -l | grep 1
+          composer run --list | grep '^  test:unit ' | wc -l | grep 1
 
       - name: PHPUnit
         # Only run if phpunit config file exists
@@ -134,7 +153,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:integration " | wc -l | grep 1
+          composer run --list | grep '^  test:integration ' | wc -l | grep 1
 
       - name: Run Nextcloud
         # Only run if phpunit integration config file exists
@@ -162,7 +181,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [changes, phpunit-mariadb]
 
     if: always()
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index cfa423758..dc2981b8f 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: PHPUnit MySQL
 
@@ -21,16 +24,19 @@ jobs:
       matrix: ${{ steps.versions.outputs.sparse-matrix }}
     steps:
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Get version matrix
         id: versions
         uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
         with:
-          matrix: '{"mysql-versions": ["8.1"]}'
+          matrix: '{"mysql-versions": ["8.4"]}'
 
   changes:
     runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
       src: ${{ steps.changes.outputs.src}}
@@ -80,19 +86,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -105,7 +111,7 @@ jobs:
       - name: Enable ONLY_FULL_GROUP_BY MySQL option
         run: |
           echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
-          echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+          echo 'SELECT @@sql_mode;' | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
 
       - name: Check composer file existence
         id: check_composer
@@ -132,7 +138,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:unit " | wc -l | grep 1
+          composer run --list | grep '^  test:unit ' | wc -l | grep 1
 
       - name: PHPUnit
         # Only run if phpunit config file exists
@@ -145,7 +151,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:integration " | wc -l | grep 1
+          composer run --list | grep '^  test:integration ' | wc -l | grep 1
 
       - name: Run Nextcloud
         # Only run if phpunit integration config file exists
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index e1ae20327..9c2372162 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: PHPUnit OCI
 
@@ -15,14 +18,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-version: ${{ steps.versions.outputs.php-available-list }}
+      server-max: ${{ steps.versions.outputs.branches-max-list }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
-      src: ${{ steps.changes.outputs.src}}
+      src: ${{ steps.changes.outputs.src }}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         continue-on-error: true
         with:
@@ -40,15 +59,17 @@ jobs:
               - 'composer.lock'
 
   phpunit-oci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
-    needs: changes
+    needs: [changes, matrix]
     if: needs.changes.outputs.src != 'false'
 
     strategy:
       matrix:
-        php-versions: ['8.2']
-        server-versions: ['master']
+        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+
+    name: OCI PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
     services:
       oracle:
@@ -78,19 +99,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -102,7 +123,7 @@ jobs:
 
       - name: Check composer file existence
         id: check_composer
-        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: apps/${{ env.APP_NAME }}/composer.json
 
@@ -125,7 +146,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:unit " | wc -l | grep 1
+          composer run --list | grep '^  test:unit ' | wc -l | grep 1
 
       - name: PHPUnit
         # Only run if phpunit config file exists
@@ -138,7 +159,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:integration " | wc -l | grep 1
+          composer run --list | grep '^  test:integration ' | wc -l | grep 1
 
       - name: Run Nextcloud
         # Only run if phpunit integration config file exists
@@ -166,7 +187,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [changes, phpunit-oci]
 
     if: always()
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 45a82163e..f784790fb 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -2,8 +2,11 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
-name: PHPUnit pgsql
+name: PHPUnit PostgreSQL
 
 on: pull_request
 
@@ -15,14 +18,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-version: ${{ steps.versions.outputs.php-available-list }}
+      server-max: ${{ steps.versions.outputs.branches-max-list }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
-      src: ${{ steps.changes.outputs.src}}
+      src: ${{ steps.changes.outputs.src }}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         continue-on-error: true
         with:
@@ -42,13 +61,15 @@ jobs:
   phpunit-pgsql:
     runs-on: ubuntu-latest
 
-    needs: changes
+    needs: [changes, matrix]
     if: needs.changes.outputs.src != 'false'
 
     strategy:
       matrix:
-        php-versions: ['8.2']
-        server-versions: ['master']
+        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+
+    name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
     services:
       postgres:
@@ -68,19 +89,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -92,7 +113,7 @@ jobs:
 
       - name: Check composer file existence
         id: check_composer
-        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: apps/${{ env.APP_NAME }}/composer.json
 
@@ -115,7 +136,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:unit " | wc -l | grep 1
+          composer run --list | grep '^  test:unit ' | wc -l | grep 1
 
       - name: PHPUnit
         # Only run if phpunit config file exists
@@ -128,7 +149,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:integration " | wc -l | grep 1
+          composer run --list | grep '^  test:integration ' | wc -l | grep 1
 
       - name: Run Nextcloud
         # Only run if phpunit integration config file exists
@@ -156,7 +177,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [changes, phpunit-pgsql]
 
     if: always()
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index ed1151ab9..28b9b8c9e 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -2,8 +2,11 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
-name: PHPUnit sqlite
+name: PHPUnit SQLite
 
 on: pull_request
 
@@ -15,14 +18,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-version: ${{ steps.versions.outputs.php-available-list }}
+      server-max: ${{ steps.versions.outputs.branches-max-list }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
+    permissions:
+      contents: read
+      pull-requests: read
 
     outputs:
       src: ${{ steps.changes.outputs.src}}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         continue-on-error: true
         with:
@@ -42,13 +61,15 @@ jobs:
   phpunit-sqlite:
     runs-on: ubuntu-latest
 
-    needs: changes
+    needs: [changes, matrix]
     if: needs.changes.outputs.src != 'false'
 
     strategy:
       matrix:
-        php-versions: ['8.2']
-        server-versions: ['master']
+        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+
+    name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
     steps:
       - name: Set app env
@@ -57,19 +78,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -81,7 +102,7 @@ jobs:
 
       - name: Check composer file existence
         id: check_composer
-        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: apps/${{ env.APP_NAME }}/composer.json
 
@@ -104,7 +125,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:unit " | wc -l | grep 1
+          composer run --list | grep '^  test:unit ' | wc -l | grep 1
 
       - name: PHPUnit
         # Only run if phpunit config file exists
@@ -117,7 +138,7 @@ jobs:
         continue-on-error: true
         working-directory: apps/${{ env.APP_NAME }}
         run: |
-          composer run --list | grep "^  test:integration " | wc -l | grep 1
+          composer run --list | grep '^  test:integration ' | wc -l | grep 1
 
       - name: Run Nextcloud
         # Only run if phpunit integration config file exists
@@ -145,7 +166,7 @@ jobs:
   summary:
     permissions:
       contents: none
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     needs: [changes, phpunit-sqlite]
 
     if: always()
diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml
index be0d028f9..7b68226f8 100644
--- a/.github/workflows/pr-feedback.yml
+++ b/.github/workflows/pr-feedback.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           feedback-message: |
             Hello there,
-            Thank you so much for taking the time and effort to create a pull request to our Nextcloud project. 
+            Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
 
             We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
 
@@ -45,6 +45,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: "2024-04-30"
-          exempt-authors: "${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot"
+          start-date: '2024-04-30'
+          exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot'
           exempt-bots: true
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 8e7ffd024..169446c38 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Static analysis
 
@@ -18,12 +21,17 @@ jobs:
     name: static-psalm-analysis
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Get php version
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
 
-      - name: Set up php8.2
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+      - name: Set up php${{ steps.versions.outputs.php-available }}
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
-          php-version: 8.2
+          php-version: ${{ steps.versions.outputs.php-available }}
+          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:
diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml
index af3988b76..ae3f02039 100644
--- a/.github/workflows/update-nextcloud-ocp.yml
+++ b/.github/workflows/update-nextcloud-ocp.yml
@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Update nextcloud/ocp
 
@@ -23,7 +26,7 @@ jobs:
 
     steps:
       - id: checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ matrix.branches }}
           submodules: true
@@ -31,7 +34,7 @@ jobs:
 
       - name: Set up php8.2
         if: steps.checkout.outcome == 'success'
-        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
+        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
         with:
           php-version: 8.2
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -54,15 +57,15 @@ jobs:
       - name: Composer update nextcloud/ocp
         id: update_branch
         if: ${{ steps.checkout.outcome == 'success' && matrix.branches != 'main' }}
-        run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
+        run: composer require --dev 'nextcloud/ocp:dev-${{ matrix.branches }}'
 
       - name: Raise on issue on failure
-        uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
+        uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
         if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          title: Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}
-          body: Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}
+          title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
+          body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
 
       - name: Composer update nextcloud/ocp
         id: update_main
@@ -70,12 +73,12 @@ jobs:
         run: composer require --dev nextcloud/ocp:dev-master
 
       - name: Raise on issue on failure
-        uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
+        uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
         if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_main.conclusion == 'failure' }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          title: Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}
-          body: Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}
+          title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
+          body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
 
       - name: Reset checkout 3rdparty
         if: steps.checkout.outcome == 'success'
@@ -100,15 +103,15 @@ jobs:
 
       - name: Create Pull Request
         if: steps.checkout.outcome == 'success'
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: "chore(dev-deps): Bump nextcloud/ocp package"
+          commit-message: 'chore(dev-deps): Bump nextcloud/ocp package'
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
-          branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
-          title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
+          branch: 'automated/noid/${{ matrix.branches }}-update-nextcloud-ocp'
+          title: '[${{ matrix.branches }}] Update nextcloud/ocp dependency'
           body: |
             Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
           labels: |

From 429b7cecfc53654b0932dd439b8718446003d809 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Mon, 15 Jul 2024 15:43:09 +0200
Subject: [PATCH 03/12] test: Add component testing config

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 cypress.config.ts                     |  7 +++++
 cypress/component/ComponentName.cy.ts |  9 ++++++
 cypress/support/component-index.html  | 19 ++++++++++++
 cypress/support/component.ts          | 44 +++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 cypress/component/ComponentName.cy.ts
 create mode 100644 cypress/support/component-index.html
 create mode 100644 cypress/support/component.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index 9875c977b..205b06965 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -89,4 +89,11 @@ export default defineConfig({
 				})
 		},
 	},
+
+	component: {
+		devServer: {
+			framework: 'vue',
+			bundler: 'vite',
+		},
+	},
 })
diff --git a/cypress/component/ComponentName.cy.ts b/cypress/component/ComponentName.cy.ts
new file mode 100644
index 000000000..f7a54b231
--- /dev/null
+++ b/cypress/component/ComponentName.cy.ts
@@ -0,0 +1,9 @@
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+describe('ComponentName.cy.ts', () => {
+  it('playground', () => {
+    // cy.mount()
+  })
+})
\ No newline at end of file
diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html
new file mode 100644
index 000000000..b13e0aa54
--- /dev/null
+++ b/cypress/support/component-index.html
@@ -0,0 +1,19 @@
+/**
+* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+* SPDX-License-Identifier: AGPL-3.0-or-later
+*/
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <title>Components App</title>
+</head>
+
+<body>
+  <div data-cy-root></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
new file mode 100644
index 000000000..299c18ad2
--- /dev/null
+++ b/cypress/support/component.ts
@@ -0,0 +1,44 @@
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+// ***********************************************************
+// This example support/component.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+import { mount } from 'cypress/vue2'
+
+// Augment the Cypress namespace to include type definitions for
+// your custom command.
+// Alternatively, can be defined in cypress/support/component.d.ts
+// with a <reference path="./component" /> at the top of your spec.
+declare global {
+  namespace Cypress {
+    interface Chainable {
+      mount: typeof mount
+    }
+  }
+}
+
+Cypress.Commands.add('mount', mount)
+
+// Example use:
+// cy.mount(MyComponent)
\ No newline at end of file

From a7114bd4036f26c93bdf977013019609be1938f2 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Mon, 15 Jul 2024 16:02:21 +0200
Subject: [PATCH 04/12] test: Inhibit component testing

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 .github/workflows/cypress.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index aca91ae80..c3fa2eb4b 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -83,7 +83,7 @@ jobs:
       matrix:
         # Run multiple copies of the current job in parallel
         # Please increase the number or runners as your tests suite grows
-        containers: ['component', '1', '2', '3']
+        containers: ['1', '2', '3']
 
     name: runner ${{ matrix.containers }}
 

From 08b357af0166aef814b1a22f80a88be24dde35b5 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 11 Jul 2024 22:52:57 +0200
Subject: [PATCH 05/12] fix(DigestSender): Do not add `and 1 more` in digest
 mail but simply include it

1 more makes no sense as we can simply show that additional activity,
so instead show it if there is only one more activity.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 lib/DigestSender.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/DigestSender.php b/lib/DigestSender.php
index 9243ca22c..523a2b23e 100644
--- a/lib/DigestSender.php
+++ b/lib/DigestSender.php
@@ -120,20 +120,26 @@ public function sendDigestForUser(string $uid, int $now, string $timezone, strin
 			return;
 		}
 
+		$activitiesLimit = self::ACTIVITY_LIMIT;
+		if ($count === $activitiesLimit + 1) {
+			// it makes no sense to have a "and 1 more" entry as it takes exactly the same space as the one entry more
+			$activitiesLimit += 1;
+		}
+
 		/** @var IEvent[] $activities */
 		$activities = $this->data->get(
 			$this->groupHelper,
 			$this->userSettings,
 			$uid,
 			$lastSend,
-			self::ACTIVITY_LIMIT,
+			$activitiesLimit,
 			'asc',
 			'by',
 			'',
 			0,
 			true
 		);
-		$skippedCount = max(0, $count - self::ACTIVITY_LIMIT);
+		$skippedCount = max(0, $count - $activitiesLimit);
 
 		$template = $this->mailer->createEMailTemplate('activity.Notification', [
 			'displayname' => $user->getDisplayName(),

From 22bf3f2329e5c1e7cf2b9fa627a59c02ae8ae86a Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Tue, 16 Jul 2024 00:24:13 +0000
Subject: [PATCH 06/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/af.js         | 2 +-
 l10n/af.json       | 2 +-
 l10n/an.js         | 2 +-
 l10n/an.json       | 2 +-
 l10n/ar.js         | 2 +-
 l10n/ar.json       | 2 +-
 l10n/ast.js        | 2 +-
 l10n/ast.json      | 2 +-
 l10n/be.js         | 2 +-
 l10n/be.json       | 2 +-
 l10n/bg.js         | 2 +-
 l10n/bg.json       | 2 +-
 l10n/br.js         | 2 +-
 l10n/br.json       | 2 +-
 l10n/ca.js         | 2 +-
 l10n/ca.json       | 2 +-
 l10n/cs.js         | 2 +-
 l10n/cs.json       | 2 +-
 l10n/cy_GB.js      | 2 +-
 l10n/cy_GB.json    | 2 +-
 l10n/da.js         | 2 +-
 l10n/da.json       | 2 +-
 l10n/de.js         | 2 +-
 l10n/de.json       | 2 +-
 l10n/de_DE.js      | 2 +-
 l10n/de_DE.json    | 2 +-
 l10n/el.js         | 2 +-
 l10n/el.json       | 2 +-
 l10n/en_GB.js      | 2 +-
 l10n/en_GB.json    | 2 +-
 l10n/eo.js         | 2 +-
 l10n/eo.json       | 2 +-
 l10n/es.js         | 2 +-
 l10n/es.json       | 2 +-
 l10n/es_419.js     | 2 +-
 l10n/es_419.json   | 2 +-
 l10n/es_AR.js      | 2 +-
 l10n/es_AR.json    | 2 +-
 l10n/es_CL.js      | 2 +-
 l10n/es_CL.json    | 2 +-
 l10n/es_CO.js      | 2 +-
 l10n/es_CO.json    | 2 +-
 l10n/es_CR.js      | 2 +-
 l10n/es_CR.json    | 2 +-
 l10n/es_DO.js      | 2 +-
 l10n/es_DO.json    | 2 +-
 l10n/es_EC.js      | 2 +-
 l10n/es_EC.json    | 2 +-
 l10n/es_GT.js      | 2 +-
 l10n/es_GT.json    | 2 +-
 l10n/es_HN.js      | 2 +-
 l10n/es_HN.json    | 2 +-
 l10n/es_MX.js      | 2 +-
 l10n/es_MX.json    | 2 +-
 l10n/es_NI.js      | 2 +-
 l10n/es_NI.json    | 2 +-
 l10n/es_PA.js      | 2 +-
 l10n/es_PA.json    | 2 +-
 l10n/es_PE.js      | 2 +-
 l10n/es_PE.json    | 2 +-
 l10n/es_PR.js      | 2 +-
 l10n/es_PR.json    | 2 +-
 l10n/es_PY.js      | 2 +-
 l10n/es_PY.json    | 2 +-
 l10n/es_SV.js      | 2 +-
 l10n/es_SV.json    | 2 +-
 l10n/es_UY.js      | 2 +-
 l10n/es_UY.json    | 2 +-
 l10n/et_EE.js      | 2 +-
 l10n/et_EE.json    | 2 +-
 l10n/eu.js         | 2 +-
 l10n/eu.json       | 2 +-
 l10n/fa.js         | 2 +-
 l10n/fa.json       | 2 +-
 l10n/fi.js         | 2 +-
 l10n/fi.json       | 2 +-
 l10n/fr.js         | 2 +-
 l10n/fr.json       | 2 +-
 l10n/ga.js         | 2 +-
 l10n/ga.json       | 2 +-
 l10n/gl.js         | 2 +-
 l10n/gl.json       | 2 +-
 l10n/he.js         | 2 +-
 l10n/he.json       | 2 +-
 l10n/hi_IN.js      | 2 +-
 l10n/hi_IN.json    | 2 +-
 l10n/hr.js         | 2 +-
 l10n/hr.json       | 2 +-
 l10n/hu.js         | 2 +-
 l10n/hu.json       | 2 +-
 l10n/hy.js         | 2 +-
 l10n/hy.json       | 2 +-
 l10n/id.js         | 2 +-
 l10n/id.json       | 2 +-
 l10n/is.js         | 2 +-
 l10n/is.json       | 2 +-
 l10n/it.js         | 2 +-
 l10n/it.json       | 2 +-
 l10n/ja.js         | 2 +-
 l10n/ja.json       | 2 +-
 l10n/ka.js         | 2 +-
 l10n/ka.json       | 2 +-
 l10n/ka_GE.js      | 2 +-
 l10n/ka_GE.json    | 2 +-
 l10n/kab.js        | 2 +-
 l10n/kab.json      | 2 +-
 l10n/km.js         | 2 +-
 l10n/km.json       | 2 +-
 l10n/ko.js         | 2 +-
 l10n/ko.json       | 2 +-
 l10n/lo.js         | 2 +-
 l10n/lo.json       | 2 +-
 l10n/lt_LT.js      | 2 +-
 l10n/lt_LT.json    | 2 +-
 l10n/lv.js         | 2 +-
 l10n/lv.json       | 2 +-
 l10n/mk.js         | 2 +-
 l10n/mk.json       | 2 +-
 l10n/mn.js         | 2 +-
 l10n/mn.json       | 2 +-
 l10n/mr.js         | 2 +-
 l10n/mr.json       | 2 +-
 l10n/my.js         | 2 +-
 l10n/my.json       | 2 +-
 l10n/nb.js         | 2 +-
 l10n/nb.json       | 2 +-
 l10n/ne.js         | 2 +-
 l10n/ne.json       | 2 +-
 l10n/nl.js         | 2 +-
 l10n/nl.json       | 2 +-
 l10n/nn_NO.js      | 2 +-
 l10n/nn_NO.json    | 2 +-
 l10n/oc.js         | 2 +-
 l10n/oc.json       | 2 +-
 l10n/pl.js         | 2 +-
 l10n/pl.json       | 2 +-
 l10n/ps.js         | 2 +-
 l10n/ps.json       | 2 +-
 l10n/pt_BR.js      | 2 +-
 l10n/pt_BR.json    | 2 +-
 l10n/pt_PT.js      | 2 +-
 l10n/pt_PT.json    | 2 +-
 l10n/ro.js         | 2 +-
 l10n/ro.json       | 2 +-
 l10n/ru.js         | 2 +-
 l10n/ru.json       | 2 +-
 l10n/sc.js         | 2 +-
 l10n/sc.json       | 2 +-
 l10n/si.js         | 2 +-
 l10n/si.json       | 2 +-
 l10n/sk.js         | 2 +-
 l10n/sk.json       | 2 +-
 l10n/sl.js         | 2 +-
 l10n/sl.json       | 2 +-
 l10n/sq.js         | 2 +-
 l10n/sq.json       | 2 +-
 l10n/sr.js         | 2 +-
 l10n/sr.json       | 2 +-
 l10n/sr@latin.js   | 2 +-
 l10n/sr@latin.json | 2 +-
 l10n/sv.js         | 2 +-
 l10n/sv.json       | 2 +-
 l10n/th.js         | 2 +-
 l10n/th.json       | 2 +-
 l10n/tr.js         | 2 +-
 l10n/tr.json       | 2 +-
 l10n/uk.js         | 2 +-
 l10n/uk.json       | 2 +-
 l10n/vi.js         | 2 +-
 l10n/vi.json       | 2 +-
 l10n/zh_CN.js      | 2 +-
 l10n/zh_CN.json    | 2 +-
 l10n/zh_HK.js      | 2 +-
 l10n/zh_HK.json    | 2 +-
 l10n/zh_TW.js      | 2 +-
 l10n/zh_TW.json    | 2 +-
 176 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/l10n/af.js b/l10n/af.js
index b92f2c130..4f13e5ebf 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -8,13 +8,13 @@ OC.L10N.register(
     "Settings have been updated." : "Instellings is bygewerk.",
     "No activities" : "Geen aktiwiteite",
     "Daily activity summary for %s" : "Daaglikse aktiwiteitsopsomming vir %s",
-    "_and %n more _::_and %n more _" : ["en nog %n","en nog %n"],
     "All activities" : "Alle aktiwiteite",
     "By others" : "Deur ander",
     "By you" : "Deur u",
     "Hello %s" : "Dag %s",
     "Hello %s," : "Dag %s,",
     "There was some activity at %s" : "Daar was aktiwiteit by %s",
+    "_and %n more _::_and %n more _" : ["en nog %n","en nog %n"],
     "Mail" : "Pos",
     "Push" : "Stoot",
     "Activity" : "Aktiwiteit",
diff --git a/l10n/af.json b/l10n/af.json
index a17b7d124..32aead296 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -6,13 +6,13 @@
     "Settings have been updated." : "Instellings is bygewerk.",
     "No activities" : "Geen aktiwiteite",
     "Daily activity summary for %s" : "Daaglikse aktiwiteitsopsomming vir %s",
-    "_and %n more _::_and %n more _" : ["en nog %n","en nog %n"],
     "All activities" : "Alle aktiwiteite",
     "By others" : "Deur ander",
     "By you" : "Deur u",
     "Hello %s" : "Dag %s",
     "Hello %s," : "Dag %s,",
     "There was some activity at %s" : "Daar was aktiwiteit by %s",
+    "_and %n more _::_and %n more _" : ["en nog %n","en nog %n"],
     "Mail" : "Pos",
     "Push" : "Stoot",
     "Activity" : "Aktiwiteit",
diff --git a/l10n/an.js b/l10n/an.js
index 1815d3466..cda953c07 100644
--- a/l10n/an.js
+++ b/l10n/an.js
@@ -9,7 +9,6 @@ OC.L10N.register(
     "Recent activity" : "Actividat rezién",
     "No activities" : "No i hai actividat",
     "Daily activity summary for %s" : "Resumen de l'actividat diaria de %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "All activities" : "Totas as actividat",
     "By others" : "Por atros",
     "By you" : "Por tu",
@@ -17,6 +16,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "I abió bella mica d'actividat en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "Mail" : "Correu",
     "Push" : "Empentar",
     "Activity" : "Actividat",
diff --git a/l10n/an.json b/l10n/an.json
index c3b9db237..9e8a6147f 100644
--- a/l10n/an.json
+++ b/l10n/an.json
@@ -7,7 +7,6 @@
     "Recent activity" : "Actividat rezién",
     "No activities" : "No i hai actividat",
     "Daily activity summary for %s" : "Resumen de l'actividat diaria de %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "All activities" : "Totas as actividat",
     "By others" : "Por atros",
     "By you" : "Por tu",
@@ -15,6 +14,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "I abió bella mica d'actividat en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "Mail" : "Correu",
     "Push" : "Empentar",
     "Activity" : "Actividat",
diff --git a/l10n/ar.js b/l10n/ar.js
index 07739e6ca..c76de0f92 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "لا توجد أيّ حركاتٍ",
     "More activities" : "المزيد من الحركات",
     "Daily activity summary for %s" : "ملخص الحركات اليومية لـ%s",
-    "_and %n more _::_and %n more _" : [" و %n المزيد ","و %n آخر","و %n آخرين","و %n أنشطة أخرى","و %n أنشطة أخرى","و %n  أخرى"],
     "All activities" : "جميع الحركات",
     "By others" : "من قِبَل آخرين",
     "By you" : "من قِبَلك",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "أهلاً %s",
     "Hello %s," : "أهلاً %s،",
     "There was some activity at %s" : "كانت هنالك بعض الحركات عند %s",
+    "_and %n more _::_and %n more _" : [" و %n المزيد ","و %n آخر","و %n آخرين","و %n أنشطة أخرى","و %n أنشطة أخرى","و %n  أخرى"],
     "Mail" : "البريد",
     "Push" : "أرسِل",
     "Activity" : "الحركات",
diff --git a/l10n/ar.json b/l10n/ar.json
index dbd809a09..c2411c658 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -9,7 +9,6 @@
     "No activities" : "لا توجد أيّ حركاتٍ",
     "More activities" : "المزيد من الحركات",
     "Daily activity summary for %s" : "ملخص الحركات اليومية لـ%s",
-    "_and %n more _::_and %n more _" : [" و %n المزيد ","و %n آخر","و %n آخرين","و %n أنشطة أخرى","و %n أنشطة أخرى","و %n  أخرى"],
     "All activities" : "جميع الحركات",
     "By others" : "من قِبَل آخرين",
     "By you" : "من قِبَلك",
@@ -17,6 +16,7 @@
     "Hello %s" : "أهلاً %s",
     "Hello %s," : "أهلاً %s،",
     "There was some activity at %s" : "كانت هنالك بعض الحركات عند %s",
+    "_and %n more _::_and %n more _" : [" و %n المزيد ","و %n آخر","و %n آخرين","و %n أنشطة أخرى","و %n أنشطة أخرى","و %n  أخرى"],
     "Mail" : "البريد",
     "Push" : "أرسِل",
     "Activity" : "الحركات",
diff --git a/l10n/ast.js b/l10n/ast.js
index 313c444b2..660a34043 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Nun hai actividá",
     "More activities" : "Más actividaes",
     "Daily activity summary for %s" : "Resume d'actividá diariu pa: %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "All activities" : "Toles actividaes",
     "By others" : "Por otros",
     "By you" : "Por ti",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hola, %s",
     "Hello %s," : "Hola, %s.",
     "There was some activity at %s" : "Hebo actividá en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "Mail" : "Corréu electrónicu",
     "Push" : "Push",
     "Activity" : "Actividá",
diff --git a/l10n/ast.json b/l10n/ast.json
index 4de644e37..241a8a0f5 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -9,7 +9,6 @@
     "No activities" : "Nun hai actividá",
     "More activities" : "Más actividaes",
     "Daily activity summary for %s" : "Resume d'actividá diariu pa: %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "All activities" : "Toles actividaes",
     "By others" : "Por otros",
     "By you" : "Por ti",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hola, %s",
     "Hello %s," : "Hola, %s.",
     "There was some activity at %s" : "Hebo actividá en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más"],
     "Mail" : "Corréu electrónicu",
     "Push" : "Push",
     "Activity" : "Actividá",
diff --git a/l10n/be.js b/l10n/be.js
index d518ce5ad..332456a99 100644
--- a/l10n/be.js
+++ b/l10n/be.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Няма дзеянняў",
     "More activities" : "Больш актыўнасцей",
     "Daily activity summary for %s" : "Зводка штодзённай дзейнасці для %s",
-    "_and %n more _::_and %n more _" : ["і яшчэ %n","і яшчэ %n","і яшчэ %n","і яшчэ %n"],
     "All activities" : "Уся дзейнасць",
     "By others" : "Іншымі",
     "By you" : "Вамі",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Прывітанне %s",
     "Hello %s," : "Прывітанне %s,",
     "There was some activity at %s" : "Была нейкая актыўнасць на %s",
+    "_and %n more _::_and %n more _" : ["і яшчэ %n","і яшчэ %n","і яшчэ %n","і яшчэ %n"],
     "Mail" : "Пошта",
     "Push" : "Push-паведамлення",
     "Activity" : "Падзеі",
diff --git a/l10n/be.json b/l10n/be.json
index c9c7e9ee8..d3b3c37c5 100644
--- a/l10n/be.json
+++ b/l10n/be.json
@@ -8,7 +8,6 @@
     "No activities" : "Няма дзеянняў",
     "More activities" : "Больш актыўнасцей",
     "Daily activity summary for %s" : "Зводка штодзённай дзейнасці для %s",
-    "_and %n more _::_and %n more _" : ["і яшчэ %n","і яшчэ %n","і яшчэ %n","і яшчэ %n"],
     "All activities" : "Уся дзейнасць",
     "By others" : "Іншымі",
     "By you" : "Вамі",
@@ -16,6 +15,7 @@
     "Hello %s" : "Прывітанне %s",
     "Hello %s," : "Прывітанне %s,",
     "There was some activity at %s" : "Была нейкая актыўнасць на %s",
+    "_and %n more _::_and %n more _" : ["і яшчэ %n","і яшчэ %n","і яшчэ %n","і яшчэ %n"],
     "Mail" : "Пошта",
     "Push" : "Push-паведамлення",
     "Activity" : "Падзеі",
diff --git a/l10n/bg.js b/l10n/bg.js
index 2a3de536a..5632c75d7 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Няма активности",
     "More activities" : "Още активности",
     "Daily activity summary for %s" : "Обобщение на дневната активност за %s",
-    "_and %n more _::_and %n more _" : ["и %n още ","и %n още "],
     "All activities" : "Всички активности",
     "By others" : "От други",
     "By you" : "От Вас",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Здравейте %s",
     "Hello %s," : "Здравейте %s,",
     "There was some activity at %s" : "Имаше събитие в %s",
+    "_and %n more _::_and %n more _" : ["и %n още ","и %n още "],
     "Mail" : "Поща",
     "Push" : "Директно /push/",
     "Activity" : "Активност",
diff --git a/l10n/bg.json b/l10n/bg.json
index 174e8eb76..e71d7cc7d 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -8,7 +8,6 @@
     "No activities" : "Няма активности",
     "More activities" : "Още активности",
     "Daily activity summary for %s" : "Обобщение на дневната активност за %s",
-    "_and %n more _::_and %n more _" : ["и %n още ","и %n още "],
     "All activities" : "Всички активности",
     "By others" : "От други",
     "By you" : "От Вас",
@@ -16,6 +15,7 @@
     "Hello %s" : "Здравейте %s",
     "Hello %s," : "Здравейте %s,",
     "There was some activity at %s" : "Имаше събитие в %s",
+    "_and %n more _::_and %n more _" : ["и %n още ","и %n още "],
     "Mail" : "Поща",
     "Push" : "Директно /push/",
     "Activity" : "Активност",
diff --git a/l10n/br.js b/l10n/br.js
index 7a4af2de2..9193675d8 100644
--- a/l10n/br.js
+++ b/l10n/br.js
@@ -6,13 +6,13 @@ OC.L10N.register(
     "Activity feed" : "Lanvad obererezh",
     "Your settings have been updated." : "Nevesaet eo bet hoc'h arventennoù",
     "Settings have been updated." : "Nevesaet ez eus bet arventennoù zo.",
-    "_and %n more _::_and %n more _" : ["hag %n all","ha %n all","ha %n all","ha %n all","ha %n all"],
     "All activities" : "Hollad obererezhioù",
     "By others" : "Gant tud all",
     "By you" : "Ganeoc'h",
     "Hello %s" : "Demat deoc'h %s",
     "Hello %s," : "Demat deoc'h %s, ",
     "There was some activity at %s" : "Tammoù obererezhioù zo bet da %s",
+    "_and %n more _::_and %n more _" : ["hag %n all","ha %n all","ha %n all","ha %n all","ha %n all"],
     "Mail" : "Postel",
     "Push" : "Kas war-raok",
     "Activity" : "Obererezh",
diff --git a/l10n/br.json b/l10n/br.json
index c7ecc3e8e..c4f8505f5 100644
--- a/l10n/br.json
+++ b/l10n/br.json
@@ -4,13 +4,13 @@
     "Activity feed" : "Lanvad obererezh",
     "Your settings have been updated." : "Nevesaet eo bet hoc'h arventennoù",
     "Settings have been updated." : "Nevesaet ez eus bet arventennoù zo.",
-    "_and %n more _::_and %n more _" : ["hag %n all","ha %n all","ha %n all","ha %n all","ha %n all"],
     "All activities" : "Hollad obererezhioù",
     "By others" : "Gant tud all",
     "By you" : "Ganeoc'h",
     "Hello %s" : "Demat deoc'h %s",
     "Hello %s," : "Demat deoc'h %s, ",
     "There was some activity at %s" : "Tammoù obererezhioù zo bet da %s",
+    "_and %n more _::_and %n more _" : ["hag %n all","ha %n all","ha %n all","ha %n all","ha %n all"],
     "Mail" : "Postel",
     "Push" : "Kas war-raok",
     "Activity" : "Obererezh",
diff --git a/l10n/ca.js b/l10n/ca.js
index ca92ec1b0..b06459241 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "No hi ha cap activitat",
     "More activities" : "Més activitat",
     "Daily activity summary for %s" : "Resum d'activitat diari per a %s",
-    "_and %n more _::_and %n more _" : ["i %n més ","i %n més "],
     "All activities" : "Tota l'activitat",
     "By others" : "Activitat d'altres usuaris",
     "By you" : "Activitat pròpia",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hola, %s",
     "Hello %s," : "Hola, %s,",
     "There was some activity at %s" : "Hi ha hagut activitat a %s",
+    "_and %n more _::_and %n more _" : ["i %n més ","i %n més "],
     "Mail" : "Correu electrònic",
     "Push" : "Notificació automàtica",
     "Activity" : "Activitat",
diff --git a/l10n/ca.json b/l10n/ca.json
index b3e1a4a6a..1709a3a18 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -9,7 +9,6 @@
     "No activities" : "No hi ha cap activitat",
     "More activities" : "Més activitat",
     "Daily activity summary for %s" : "Resum d'activitat diari per a %s",
-    "_and %n more _::_and %n more _" : ["i %n més ","i %n més "],
     "All activities" : "Tota l'activitat",
     "By others" : "Activitat d'altres usuaris",
     "By you" : "Activitat pròpia",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hola, %s",
     "Hello %s," : "Hola, %s,",
     "There was some activity at %s" : "Hi ha hagut activitat a %s",
+    "_and %n more _::_and %n more _" : ["i %n més ","i %n més "],
     "Mail" : "Correu electrònic",
     "Push" : "Notificació automàtica",
     "Activity" : "Activitat",
diff --git a/l10n/cs.js b/l10n/cs.js
index 825252dc5..9cf2d62c1 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Žádné aktivity",
     "More activities" : "Další aktivity",
     "Daily activity summary for %s" : "Denní souhrn aktivit pro %s",
-    "_and %n more _::_and %n more _" : ["a %n další","a %n další","a %n dalších","a %n další"],
     "All activities" : "Všechny aktivity",
     "By others" : "Ostatními",
     "By you" : "Vámi",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Dobrý den %s",
     "Hello %s," : "Dobrý den %s,",
     "There was some activity at %s" : "Na %s došlo k následující aktivitě",
+    "_and %n more _::_and %n more _" : ["a %n další","a %n další","a %n dalších","a %n další"],
     "Mail" : "Pošta",
     "Push" : "Služba push",
     "Activity" : "Aktivita",
diff --git a/l10n/cs.json b/l10n/cs.json
index eabf943f9..90a76a9e6 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -9,7 +9,6 @@
     "No activities" : "Žádné aktivity",
     "More activities" : "Další aktivity",
     "Daily activity summary for %s" : "Denní souhrn aktivit pro %s",
-    "_and %n more _::_and %n more _" : ["a %n další","a %n další","a %n dalších","a %n další"],
     "All activities" : "Všechny aktivity",
     "By others" : "Ostatními",
     "By you" : "Vámi",
@@ -17,6 +16,7 @@
     "Hello %s" : "Dobrý den %s",
     "Hello %s," : "Dobrý den %s,",
     "There was some activity at %s" : "Na %s došlo k následující aktivitě",
+    "_and %n more _::_and %n more _" : ["a %n další","a %n další","a %n dalších","a %n další"],
     "Mail" : "Pošta",
     "Push" : "Služba push",
     "Activity" : "Aktivita",
diff --git a/l10n/cy_GB.js b/l10n/cy_GB.js
index aa753e81e..a4ea79b35 100644
--- a/l10n/cy_GB.js
+++ b/l10n/cy_GB.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Dim gweithgareddau",
     "More activities" : "Mwy o weithgareddau",
     "Daily activity summary for %s" : "Crynodeb o weithgarwch dyddiol ar gyfer %s",
-    "_and %n more _::_and %n more _" : ["a %n arall ","a %n arall ","a %n arall ","a %n arall "],
     "All activities" : "Pob gweithgaredd",
     "By others" : "Gan eraill",
     "By you" : "Gennych chi",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Helo %s",
     "Hello %s," : "Helo %s,",
     "There was some activity at %s" : "Roedd rhywfaint o weithgarwch yn %s",
+    "_and %n more _::_and %n more _" : ["a %n arall ","a %n arall ","a %n arall ","a %n arall "],
     "Mail" : "E-bost",
     "Push" : "Gwthio",
     "Activity" : "Gweithred",
diff --git a/l10n/cy_GB.json b/l10n/cy_GB.json
index 9b32b7ead..95f9a172b 100644
--- a/l10n/cy_GB.json
+++ b/l10n/cy_GB.json
@@ -8,7 +8,6 @@
     "No activities" : "Dim gweithgareddau",
     "More activities" : "Mwy o weithgareddau",
     "Daily activity summary for %s" : "Crynodeb o weithgarwch dyddiol ar gyfer %s",
-    "_and %n more _::_and %n more _" : ["a %n arall ","a %n arall ","a %n arall ","a %n arall "],
     "All activities" : "Pob gweithgaredd",
     "By others" : "Gan eraill",
     "By you" : "Gennych chi",
@@ -16,6 +15,7 @@
     "Hello %s" : "Helo %s",
     "Hello %s," : "Helo %s,",
     "There was some activity at %s" : "Roedd rhywfaint o weithgarwch yn %s",
+    "_and %n more _::_and %n more _" : ["a %n arall ","a %n arall ","a %n arall ","a %n arall "],
     "Mail" : "E-bost",
     "Push" : "Gwthio",
     "Activity" : "Gweithred",
diff --git a/l10n/da.js b/l10n/da.js
index 298c7c5e2..7d9043bb7 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetsoversigt for %s",
-    "_and %n more _::_and %n more _" : ["og %n mere ","og %n flere"],
     "All activities" : "Alle aktiviteter",
     "By others" : "Af andre",
     "By you" : "Af dig",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hej %s",
     "Hello %s," : "Hej %s,",
     "There was some activity at %s" : "Der var noget aktivitet omkring %s",
+    "_and %n more _::_and %n more _" : ["og %n mere ","og %n flere"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Aktivitet",
diff --git a/l10n/da.json b/l10n/da.json
index 9852d9775..6e7419313 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -9,7 +9,6 @@
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetsoversigt for %s",
-    "_and %n more _::_and %n more _" : ["og %n mere ","og %n flere"],
     "All activities" : "Alle aktiviteter",
     "By others" : "Af andre",
     "By you" : "Af dig",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hej %s",
     "Hello %s," : "Hej %s,",
     "There was some activity at %s" : "Der var noget aktivitet omkring %s",
+    "_and %n more _::_and %n more _" : ["og %n mere ","og %n flere"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Aktivitet",
diff --git a/l10n/de.js b/l10n/de.js
index dd657c5a8..94e47e7d9 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von dir",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Es gab Aktivitäten bei %s",
+    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "Mail" : "E-Mail",
     "Push" : "Push",
     "Activity" : "Aktivität",
diff --git a/l10n/de.json b/l10n/de.json
index 86040fff7..118c7f48a 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -9,7 +9,6 @@
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von dir",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Es gab Aktivitäten bei %s",
+    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "Mail" : "E-Mail",
     "Push" : "Push",
     "Activity" : "Aktivität",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 8cf0b2d83..de8399661 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Es gab Aktivitäten bei %s",
+    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "Mail" : "E-Mail",
     "Push" : "Push",
     "Activity" : "Aktivität",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index b8c7c046c..6a54d2dd4 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -9,7 +9,6 @@
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Es gab Aktivitäten bei %s",
+    "_and %n more _::_and %n more _" : ["und %n weiterer","und %n weitere"],
     "Mail" : "E-Mail",
     "Push" : "Push",
     "Activity" : "Aktivität",
diff --git a/l10n/el.js b/l10n/el.js
index b5fd97f2b..2356680c3 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Καμία δραστηριότητα",
     "More activities" : "Περισσότερες δραστηριότητες",
     "Daily activity summary for %s" : "Σύνοψη ημερήσιας δραστηριότητας για %s",
-    "_and %n more _::_and %n more _" : ["και %n επιπλέον","και %n επιπλέον"],
     "All activities" : "Όλες οι δραστηριότητες",
     "By others" : "Από άλλους",
     "By you" : "Από εσάς",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Γεια σας %s",
     "Hello %s," : "Γεια σας %s,",
     "There was some activity at %s" : "Υπήρξε δραστηριότητα στο %s",
+    "_and %n more _::_and %n more _" : ["και %n επιπλέον","και %n επιπλέον"],
     "Mail" : "Ταχυδρομείο",
     "Push" : "Ειδοποίηση Push",
     "Activity" : "Δραστηριότητα",
diff --git a/l10n/el.json b/l10n/el.json
index 85154581a..f3c210a43 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -9,7 +9,6 @@
     "No activities" : "Καμία δραστηριότητα",
     "More activities" : "Περισσότερες δραστηριότητες",
     "Daily activity summary for %s" : "Σύνοψη ημερήσιας δραστηριότητας για %s",
-    "_and %n more _::_and %n more _" : ["και %n επιπλέον","και %n επιπλέον"],
     "All activities" : "Όλες οι δραστηριότητες",
     "By others" : "Από άλλους",
     "By you" : "Από εσάς",
@@ -17,6 +16,7 @@
     "Hello %s" : "Γεια σας %s",
     "Hello %s," : "Γεια σας %s,",
     "There was some activity at %s" : "Υπήρξε δραστηριότητα στο %s",
+    "_and %n more _::_and %n more _" : ["και %n επιπλέον","και %n επιπλέον"],
     "Mail" : "Ταχυδρομείο",
     "Push" : "Ειδοποίηση Push",
     "Activity" : "Δραστηριότητα",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 5670c7999..d313c72f9 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "No activities",
     "More activities" : "More activities",
     "Daily activity summary for %s" : "Daily activity summary for %s",
-    "_and %n more _::_and %n more _" : ["and %n more","and %n more"],
     "All activities" : "All activities",
     "By others" : "By others",
     "By you" : "By you",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hello %s",
     "Hello %s," : "Hello %s,",
     "There was some activity at %s" : "There was some activity at %s",
+    "_and %n more _::_and %n more _" : ["and %n more","and %n more"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Activity",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 7247d320c..2db8d0a92 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -9,7 +9,6 @@
     "No activities" : "No activities",
     "More activities" : "More activities",
     "Daily activity summary for %s" : "Daily activity summary for %s",
-    "_and %n more _::_and %n more _" : ["and %n more","and %n more"],
     "All activities" : "All activities",
     "By others" : "By others",
     "By you" : "By you",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hello %s",
     "Hello %s," : "Hello %s,",
     "There was some activity at %s" : "There was some activity at %s",
+    "_and %n more _::_and %n more _" : ["and %n more","and %n more"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Activity",
diff --git a/l10n/eo.js b/l10n/eo.js
index 180b114bb..97cecbb79 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Neniu aktivaĵo",
     "More activities" : "Pli da aktivecoj",
     "Daily activity summary for %s" : "Taga resumo de aktiveco por %s",
-    "_and %n more _::_and %n more _" : ["kaj %n aliaj ","kaj %n aliaj "],
     "All activities" : "Ĉiuj aktivaĵoj",
     "By others" : "De aliuloj",
     "By you" : "De vi",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Saluton %s",
     "Hello %s," : "Saluton %s,",
     "There was some activity at %s" : "Okazis kelkaj aktivaĵoj en %s",
+    "_and %n more _::_and %n more _" : ["kaj %n aliaj ","kaj %n aliaj "],
     "Mail" : "Retpoŝto",
     "Push" : "Puŝi",
     "Activity" : "Aktivaĵoj",
diff --git a/l10n/eo.json b/l10n/eo.json
index 644701737..c85b26668 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -9,7 +9,6 @@
     "No activities" : "Neniu aktivaĵo",
     "More activities" : "Pli da aktivecoj",
     "Daily activity summary for %s" : "Taga resumo de aktiveco por %s",
-    "_and %n more _::_and %n more _" : ["kaj %n aliaj ","kaj %n aliaj "],
     "All activities" : "Ĉiuj aktivaĵoj",
     "By others" : "De aliuloj",
     "By you" : "De vi",
@@ -17,6 +16,7 @@
     "Hello %s" : "Saluton %s",
     "Hello %s," : "Saluton %s,",
     "There was some activity at %s" : "Okazis kelkaj aktivaĵoj en %s",
+    "_and %n more _::_and %n more _" : ["kaj %n aliaj ","kaj %n aliaj "],
     "Mail" : "Retpoŝto",
     "Push" : "Puŝi",
     "Activity" : "Aktivaĵoj",
diff --git a/l10n/es.js b/l10n/es.js
index f4e785509..0dd2b090c 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "No hay actividad",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad diaria para %s",
-    "_and %n more _::_and %n more _" : ["y 1%n más","y %n más ","y %n más "],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por ti",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Ha habido actividad en %s",
+    "_and %n more _::_and %n more _" : ["y 1%n más","y %n más ","y %n más "],
     "Mail" : "Correo electrónico",
     "Push" : "Push",
     "Activity" : "Actividad",
diff --git a/l10n/es.json b/l10n/es.json
index 7eae99371..d966a2280 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -9,7 +9,6 @@
     "No activities" : "No hay actividad",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad diaria para %s",
-    "_and %n more _::_and %n more _" : ["y 1%n más","y %n más ","y %n más "],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por ti",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Ha habido actividad en %s",
+    "_and %n more _::_and %n more _" : ["y 1%n más","y %n más ","y %n más "],
     "Mail" : "Correo electrónico",
     "Push" : "Push",
     "Activity" : "Actividad",
diff --git a/l10n/es_419.js b/l10n/es_419.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_419.js
+++ b/l10n/es_419.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_419.json b/l10n/es_419.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_419.json
+++ b/l10n/es_419.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_AR.js b/l10n/es_AR.js
index 1878a5255..79ff17d84 100644
--- a/l10n/es_AR.js
+++ b/l10n/es_AR.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Sin actividades",
     "More activities" : "Otras actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para... 1%s",
-    "_and %n more _::_and %n more _" : ["y %n mas","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por Ud.",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s:",
     "There was some activity at %s" : "Ha habido alguna actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n mas","y %n más","y %n más"],
     "Mail" : "Correo Electrónico",
     "Push" : "Notificación Push",
     "Activity" : "Actividad",
diff --git a/l10n/es_AR.json b/l10n/es_AR.json
index c8ccf3538..c3392ac18 100644
--- a/l10n/es_AR.json
+++ b/l10n/es_AR.json
@@ -8,7 +8,6 @@
     "No activities" : "Sin actividades",
     "More activities" : "Otras actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para... 1%s",
-    "_and %n more _::_and %n more _" : ["y %n mas","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por Ud.",
@@ -16,6 +15,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s:",
     "There was some activity at %s" : "Ha habido alguna actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n mas","y %n más","y %n más"],
     "Mail" : "Correo Electrónico",
     "Push" : "Notificación Push",
     "Activity" : "Actividad",
diff --git a/l10n/es_CL.js b/l10n/es_CL.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_CL.js
+++ b/l10n/es_CL.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_CL.json b/l10n/es_CL.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_CL.json
+++ b/l10n/es_CL.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_CO.js b/l10n/es_CO.js
index afe931f36..5bdc1c35c 100644
--- a/l10n/es_CO.js
+++ b/l10n/es_CO.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para 1%s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Notificación",
     "Activity" : "Actividad",
diff --git a/l10n/es_CO.json b/l10n/es_CO.json
index c1347aea4..1a6f8a1b9 100644
--- a/l10n/es_CO.json
+++ b/l10n/es_CO.json
@@ -8,7 +8,6 @@
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para 1%s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -16,6 +15,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Notificación",
     "Activity" : "Actividad",
diff --git a/l10n/es_CR.js b/l10n/es_CR.js
index 8d67fcf88..57cbf2afd 100644
--- a/l10n/es_CR.js
+++ b/l10n/es_CR.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Enviar",
     "Activity" : "Actividad",
diff --git a/l10n/es_CR.json b/l10n/es_CR.json
index 702a8fa58..e09527d36 100644
--- a/l10n/es_CR.json
+++ b/l10n/es_CR.json
@@ -8,7 +8,6 @@
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de actividad diaria para %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -16,6 +15,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Enviar",
     "Activity" : "Actividad",
diff --git a/l10n/es_DO.js b/l10n/es_DO.js
index 62c5c6bd0..cdfe7b648 100644
--- a/l10n/es_DO.js
+++ b/l10n/es_DO.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Enviar",
     "Activity" : "Actividad",
diff --git a/l10n/es_DO.json b/l10n/es_DO.json
index 70e964511..13bf9343b 100644
--- a/l10n/es_DO.json
+++ b/l10n/es_DO.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Enviar",
     "Activity" : "Actividad",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 8f0462183..c59099bc8 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Sin actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad diaria al %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Push",
     "Activity" : "Actividad",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index 109683212..5787e616e 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -8,7 +8,6 @@
     "No activities" : "Sin actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad diaria al %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -16,6 +15,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Push",
     "Activity" : "Actividad",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 111b5ab71..5d1c3301e 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -9,13 +9,13 @@ OC.L10N.register(
     "Recent activity" : "Actividad reciente",
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index 5e50a6534..7a40c6442 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -7,13 +7,13 @@
     "Recent activity" : "Actividad reciente",
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index 87fab7208..e5f7b5585 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad reciente para %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Instantánea",
     "Activity" : "Actividad",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index fbfc3fc80..2cca26f06 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -9,7 +9,6 @@
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad reciente para %s",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Push" : "Instantánea",
     "Activity" : "Actividad",
diff --git a/l10n/es_NI.js b/l10n/es_NI.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_NI.js
+++ b/l10n/es_NI.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_NI.json b/l10n/es_NI.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_NI.json
+++ b/l10n/es_NI.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PE.js b/l10n/es_PE.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_PE.js
+++ b/l10n/es_PE.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PE.json b/l10n/es_PE.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_PE.json
+++ b/l10n/es_PE.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PY.js b/l10n/es_PY.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_PY.js
+++ b/l10n/es_PY.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_PY.json b/l10n/es_PY.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_PY.json
+++ b/l10n/es_PY.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index a0df47fa1..76578bcda 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index 9179aa435..3b92ee47f 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "Tus configuraciones se han actualizado.",
     "Settings have been updated." : "Las configuraciones han sido actualizadas",
     "No activities" : "No hay actividades",
-    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
     "Hello %s" : "Hola %s",
     "Hello %s," : "Hola %s,",
     "There was some activity at %s" : "Se tuvo algo de actividad en %s",
+    "_and %n more _::_and %n more _" : ["y %n más","y %n más","y %n más"],
     "Mail" : "Correo",
     "Activity" : "Actividad",
     "Notifications" : "Notificaciones",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index d25938e49..9608aa6a4 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Tegevusi pole",
     "More activities" : "Rohkem tegevusi",
     "Daily activity summary for %s" : "Päevase tegevuse kokkuvõte %s jaoks",
-    "_and %n more _::_and %n more _" : ["ja %n veel","ja %n veel"],
     "All activities" : "Kõik tegevused",
     "By others" : "Teiste poolt",
     "By you" : "Sinu poolt",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Tere %s",
     "Hello %s," : "Tere %s,",
     "There was some activity at %s" : "Mõningane tegevus %s",
+    "_and %n more _::_and %n more _" : ["ja %n veel","ja %n veel"],
     "Mail" : "Kirjad",
     "Push" : "Vajuta",
     "Activity" : "Tegevused",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 002a62bb8..a6eb16f01 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -8,7 +8,6 @@
     "No activities" : "Tegevusi pole",
     "More activities" : "Rohkem tegevusi",
     "Daily activity summary for %s" : "Päevase tegevuse kokkuvõte %s jaoks",
-    "_and %n more _::_and %n more _" : ["ja %n veel","ja %n veel"],
     "All activities" : "Kõik tegevused",
     "By others" : "Teiste poolt",
     "By you" : "Sinu poolt",
@@ -16,6 +15,7 @@
     "Hello %s" : "Tere %s",
     "Hello %s," : "Tere %s,",
     "There was some activity at %s" : "Mõningane tegevus %s",
+    "_and %n more _::_and %n more _" : ["ja %n veel","ja %n veel"],
     "Mail" : "Kirjad",
     "Push" : "Vajuta",
     "Activity" : "Tegevused",
diff --git a/l10n/eu.js b/l10n/eu.js
index 38486f519..9883362d2 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Ez da jarduerarik",
     "More activities" : "Jarduera gehiago",
     "Daily activity summary for %s" : "%s-(r)en eguneko jardueren laburpena",
-    "_and %n more _::_and %n more _" : ["eta %n gehiago","eta %n gehiago"],
     "All activities" : "Jarduera guztiak",
     "By others" : "Besteenak",
     "By you" : "Zureak",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Kaixo %s",
     "Hello %s," : "Kaixo %s,",
     "There was some activity at %s" : "%s-(e)n jarduera egon da",
+    "_and %n more _::_and %n more _" : ["eta %n gehiago","eta %n gehiago"],
     "Mail" : "Epostaz",
     "Push" : "Push",
     "Activity" : "Jarduerak",
diff --git a/l10n/eu.json b/l10n/eu.json
index 7e5ee0567..a3a51e0ad 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -9,7 +9,6 @@
     "No activities" : "Ez da jarduerarik",
     "More activities" : "Jarduera gehiago",
     "Daily activity summary for %s" : "%s-(r)en eguneko jardueren laburpena",
-    "_and %n more _::_and %n more _" : ["eta %n gehiago","eta %n gehiago"],
     "All activities" : "Jarduera guztiak",
     "By others" : "Besteenak",
     "By you" : "Zureak",
@@ -17,6 +16,7 @@
     "Hello %s" : "Kaixo %s",
     "Hello %s," : "Kaixo %s,",
     "There was some activity at %s" : "%s-(e)n jarduera egon da",
+    "_and %n more _::_and %n more _" : ["eta %n gehiago","eta %n gehiago"],
     "Mail" : "Epostaz",
     "Push" : "Push",
     "Activity" : "Jarduerak",
diff --git a/l10n/fa.js b/l10n/fa.js
index 1e83fd75a..93f326007 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "بدون فعالیت",
     "More activities" : "فعالیت‌های بیش‌تر",
     "Daily activity summary for %s" : "خلاصهٔ فعّالیت‌های روزانه برای %s",
-    "_and %n more _::_and %n more _" : ["و %n بیشتر","و %n بیشتر"],
     "All activities" : "تمامی فعالیت ها",
     "By others" : "توسط دیگران",
     "By you" : "توسط شما",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "سلام %s",
     "Hello %s," : "سلام %s",
     "There was some activity at %s" : "تعدادی فعالیت در %s وجود دارد",
+    "_and %n more _::_and %n more _" : ["و %n بیشتر","و %n بیشتر"],
     "Mail" : "ایمیل",
     "Push" : "فرستادن",
     "Activity" : "فعالیت",
diff --git a/l10n/fa.json b/l10n/fa.json
index defb59400..fc358f054 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -9,7 +9,6 @@
     "No activities" : "بدون فعالیت",
     "More activities" : "فعالیت‌های بیش‌تر",
     "Daily activity summary for %s" : "خلاصهٔ فعّالیت‌های روزانه برای %s",
-    "_and %n more _::_and %n more _" : ["و %n بیشتر","و %n بیشتر"],
     "All activities" : "تمامی فعالیت ها",
     "By others" : "توسط دیگران",
     "By you" : "توسط شما",
@@ -17,6 +16,7 @@
     "Hello %s" : "سلام %s",
     "Hello %s," : "سلام %s",
     "There was some activity at %s" : "تعدادی فعالیت در %s وجود دارد",
+    "_and %n more _::_and %n more _" : ["و %n بیشتر","و %n بیشتر"],
     "Mail" : "ایمیل",
     "Push" : "فرستادن",
     "Activity" : "فعالیت",
diff --git a/l10n/fi.js b/l10n/fi.js
index 25687f66a..db19f6b76 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Ei tapahtumia",
     "More activities" : "Lisää tapahtumia",
     "Daily activity summary for %s" : "Päivittäisten tapahtumien yhteenveto%s lle",
-    "_and %n more _::_and %n more _" : ["ja %n lisää","ja %n lisää"],
     "All activities" : "Kaikki tapahtumat",
     "By others" : "Muiden tapahtumat",
     "By you" : "Omat tapahtumat",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "%s sisältää joitain uusia tapahtumia",
+    "_and %n more _::_and %n more _" : ["ja %n lisää","ja %n lisää"],
     "Mail" : "Sähköposti",
     "Push" : "Push",
     "Activity" : "Tapahtumat",
diff --git a/l10n/fi.json b/l10n/fi.json
index 8bdfd9643..62a1bce70 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -9,7 +9,6 @@
     "No activities" : "Ei tapahtumia",
     "More activities" : "Lisää tapahtumia",
     "Daily activity summary for %s" : "Päivittäisten tapahtumien yhteenveto%s lle",
-    "_and %n more _::_and %n more _" : ["ja %n lisää","ja %n lisää"],
     "All activities" : "Kaikki tapahtumat",
     "By others" : "Muiden tapahtumat",
     "By you" : "Omat tapahtumat",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "%s sisältää joitain uusia tapahtumia",
+    "_and %n more _::_and %n more _" : ["ja %n lisää","ja %n lisää"],
     "Mail" : "Sähköposti",
     "Push" : "Push",
     "Activity" : "Tapahtumat",
diff --git a/l10n/fr.js b/l10n/fr.js
index 476779764..1bcd782dc 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Aucune activité",
     "More activities" : "Plus d’activités",
     "Daily activity summary for %s" : "Résumé de l’activité du jour pour %s",
-    "_and %n more _::_and %n more _" : ["et %n autre","et %n autres","et %n autres"],
     "All activities" : "Toutes les activités",
     "By others" : "Des autres",
     "By you" : "De vous",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Bonjour %s,",
     "Hello %s," : "Bonjour %s,",
     "There was some activity at %s" : "Il y a eu de l’activité sur %s",
+    "_and %n more _::_and %n more _" : ["et %n autre","et %n autres","et %n autres"],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Activité",
diff --git a/l10n/fr.json b/l10n/fr.json
index 2cb04e953..76c354618 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -9,7 +9,6 @@
     "No activities" : "Aucune activité",
     "More activities" : "Plus d’activités",
     "Daily activity summary for %s" : "Résumé de l’activité du jour pour %s",
-    "_and %n more _::_and %n more _" : ["et %n autre","et %n autres","et %n autres"],
     "All activities" : "Toutes les activités",
     "By others" : "Des autres",
     "By you" : "De vous",
@@ -17,6 +16,7 @@
     "Hello %s" : "Bonjour %s,",
     "Hello %s," : "Bonjour %s,",
     "There was some activity at %s" : "Il y a eu de l’activité sur %s",
+    "_and %n more _::_and %n more _" : ["et %n autre","et %n autres","et %n autres"],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Activité",
diff --git a/l10n/ga.js b/l10n/ga.js
index 7e7040f7c..59c33a4a8 100644
--- a/l10n/ga.js
+++ b/l10n/ga.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Gan aon ghníomhaíochtaí",
     "More activities" : "Tuilleadh gníomhaíochtaí",
     "Daily activity summary for %s" : "Achoimre ar ghníomhaíocht laethúil le haghaidh %s",
-    "_and %n more _::_and %n more _" : ["agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó"],
     "All activities" : "Gach gníomhaíocht",
     "By others" : "Ag daoine eile",
     "By you" : "Leat",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Dia duit %s",
     "Hello %s," : "Dia duit %s,",
     "There was some activity at %s" : "Bhí roinnt gníomhaíochta ag %s",
+    "_and %n more _::_and %n more _" : ["agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó"],
     "Mail" : "Post",
     "Push" : "Brú",
     "Activity" : "Gníomhaíocht",
diff --git a/l10n/ga.json b/l10n/ga.json
index fd88bd4a2..e5260ac31 100644
--- a/l10n/ga.json
+++ b/l10n/ga.json
@@ -9,7 +9,6 @@
     "No activities" : "Gan aon ghníomhaíochtaí",
     "More activities" : "Tuilleadh gníomhaíochtaí",
     "Daily activity summary for %s" : "Achoimre ar ghníomhaíocht laethúil le haghaidh %s",
-    "_and %n more _::_and %n more _" : ["agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó"],
     "All activities" : "Gach gníomhaíocht",
     "By others" : "Ag daoine eile",
     "By you" : "Leat",
@@ -17,6 +16,7 @@
     "Hello %s" : "Dia duit %s",
     "Hello %s," : "Dia duit %s,",
     "There was some activity at %s" : "Bhí roinnt gníomhaíochta ag %s",
+    "_and %n more _::_and %n more _" : ["agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó","agus %n níos mó"],
     "Mail" : "Post",
     "Push" : "Brú",
     "Activity" : "Gníomhaíocht",
diff --git a/l10n/gl.js b/l10n/gl.js
index 3e98829a7..820cc332e 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Non hai actividades",
     "More activities" : "Máis actividades",
     "Daily activity summary for %s" : "Resumo diario de actividades para %s",
-    "_and %n more _::_and %n more _" : ["e %n máis","e %n máis"],
     "All activities" : "Todas as actividades",
     "By others" : "Por outros",
     "By you" : "Por Vde.",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Ola %s",
     "Hello %s," : "Ola %s,",
     "There was some activity at %s" : "Houbo actividade en %s",
+    "_and %n more _::_and %n more _" : ["e %n máis","e %n máis"],
     "Mail" : "Correo",
     "Push" : "Notificación automática",
     "Activity" : "Actividade",
diff --git a/l10n/gl.json b/l10n/gl.json
index 2fb370d0a..1fbe0c77e 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -9,7 +9,6 @@
     "No activities" : "Non hai actividades",
     "More activities" : "Máis actividades",
     "Daily activity summary for %s" : "Resumo diario de actividades para %s",
-    "_and %n more _::_and %n more _" : ["e %n máis","e %n máis"],
     "All activities" : "Todas as actividades",
     "By others" : "Por outros",
     "By you" : "Por Vde.",
@@ -17,6 +16,7 @@
     "Hello %s" : "Ola %s",
     "Hello %s," : "Ola %s,",
     "There was some activity at %s" : "Houbo actividade en %s",
+    "_and %n more _::_and %n more _" : ["e %n máis","e %n máis"],
     "Mail" : "Correo",
     "Push" : "Notificación automática",
     "Activity" : "Actividade",
diff --git a/l10n/he.js b/l10n/he.js
index e55b89a7b..ea3226215 100644
--- a/l10n/he.js
+++ b/l10n/he.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "אין פעילויות",
     "More activities" : "פעילויות נוספות",
     "Daily activity summary for %s" : "סיכום פעילות יומית עבור %s",
-    "_and %n more _::_and %n more _" : ["ו־%n נוסף","ו־%n נוספים","ו־%n נוספים"],
     "All activities" : "כל הפעילויות",
     "By others" : "על ידי אחרים",
     "By you" : "על ידך",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "שלום %s",
     "Hello %s," : "שלום %s,",
     "There was some activity at %s" : "הייתה פעילות ב%s",
+    "_and %n more _::_and %n more _" : ["ו־%n נוסף","ו־%n נוספים","ו־%n נוספים"],
     "Mail" : "דואר",
     "Push" : "דחיפה",
     "Activity" : "פעילות",
diff --git a/l10n/he.json b/l10n/he.json
index 7613a0264..dbe1e52c1 100644
--- a/l10n/he.json
+++ b/l10n/he.json
@@ -9,7 +9,6 @@
     "No activities" : "אין פעילויות",
     "More activities" : "פעילויות נוספות",
     "Daily activity summary for %s" : "סיכום פעילות יומית עבור %s",
-    "_and %n more _::_and %n more _" : ["ו־%n נוסף","ו־%n נוספים","ו־%n נוספים"],
     "All activities" : "כל הפעילויות",
     "By others" : "על ידי אחרים",
     "By you" : "על ידך",
@@ -17,6 +16,7 @@
     "Hello %s" : "שלום %s",
     "Hello %s," : "שלום %s,",
     "There was some activity at %s" : "הייתה פעילות ב%s",
+    "_and %n more _::_and %n more _" : ["ו־%n נוסף","ו־%n נוספים","ו־%n נוספים"],
     "Mail" : "דואר",
     "Push" : "דחיפה",
     "Activity" : "פעילות",
diff --git a/l10n/hi_IN.js b/l10n/hi_IN.js
index 47ef4a452..0aa270e13 100644
--- a/l10n/hi_IN.js
+++ b/l10n/hi_IN.js
@@ -9,10 +9,10 @@ OC.L10N.register(
     "No activities" : "कोई गतिविधि नहीं",
     "More activities" : "अधिक गतिविधियाँ",
     "Daily activity summary for %s" : "`%s` के लिए दैनिक गतिविधि सारांश",
-    "_and %n more _::_and %n more _" : ["और `1%n` अधिक","और `%n` अधिक"],
     "All activities" : "सभी गतिविधियां",
     "By others" : "दूसरों के द्वारा",
     "By you" : "आपके द्वारा",
+    "_and %n more _::_and %n more _" : ["और `1%n` अधिक","और `%n` अधिक"],
     "Mail" : "मेल",
     "Push" : "Push",
     "Notifications" : "नोटिफ़िकेशन",
diff --git a/l10n/hi_IN.json b/l10n/hi_IN.json
index 53fe4ffbb..98a566c69 100644
--- a/l10n/hi_IN.json
+++ b/l10n/hi_IN.json
@@ -7,10 +7,10 @@
     "No activities" : "कोई गतिविधि नहीं",
     "More activities" : "अधिक गतिविधियाँ",
     "Daily activity summary for %s" : "`%s` के लिए दैनिक गतिविधि सारांश",
-    "_and %n more _::_and %n more _" : ["और `1%n` अधिक","और `%n` अधिक"],
     "All activities" : "सभी गतिविधियां",
     "By others" : "दूसरों के द्वारा",
     "By you" : "आपके द्वारा",
+    "_and %n more _::_and %n more _" : ["और `1%n` अधिक","और `%n` अधिक"],
     "Mail" : "मेल",
     "Push" : "Push",
     "Notifications" : "नोटिफ़िकेशन",
diff --git a/l10n/hr.js b/l10n/hr.js
index a66bac8db..933fc8294 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Nema aktivnosti",
     "More activities" : "Više aktivnosti",
     "Daily activity summary for %s" : "Dnevni sažetak aktivnosti za %s",
-    "_and %n more _::_and %n more _" : ["i još %n ","i još %n ","i još %n "],
     "All activities" : "Sve aktivnosti",
     "By others" : "Od drugih",
     "By you" : "Vaše",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Pozdrav %s",
     "Hello %s," : "Pozdrav %s",
     "There was some activity at %s" : "Bilo je aktivnosti na %s",
+    "_and %n more _::_and %n more _" : ["i još %n ","i još %n ","i još %n "],
     "Mail" : "Pošta",
     "Push" : "Push",
     "Activity" : "Aktivnost",
diff --git a/l10n/hr.json b/l10n/hr.json
index 1057f7e14..2ce62e8cb 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -8,7 +8,6 @@
     "No activities" : "Nema aktivnosti",
     "More activities" : "Više aktivnosti",
     "Daily activity summary for %s" : "Dnevni sažetak aktivnosti za %s",
-    "_and %n more _::_and %n more _" : ["i još %n ","i još %n ","i još %n "],
     "All activities" : "Sve aktivnosti",
     "By others" : "Od drugih",
     "By you" : "Vaše",
@@ -16,6 +15,7 @@
     "Hello %s" : "Pozdrav %s",
     "Hello %s," : "Pozdrav %s",
     "There was some activity at %s" : "Bilo je aktivnosti na %s",
+    "_and %n more _::_and %n more _" : ["i još %n ","i još %n ","i još %n "],
     "Mail" : "Pošta",
     "Push" : "Push",
     "Activity" : "Aktivnost",
diff --git a/l10n/hu.js b/l10n/hu.js
index 6b4548536..46a98cfea 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Nincs tevékenység",
     "More activities" : "További tevékenységek",
     "Daily activity summary for %s" : "Napi tevékenység-összefoglaló ehhez: %s",
-    "_and %n more _::_and %n more _" : ["és %n további ","és %n további "],
     "All activities" : "Minden tevékenység",
     "By others" : "Másoké",
     "By you" : "Az Öné",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Kedves %s",
     "Hello %s," : "Kedves %s!",
     "There was some activity at %s" : "Tevékenység volt ennél: %s",
+    "_and %n more _::_and %n more _" : ["és %n további ","és %n további "],
     "Mail" : "Levél",
     "Push" : "Leküldés",
     "Activity" : "Tevékenység",
diff --git a/l10n/hu.json b/l10n/hu.json
index 2b6d0ec71..f69db5813 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -9,7 +9,6 @@
     "No activities" : "Nincs tevékenység",
     "More activities" : "További tevékenységek",
     "Daily activity summary for %s" : "Napi tevékenység-összefoglaló ehhez: %s",
-    "_and %n more _::_and %n more _" : ["és %n további ","és %n további "],
     "All activities" : "Minden tevékenység",
     "By others" : "Másoké",
     "By you" : "Az Öné",
@@ -17,6 +16,7 @@
     "Hello %s" : "Kedves %s",
     "Hello %s," : "Kedves %s!",
     "There was some activity at %s" : "Tevékenység volt ennél: %s",
+    "_and %n more _::_and %n more _" : ["és %n további ","és %n további "],
     "Mail" : "Levél",
     "Push" : "Leküldés",
     "Activity" : "Tevékenység",
diff --git a/l10n/hy.js b/l10n/hy.js
index 122186ea6..5aac3eb61 100644
--- a/l10n/hy.js
+++ b/l10n/hy.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Ակտիվություններ առկա չեն",
     "More activities" : "Ավելի շատ գործունեություն",
     "Daily activity summary for %s" : "Օրական գործունեության ամփոփ %s ֊ի համար",
-    "_and %n more _::_and %n more _" : ["և %n ավելի","և"],
     "All activities" : "Բոլոր ակտիվությունները",
     "By others" : "Մյուսների կողմից",
     "By you" : "Ձեր կողմից",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Բարև %s",
     "Hello %s," : "Բարև %s,",
     "There was some activity at %s" : "%s ֊ում նկատվել է որոշ ակտիվություն ",
+    "_and %n more _::_and %n more _" : ["և %n ավելի","և"],
     "Mail" : "Փոստ",
     "Push" : "Սեղմել",
     "Activity" : "Գործունեություն",
diff --git a/l10n/hy.json b/l10n/hy.json
index 57226aca2..6b7585370 100644
--- a/l10n/hy.json
+++ b/l10n/hy.json
@@ -8,7 +8,6 @@
     "No activities" : "Ակտիվություններ առկա չեն",
     "More activities" : "Ավելի շատ գործունեություն",
     "Daily activity summary for %s" : "Օրական գործունեության ամփոփ %s ֊ի համար",
-    "_and %n more _::_and %n more _" : ["և %n ավելի","և"],
     "All activities" : "Բոլոր ակտիվությունները",
     "By others" : "Մյուսների կողմից",
     "By you" : "Ձեր կողմից",
@@ -16,6 +15,7 @@
     "Hello %s" : "Բարև %s",
     "Hello %s," : "Բարև %s,",
     "There was some activity at %s" : "%s ֊ում նկատվել է որոշ ակտիվություն ",
+    "_and %n more _::_and %n more _" : ["և %n ավելի","և"],
     "Mail" : "Փոստ",
     "Push" : "Սեղմել",
     "Activity" : "Գործունեություն",
diff --git a/l10n/id.js b/l10n/id.js
index 2530f99de..4a6ba5ea5 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Tidak ada aktivitas",
     "More activities" : "Lebih banyak aktivitas",
     "Daily activity summary for %s" : "Ringkasan aktivitas harian untuk %s",
-    "_and %n more _::_and %n more _" : ["dan %n lainnya"],
     "All activities" : "Semua aktivitas",
     "By others" : "Oleh lainnya",
     "By you" : "Oleh Anda",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Halo %s",
     "Hello %s," : "Halo %s,",
     "There was some activity at %s" : "Ada beberapa aktivitas di %s",
+    "_and %n more _::_and %n more _" : ["dan %n lainnya"],
     "Mail" : "Surat",
     "Push" : "Dorong",
     "Activity" : "Aktivitas",
diff --git a/l10n/id.json b/l10n/id.json
index f9ac2e552..83074d64f 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -9,7 +9,6 @@
     "No activities" : "Tidak ada aktivitas",
     "More activities" : "Lebih banyak aktivitas",
     "Daily activity summary for %s" : "Ringkasan aktivitas harian untuk %s",
-    "_and %n more _::_and %n more _" : ["dan %n lainnya"],
     "All activities" : "Semua aktivitas",
     "By others" : "Oleh lainnya",
     "By you" : "Oleh Anda",
@@ -17,6 +16,7 @@
     "Hello %s" : "Halo %s",
     "Hello %s," : "Halo %s,",
     "There was some activity at %s" : "Ada beberapa aktivitas di %s",
+    "_and %n more _::_and %n more _" : ["dan %n lainnya"],
     "Mail" : "Surat",
     "Push" : "Dorong",
     "Activity" : "Aktivitas",
diff --git a/l10n/is.js b/l10n/is.js
index c6476e51a..f07b0e6aa 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Engar athafnir",
     "More activities" : "Fleiri athafnir",
     "Daily activity summary for %s" : "Yfirlit um daglegar athafnir fyrir %s",
-    "_and %n more _::_and %n more _" : ["og %n til viðbótar","og %n til viðbótar"],
     "All activities" : "Allar athafnir",
     "By others" : "Virkni annarra",
     "By you" : "Virkni þín",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Halló %s",
     "Hello %s," : "Halló %s,",
     "There was some activity at %s" : "Það voru einhverjar athafnir í %s",
+    "_and %n more _::_and %n more _" : ["og %n til viðbótar","og %n til viðbótar"],
     "Mail" : "Póstur",
     "Push" : "Ýtitilkynning",
     "Activity" : "Athafnir",
diff --git a/l10n/is.json b/l10n/is.json
index 8d17de8f1..7f846567b 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -9,7 +9,6 @@
     "No activities" : "Engar athafnir",
     "More activities" : "Fleiri athafnir",
     "Daily activity summary for %s" : "Yfirlit um daglegar athafnir fyrir %s",
-    "_and %n more _::_and %n more _" : ["og %n til viðbótar","og %n til viðbótar"],
     "All activities" : "Allar athafnir",
     "By others" : "Virkni annarra",
     "By you" : "Virkni þín",
@@ -17,6 +16,7 @@
     "Hello %s" : "Halló %s",
     "Hello %s," : "Halló %s,",
     "There was some activity at %s" : "Það voru einhverjar athafnir í %s",
+    "_and %n more _::_and %n more _" : ["og %n til viðbótar","og %n til viðbótar"],
     "Mail" : "Póstur",
     "Push" : "Ýtitilkynning",
     "Activity" : "Athafnir",
diff --git a/l10n/it.js b/l10n/it.js
index 44a71c887..4f767fa39 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Nessuna attività",
     "More activities" : "Altre attività",
     "Daily activity summary for %s" : "Riepilogo giornaliero delle attività per %s",
-    "_and %n more _::_and %n more _" : ["e %n altro ","e %n altri ","e %n altri "],
     "All activities" : "Tutte le attività",
     "By others" : "Di altri",
     "By you" : "Tue",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Ciao %s",
     "Hello %s," : "Ciao %s,",
     "There was some activity at %s" : "Attività registrata su %s",
+    "_and %n more _::_and %n more _" : ["e %n altro ","e %n altri ","e %n altri "],
     "Mail" : "Posta",
     "Push" : "Push",
     "Activity" : "Attività",
diff --git a/l10n/it.json b/l10n/it.json
index dbd1a1d85..63658b205 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -9,7 +9,6 @@
     "No activities" : "Nessuna attività",
     "More activities" : "Altre attività",
     "Daily activity summary for %s" : "Riepilogo giornaliero delle attività per %s",
-    "_and %n more _::_and %n more _" : ["e %n altro ","e %n altri ","e %n altri "],
     "All activities" : "Tutte le attività",
     "By others" : "Di altri",
     "By you" : "Tue",
@@ -17,6 +16,7 @@
     "Hello %s" : "Ciao %s",
     "Hello %s," : "Ciao %s,",
     "There was some activity at %s" : "Attività registrata su %s",
+    "_and %n more _::_and %n more _" : ["e %n altro ","e %n altri ","e %n altri "],
     "Mail" : "Posta",
     "Push" : "Push",
     "Activity" : "Attività",
diff --git a/l10n/ja.js b/l10n/ja.js
index 89a43665f..20a71fe02 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "アクティビティがありません",
     "More activities" : "その他のアクティビティ",
     "Daily activity summary for %s" : "%s のデイリーアクティビティー概要",
-    "_and %n more _::_and %n more _" : ["と他 %n 件"],
     "All activities" : "すべてのアクティビティ",
     "By others" : "他ユーザー",
     "By you" : "自分",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "%s さん、こんにちは",
     "Hello %s," : "%s さん、こんにちは",
     "There was some activity at %s" : "%s　にアクティビティがありました。",
+    "_and %n more _::_and %n more _" : ["と他 %n 件"],
     "Mail" : "メール",
     "Push" : "プッシュ",
     "Activity" : "アクティビティ",
diff --git a/l10n/ja.json b/l10n/ja.json
index 7e80a2bad..c9166cdfe 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -9,7 +9,6 @@
     "No activities" : "アクティビティがありません",
     "More activities" : "その他のアクティビティ",
     "Daily activity summary for %s" : "%s のデイリーアクティビティー概要",
-    "_and %n more _::_and %n more _" : ["と他 %n 件"],
     "All activities" : "すべてのアクティビティ",
     "By others" : "他ユーザー",
     "By you" : "自分",
@@ -17,6 +16,7 @@
     "Hello %s" : "%s さん、こんにちは",
     "Hello %s," : "%s さん、こんにちは",
     "There was some activity at %s" : "%s　にアクティビティがありました。",
+    "_and %n more _::_and %n more _" : ["と他 %n 件"],
     "Mail" : "メール",
     "Push" : "プッシュ",
     "Activity" : "アクティビティ",
diff --git a/l10n/ka.js b/l10n/ka.js
index 871c4b4bb..6e9f422a7 100644
--- a/l10n/ka.js
+++ b/l10n/ka.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "ქმედება არ არის",
     "More activities" : "მეტი ქმედება",
     "Daily activity summary for %s" : "დღიური აქტივობის შეჯამება %s-სთვის",
-    "_and %n more _::_and %n more _" : ["and %n more ","და კიდევ %n"],
     "All activities" : "ყველა ქმედება",
     "By others" : "სხვების მიერ",
     "By you" : "თქვენს მიერ",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "გამარჯობა, %s",
     "Hello %s," : "გამარჯობა, %s,",
     "There was some activity at %s" : "%s-ზე იყო რაღაც აქტივობა",
+    "_and %n more _::_and %n more _" : ["and %n more ","და კიდევ %n"],
     "Mail" : "წერილი",
     "Push" : "Push",
     "Activity" : "აქტივობა",
diff --git a/l10n/ka.json b/l10n/ka.json
index 07af2ec45..060fc7e84 100644
--- a/l10n/ka.json
+++ b/l10n/ka.json
@@ -9,7 +9,6 @@
     "No activities" : "ქმედება არ არის",
     "More activities" : "მეტი ქმედება",
     "Daily activity summary for %s" : "დღიური აქტივობის შეჯამება %s-სთვის",
-    "_and %n more _::_and %n more _" : ["and %n more ","და კიდევ %n"],
     "All activities" : "ყველა ქმედება",
     "By others" : "სხვების მიერ",
     "By you" : "თქვენს მიერ",
@@ -17,6 +16,7 @@
     "Hello %s" : "გამარჯობა, %s",
     "Hello %s," : "გამარჯობა, %s,",
     "There was some activity at %s" : "%s-ზე იყო რაღაც აქტივობა",
+    "_and %n more _::_and %n more _" : ["and %n more ","და კიდევ %n"],
     "Mail" : "წერილი",
     "Push" : "Push",
     "Activity" : "აქტივობა",
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index 9e9b48803..fd09400ab 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "თქვენი პარამეტრები განახლდა.",
     "Settings have been updated." : "პარამეტრები განახლდა.",
     "No activities" : "აქტივობები არაა",
-    "_and %n more _::_and %n more _" : ["და კიდევ %n","და კიდევ %n"],
     "All activities" : "ყველა აქტივობა",
     "By others" : "სხვების მიერ",
     "By you" : "თქვენს მიერ",
     "Hello %s" : "გამარჯობა, %s",
     "Hello %s," : "გამარჯობა, %s,",
     "There was some activity at %s" : "%s-ზე იყო გარკვეული აქტივობა",
+    "_and %n more _::_and %n more _" : ["და კიდევ %n","და კიდევ %n"],
     "Mail" : "ფოსტა",
     "Activity" : "აქტივობა",
     "Notifications" : "შეტყობინებები",
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 8743532e8..aec935b05 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "თქვენი პარამეტრები განახლდა.",
     "Settings have been updated." : "პარამეტრები განახლდა.",
     "No activities" : "აქტივობები არაა",
-    "_and %n more _::_and %n more _" : ["და კიდევ %n","და კიდევ %n"],
     "All activities" : "ყველა აქტივობა",
     "By others" : "სხვების მიერ",
     "By you" : "თქვენს მიერ",
     "Hello %s" : "გამარჯობა, %s",
     "Hello %s," : "გამარჯობა, %s,",
     "There was some activity at %s" : "%s-ზე იყო გარკვეული აქტივობა",
+    "_and %n more _::_and %n more _" : ["და კიდევ %n","და კიდევ %n"],
     "Mail" : "ფოსტა",
     "Activity" : "აქტივობა",
     "Notifications" : "შეტყობინებები",
diff --git a/l10n/kab.js b/l10n/kab.js
index f6fd1dbc2..3192c22a1 100644
--- a/l10n/kab.js
+++ b/l10n/kab.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Ulac armud",
     "More activities" : "Ugar n yirmad",
     "Daily activity summary for %s" : "Agzul n urmud n yal ass i %s",
-    "_and %n more _::_and %n more _" : ["akked %n nniḍen","akked %n nniḍen "],
     "All activities" : "Akk irmuden",
     "By others" : "Sɣur wiyaḍ",
     "By you" : "Sɣur-k",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Azul %s",
     "Hello %s," : "Azul %s,",
     "There was some activity at %s" : "Yella yiwen n urmud deg %s",
+    "_and %n more _::_and %n more _" : ["akked %n nniḍen","akked %n nniḍen "],
     "Mail" : "Tirawt",
     "Push" : "Degger",
     "Activity" : "Armud",
diff --git a/l10n/kab.json b/l10n/kab.json
index d897934e5..a669c184b 100644
--- a/l10n/kab.json
+++ b/l10n/kab.json
@@ -8,7 +8,6 @@
     "No activities" : "Ulac armud",
     "More activities" : "Ugar n yirmad",
     "Daily activity summary for %s" : "Agzul n urmud n yal ass i %s",
-    "_and %n more _::_and %n more _" : ["akked %n nniḍen","akked %n nniḍen "],
     "All activities" : "Akk irmuden",
     "By others" : "Sɣur wiyaḍ",
     "By you" : "Sɣur-k",
@@ -16,6 +15,7 @@
     "Hello %s" : "Azul %s",
     "Hello %s," : "Azul %s,",
     "There was some activity at %s" : "Yella yiwen n urmud deg %s",
+    "_and %n more _::_and %n more _" : ["akked %n nniḍen","akked %n nniḍen "],
     "Mail" : "Tirawt",
     "Push" : "Degger",
     "Activity" : "Armud",
diff --git a/l10n/km.js b/l10n/km.js
index 6f5961b54..0b002188f 100644
--- a/l10n/km.js
+++ b/l10n/km.js
@@ -9,7 +9,6 @@ OC.L10N.register(
     "Recent activity" : "សកម្មភាពថ្មីៗ",
     "No activities" : "គ្មានសកម្មភាពទេ",
     "Daily activity summary for %s" : "សកម្មភាពប្រចាំថ្ងៃសង្ខេបសម្រាប់ %s",
-    "_and %n more _::_and %n more _" : ["និង %n ទៀត"],
     "All activities" : "សកម្មភាពទាំងអស់",
     "By others" : "ដោយអ្នកផ្សេង",
     "By you" : "ដោយអ្នក",
@@ -17,6 +16,7 @@ OC.L10N.register(
     "Hello %s" : "សួស្ដី %s",
     "Hello %s," : "សួស្ដី %s,",
     "There was some activity at %s" : "មានសកម្មភាពមួយចំនួននៅ %s",
+    "_and %n more _::_and %n more _" : ["និង %n ទៀត"],
     "Mail" : "សំបុត្រ",
     "Push" : "រុញ",
     "Activity" : "សកម្មភាព",
diff --git a/l10n/km.json b/l10n/km.json
index ce498974c..5e001e7ca 100644
--- a/l10n/km.json
+++ b/l10n/km.json
@@ -7,7 +7,6 @@
     "Recent activity" : "សកម្មភាពថ្មីៗ",
     "No activities" : "គ្មានសកម្មភាពទេ",
     "Daily activity summary for %s" : "សកម្មភាពប្រចាំថ្ងៃសង្ខេបសម្រាប់ %s",
-    "_and %n more _::_and %n more _" : ["និង %n ទៀត"],
     "All activities" : "សកម្មភាពទាំងអស់",
     "By others" : "ដោយអ្នកផ្សេង",
     "By you" : "ដោយអ្នក",
@@ -15,6 +14,7 @@
     "Hello %s" : "សួស្ដី %s",
     "Hello %s," : "សួស្ដី %s,",
     "There was some activity at %s" : "មានសកម្មភាពមួយចំនួននៅ %s",
+    "_and %n more _::_and %n more _" : ["និង %n ទៀត"],
     "Mail" : "សំបុត្រ",
     "Push" : "រុញ",
     "Activity" : "សកម្មភាព",
diff --git a/l10n/ko.js b/l10n/ko.js
index 96e091789..6f6030c88 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "활동 없음",
     "More activities" : "더 많은 활동",
     "Daily activity summary for %s" : "%s 의 일일 활동 요약",
-    "_and %n more _::_and %n more _" : ["%n개 더"],
     "All activities" : "모든 활동",
     "By others" : "다른 사람",
     "By you" : "나",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "%s 님 안녕하세요",
     "Hello %s," : "%s 님 안녕하세요,",
     "There was some activity at %s" : "%s에 새로운 활동이 있었습니다",
+    "_and %n more _::_and %n more _" : ["%n개 더"],
     "Mail" : "메일",
     "Push" : "푸시",
     "Activity" : "활동",
diff --git a/l10n/ko.json b/l10n/ko.json
index 080ec11f3..ceb59a3ab 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -9,7 +9,6 @@
     "No activities" : "활동 없음",
     "More activities" : "더 많은 활동",
     "Daily activity summary for %s" : "%s 의 일일 활동 요약",
-    "_and %n more _::_and %n more _" : ["%n개 더"],
     "All activities" : "모든 활동",
     "By others" : "다른 사람",
     "By you" : "나",
@@ -17,6 +16,7 @@
     "Hello %s" : "%s 님 안녕하세요",
     "Hello %s," : "%s 님 안녕하세요,",
     "There was some activity at %s" : "%s에 새로운 활동이 있었습니다",
+    "_and %n more _::_and %n more _" : ["%n개 더"],
     "Mail" : "메일",
     "Push" : "푸시",
     "Activity" : "활동",
diff --git a/l10n/lo.js b/l10n/lo.js
index 29e235609..3a682278f 100644
--- a/l10n/lo.js
+++ b/l10n/lo.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "No activities" : "ບໍ່ມີກິດຈະກຳ",
     "More activities" : "ກິດຈະກຳອື່ນໆ",
     "Daily activity summary for %s" : "ສະຫຼຸບກິດຈະກຳປະຈຳວັນ %s",
-    "_and %n more _::_and %n more _" : ["ແລະ 1%n ອື່ນໆ "],
     "All activities" : "ກິດຈະກຳທັງໝົດ",
     "By others" : "ໂດຍຄົນອື່ນ",
     "By you" : "ໂດຍ ເຈົ້າ",
     "Activity at %s" : "ກິດຈະກຳ ທີ່ 1%s",
     "Hello %s" : "ສະບາຍດີ 1%s",
     "Hello %s," : "ສະບາຍດີ 1%s ,",
+    "_and %n more _::_and %n more _" : ["ແລະ 1%n ອື່ນໆ "],
     "Mail" : "ຈົດໝາຍ",
     "Push" : "ກົດ",
     "Activity" : "ກິດຈະກໍາ",
diff --git a/l10n/lo.json b/l10n/lo.json
index 77f78da60..b9c5e607c 100644
--- a/l10n/lo.json
+++ b/l10n/lo.json
@@ -5,13 +5,13 @@
     "No activities" : "ບໍ່ມີກິດຈະກຳ",
     "More activities" : "ກິດຈະກຳອື່ນໆ",
     "Daily activity summary for %s" : "ສະຫຼຸບກິດຈະກຳປະຈຳວັນ %s",
-    "_and %n more _::_and %n more _" : ["ແລະ 1%n ອື່ນໆ "],
     "All activities" : "ກິດຈະກຳທັງໝົດ",
     "By others" : "ໂດຍຄົນອື່ນ",
     "By you" : "ໂດຍ ເຈົ້າ",
     "Activity at %s" : "ກິດຈະກຳ ທີ່ 1%s",
     "Hello %s" : "ສະບາຍດີ 1%s",
     "Hello %s," : "ສະບາຍດີ 1%s ,",
+    "_and %n more _::_and %n more _" : ["ແລະ 1%n ອື່ນໆ "],
     "Mail" : "ຈົດໝາຍ",
     "Push" : "ກົດ",
     "Activity" : "ກິດຈະກໍາ",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 9e472d5be..98a14e27a 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Nėra vaiklų",
     "More activities" : "Daugiau veiklų",
     "Daily activity summary for %s" : "Kasdienių %s veiklų apžvalga ",
-    "_and %n more _::_and %n more _" : ["ir %n kitas","ir %n kiti","ir %n kitų","ir %n kitų"],
     "All activities" : "Visos veiklos",
     "By others" : "Kitų",
     "By you" : "Jūsų",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Sveiki, %s",
     "Hello %s," : "Sveiki, %s,",
     "There was some activity at %s" : "%s buvo veiklos",
+    "_and %n more _::_and %n more _" : ["ir %n kitas","ir %n kiti","ir %n kitų","ir %n kitų"],
     "Mail" : "Paštas",
     "Push" : "Spausti",
     "Activity" : "Veikla",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 469599893..8ea8d6eff 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -9,7 +9,6 @@
     "No activities" : "Nėra vaiklų",
     "More activities" : "Daugiau veiklų",
     "Daily activity summary for %s" : "Kasdienių %s veiklų apžvalga ",
-    "_and %n more _::_and %n more _" : ["ir %n kitas","ir %n kiti","ir %n kitų","ir %n kitų"],
     "All activities" : "Visos veiklos",
     "By others" : "Kitų",
     "By you" : "Jūsų",
@@ -17,6 +16,7 @@
     "Hello %s" : "Sveiki, %s",
     "Hello %s," : "Sveiki, %s,",
     "There was some activity at %s" : "%s buvo veiklos",
+    "_and %n more _::_and %n more _" : ["ir %n kitas","ir %n kiti","ir %n kitų","ir %n kitų"],
     "Mail" : "Paštas",
     "Push" : "Spausti",
     "Activity" : "Veikla",
diff --git a/l10n/lv.js b/l10n/lv.js
index 8a384e649..ebd18ae7c 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -8,13 +8,13 @@ OC.L10N.register(
     "Settings have been updated." : "Iestādījumi ir atjaunoti.",
     "No activities" : "Nav izmaiņu",
     "More activities" : "Vairāk darbību",
-    "_and %n more _::_and %n more _" : ["un vēl %n","un vēl %n","un vēl %n"],
     "All activities" : "Visas darbības",
     "By others" : "Citu",
     "By you" : "Jūsu",
     "Hello %s" : "Sveiki, %s",
     "Hello %s," : "Sveiki, %s,",
     "There was some activity at %s" : "%s bija kaut kādas darbības",
+    "_and %n more _::_and %n more _" : ["un vēl %n","un vēl %n","un vēl %n"],
     "Mail" : "E-pasts",
     "Activity" : "Darbības",
     "Notifications" : "Paziņojumi",
diff --git a/l10n/lv.json b/l10n/lv.json
index 988e4a42e..c7e27a543 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -6,13 +6,13 @@
     "Settings have been updated." : "Iestādījumi ir atjaunoti.",
     "No activities" : "Nav izmaiņu",
     "More activities" : "Vairāk darbību",
-    "_and %n more _::_and %n more _" : ["un vēl %n","un vēl %n","un vēl %n"],
     "All activities" : "Visas darbības",
     "By others" : "Citu",
     "By you" : "Jūsu",
     "Hello %s" : "Sveiki, %s",
     "Hello %s," : "Sveiki, %s,",
     "There was some activity at %s" : "%s bija kaut kādas darbības",
+    "_and %n more _::_and %n more _" : ["un vēl %n","un vēl %n","un vēl %n"],
     "Mail" : "E-pasts",
     "Activity" : "Darbības",
     "Notifications" : "Paziņojumi",
diff --git a/l10n/mk.js b/l10n/mk.js
index 7aac9a3e6..5ce0c3160 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Нема активности",
     "More activities" : "Повеќе активности",
     "Daily activity summary for %s" : "Дневно резиме на активности за %s",
-    "_and %n more _::_and %n more _" : ["и уште %n","и %n други"],
     "All activities" : "Сите активности",
     "By others" : "Од други",
     "By you" : "Од вас",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Имаше активност во %s",
+    "_and %n more _::_and %n more _" : ["и уште %n","и %n други"],
     "Mail" : "Електронска пошта",
     "Push" : "Пуш",
     "Activity" : "Активност",
diff --git a/l10n/mk.json b/l10n/mk.json
index 74582f16d..b47a41a35 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -8,7 +8,6 @@
     "No activities" : "Нема активности",
     "More activities" : "Повеќе активности",
     "Daily activity summary for %s" : "Дневно резиме на активности за %s",
-    "_and %n more _::_and %n more _" : ["и уште %n","и %n други"],
     "All activities" : "Сите активности",
     "By others" : "Од други",
     "By you" : "Од вас",
@@ -16,6 +15,7 @@
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Имаше активност во %s",
+    "_and %n more _::_and %n more _" : ["и уште %n","и %n други"],
     "Mail" : "Електронска пошта",
     "Push" : "Пуш",
     "Activity" : "Активност",
diff --git a/l10n/mn.js b/l10n/mn.js
index 26e5e81cc..495da7d9a 100644
--- a/l10n/mn.js
+++ b/l10n/mn.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Үйлдэл алга",
     "More activities" : "Дэлгэрэнгүй",
     "Daily activity summary for %s" : "%s-ийн өдөр тутмын үйлдлийн хураангуй",
-    "_and %n more _::_and %n more _" : ["ба дахиад %n","ба дахиад %n"],
     "All activities" : "Бүх үйлдэлүүд",
     "By others" : "Бусдын үйлдлүүд",
     "By you" : "Таны үйлдлүүд",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Сайн байна уу, %s",
     "Hello %s," : "Сайн байна уу, %s,",
     "There was some activity at %s" : "%s дээр үйлдэл хийсэн байна.",
+    "_and %n more _::_and %n more _" : ["ба дахиад %n","ба дахиад %n"],
     "Mail" : "Цахим шуудан",
     "Push" : "Дарах",
     "Activity" : "Үйлдлүүд",
diff --git a/l10n/mn.json b/l10n/mn.json
index 7dd1c04fa..81e8315aa 100644
--- a/l10n/mn.json
+++ b/l10n/mn.json
@@ -8,7 +8,6 @@
     "No activities" : "Үйлдэл алга",
     "More activities" : "Дэлгэрэнгүй",
     "Daily activity summary for %s" : "%s-ийн өдөр тутмын үйлдлийн хураангуй",
-    "_and %n more _::_and %n more _" : ["ба дахиад %n","ба дахиад %n"],
     "All activities" : "Бүх үйлдэлүүд",
     "By others" : "Бусдын үйлдлүүд",
     "By you" : "Таны үйлдлүүд",
@@ -16,6 +15,7 @@
     "Hello %s" : "Сайн байна уу, %s",
     "Hello %s," : "Сайн байна уу, %s,",
     "There was some activity at %s" : "%s дээр үйлдэл хийсэн байна.",
+    "_and %n more _::_and %n more _" : ["ба дахиад %n","ба дахиад %n"],
     "Mail" : "Цахим шуудан",
     "Push" : "Дарах",
     "Activity" : "Үйлдлүүд",
diff --git a/l10n/mr.js b/l10n/mr.js
index be6a51117..b216f8efe 100644
--- a/l10n/mr.js
+++ b/l10n/mr.js
@@ -9,13 +9,13 @@ OC.L10N.register(
     "Recent activity" : "अलीकडील क्रिया",
     "No activities" : "कोणत्याही क्रिया नाहीत",
     "Daily activity summary for %s" : " %s च्या दैनंदिन क्रियांचा सारांश",
-    "_and %n more _::_and %n more _" : ["आणि इतर %n","आणि इतर %n"],
     "All activities" : "सर्व क्रिया",
     "By others" : "इतरांद्वारे",
     "By you" : "तुमच्याद्वारे",
     "Hello %s" : "नमस्कार %s",
     "Hello %s," : "नमस्कार %s,",
     "There was some activity at %s" : "%s येथे काही क्रिया झाली",
+    "_and %n more _::_and %n more _" : ["आणि इतर %n","आणि इतर %n"],
     "Mail" : "मेल",
     "Push" : "पाठविलेली",
     "Activity" : "क्रिया",
diff --git a/l10n/mr.json b/l10n/mr.json
index bf5e34ed4..7df9bc315 100644
--- a/l10n/mr.json
+++ b/l10n/mr.json
@@ -7,13 +7,13 @@
     "Recent activity" : "अलीकडील क्रिया",
     "No activities" : "कोणत्याही क्रिया नाहीत",
     "Daily activity summary for %s" : " %s च्या दैनंदिन क्रियांचा सारांश",
-    "_and %n more _::_and %n more _" : ["आणि इतर %n","आणि इतर %n"],
     "All activities" : "सर्व क्रिया",
     "By others" : "इतरांद्वारे",
     "By you" : "तुमच्याद्वारे",
     "Hello %s" : "नमस्कार %s",
     "Hello %s," : "नमस्कार %s,",
     "There was some activity at %s" : "%s येथे काही क्रिया झाली",
+    "_and %n more _::_and %n more _" : ["आणि इतर %n","आणि इतर %n"],
     "Mail" : "मेल",
     "Push" : "पाठविलेली",
     "Activity" : "क्रिया",
diff --git a/l10n/my.js b/l10n/my.js
index 8a1efa694..f75db4fd2 100644
--- a/l10n/my.js
+++ b/l10n/my.js
@@ -5,13 +5,13 @@ OC.L10N.register(
     "Your feed URL is invalid" : "သင်၏ ပေးပို့ချက် URL မှားယွင်းနေသည်။",
     "Your settings have been updated." : "သင်၏ ပြင်ဆင်ချက်များကို မွမ်းမံပြီးဖြစ်သည်။",
     "Settings have been updated." : "ပြင်ဆင်ချက်များ မွမ်းမံပြီးပြီ။",
-    "_and %n more _::_and %n more _" : ["နှင့် အပို%n"],
     "All activities" : "လုပ်ဆောင်ချက်အားလုံး",
     "By others" : "အခြားသူများမှ",
     "By you" : "သင့်ထံမှ",
     "Hello %s" : "မင်္ဂလာပါ %s",
     "Hello %s," : "မင်္ဂလာပါ %s၊",
     "There was some activity at %s" : "%sက လုပ်ဆောင်မှု အချို့ ရှိခဲ့သည်။",
+    "_and %n more _::_and %n more _" : ["နှင့် အပို%n"],
     "Mail" : "စာ",
     "Activity" : "လုပ်ဆောင်မှု",
     "Today" : "ယနေ့",
diff --git a/l10n/my.json b/l10n/my.json
index e9b80fefd..7201c8904 100644
--- a/l10n/my.json
+++ b/l10n/my.json
@@ -3,13 +3,13 @@
     "Your feed URL is invalid" : "သင်၏ ပေးပို့ချက် URL မှားယွင်းနေသည်။",
     "Your settings have been updated." : "သင်၏ ပြင်ဆင်ချက်များကို မွမ်းမံပြီးဖြစ်သည်။",
     "Settings have been updated." : "ပြင်ဆင်ချက်များ မွမ်းမံပြီးပြီ။",
-    "_and %n more _::_and %n more _" : ["နှင့် အပို%n"],
     "All activities" : "လုပ်ဆောင်ချက်အားလုံး",
     "By others" : "အခြားသူများမှ",
     "By you" : "သင့်ထံမှ",
     "Hello %s" : "မင်္ဂလာပါ %s",
     "Hello %s," : "မင်္ဂလာပါ %s၊",
     "There was some activity at %s" : "%sက လုပ်ဆောင်မှု အချို့ ရှိခဲ့သည်။",
+    "_and %n more _::_and %n more _" : ["နှင့် အပို%n"],
     "Mail" : "စာ",
     "Activity" : "လုပ်ဆောင်မှု",
     "Today" : "ယနေ့",
diff --git a/l10n/nb.js b/l10n/nb.js
index 5a5d4df2e..73c851759 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetssammendrag for %s",
-    "_and %n more _::_and %n more _" : ["og %n til","og %n til"],
     "All activities" : "All aktivitet",
     "By others" : "Av andre",
     "By you" : "Av deg",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "Det har vært aktivitet ved %s",
+    "_and %n more _::_and %n more _" : ["og %n til","og %n til"],
     "Mail" : "E-post",
     "Push" : "Push",
     "Activity" : "Aktivitet",
diff --git a/l10n/nb.json b/l10n/nb.json
index 1840630d1..fcd7ca630 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -9,7 +9,6 @@
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetssammendrag for %s",
-    "_and %n more _::_and %n more _" : ["og %n til","og %n til"],
     "All activities" : "All aktivitet",
     "By others" : "Av andre",
     "By you" : "Av deg",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "Det har vært aktivitet ved %s",
+    "_and %n more _::_and %n more _" : ["og %n til","og %n til"],
     "Mail" : "E-post",
     "Push" : "Push",
     "Activity" : "Aktivitet",
diff --git a/l10n/ne.js b/l10n/ne.js
index cb4baf8fd..7b520fa20 100644
--- a/l10n/ne.js
+++ b/l10n/ne.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "Your settings have been updated." : "तपाईंको सेटिङहरू अद्यावधिक गरिएको छ।",
     "Settings have been updated." : "सेटिङहरू अद्यावधिक गरिएको छ।",
     "No activities" : "कुनै गतिविधि छैन",
-    "_and %n more _::_and %n more _" : ["र थप %n","र %n थप "],
     "All activities" : "सबै गतिविधिहरू",
     "By others" : "अरूद्वारा",
     "By you" : "तपाईं द्वारा",
     "Hello %s" : "नमस्ते %s",
     "Hello %s," : "नमस्ते %s,",
     "There was some activity at %s" : "%s मा केही गतिविधि थियो",
+    "_and %n more _::_and %n more _" : ["र थप %n","र %n थप "],
     "Mail" : "पत्र",
     "Activity" : "गतिविधि",
     "Today" : "आज",
diff --git a/l10n/ne.json b/l10n/ne.json
index 4e58ca3b7..2100c77be 100644
--- a/l10n/ne.json
+++ b/l10n/ne.json
@@ -5,13 +5,13 @@
     "Your settings have been updated." : "तपाईंको सेटिङहरू अद्यावधिक गरिएको छ।",
     "Settings have been updated." : "सेटिङहरू अद्यावधिक गरिएको छ।",
     "No activities" : "कुनै गतिविधि छैन",
-    "_and %n more _::_and %n more _" : ["र थप %n","र %n थप "],
     "All activities" : "सबै गतिविधिहरू",
     "By others" : "अरूद्वारा",
     "By you" : "तपाईं द्वारा",
     "Hello %s" : "नमस्ते %s",
     "Hello %s," : "नमस्ते %s,",
     "There was some activity at %s" : "%s मा केही गतिविधि थियो",
+    "_and %n more _::_and %n more _" : ["र थप %n","र %n थप "],
     "Mail" : "पत्र",
     "Activity" : "गतिविधि",
     "Today" : "आज",
diff --git a/l10n/nl.js b/l10n/nl.js
index 1355f7ec7..744b6b1d1 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Geen activiteiten",
     "More activities" : "Meer activiteiten",
     "Daily activity summary for %s" : "Dagelijkse activiteitssamenvatting voor %s",
-    "_and %n more _::_and %n more _" : ["en %n meer ","en %n meer "],
     "All activities" : "Alle activiteiten",
     "By others" : "Van anderen",
     "By you" : "Van jou",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Er was een activiteit op %s",
+    "_and %n more _::_and %n more _" : ["en %n meer ","en %n meer "],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Activiteit",
diff --git a/l10n/nl.json b/l10n/nl.json
index e18ca3004..148204096 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -9,7 +9,6 @@
     "No activities" : "Geen activiteiten",
     "More activities" : "Meer activiteiten",
     "Daily activity summary for %s" : "Dagelijkse activiteitssamenvatting voor %s",
-    "_and %n more _::_and %n more _" : ["en %n meer ","en %n meer "],
     "All activities" : "Alle activiteiten",
     "By others" : "Van anderen",
     "By you" : "Van jou",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hallo %s",
     "Hello %s," : "Hallo %s,",
     "There was some activity at %s" : "Er was een activiteit op %s",
+    "_and %n more _::_and %n more _" : ["en %n meer ","en %n meer "],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Activiteit",
diff --git a/l10n/nn_NO.js b/l10n/nn_NO.js
index a8ce4bec1..c07474419 100644
--- a/l10n/nn_NO.js
+++ b/l10n/nn_NO.js
@@ -9,13 +9,13 @@ OC.L10N.register(
     "Recent activity" : "Nyleg aktivitet",
     "No activities" : "Ingen aktivitetar",
     "Daily activity summary for %s" : "Dagleg aktivitetsamandrag for %s",
-    "_and %n more _::_and %n more _" : ["og %n til","og %n fleire"],
     "All activities" : "Alle aktvitetar",
     "By others" : "Av andre",
     "By you" : "Av deg",
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "Det var aktivitet hjå %s",
+    "_and %n more _::_and %n more _" : ["og %n til","og %n fleire"],
     "Mail" : "Post",
     "Push" : "Trykk",
     "Activity" : "Aktivitet",
diff --git a/l10n/nn_NO.json b/l10n/nn_NO.json
index 3b0a3ead6..3e9bfdfdc 100644
--- a/l10n/nn_NO.json
+++ b/l10n/nn_NO.json
@@ -7,13 +7,13 @@
     "Recent activity" : "Nyleg aktivitet",
     "No activities" : "Ingen aktivitetar",
     "Daily activity summary for %s" : "Dagleg aktivitetsamandrag for %s",
-    "_and %n more _::_and %n more _" : ["og %n til","og %n fleire"],
     "All activities" : "Alle aktvitetar",
     "By others" : "Av andre",
     "By you" : "Av deg",
     "Hello %s" : "Hei %s",
     "Hello %s," : "Hei %s,",
     "There was some activity at %s" : "Det var aktivitet hjå %s",
+    "_and %n more _::_and %n more _" : ["og %n til","og %n fleire"],
     "Mail" : "Post",
     "Push" : "Trykk",
     "Activity" : "Aktivitet",
diff --git a/l10n/oc.js b/l10n/oc.js
index 061fedb98..ebcaa2e0a 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Cap d’activitat",
     "More activities" : "Mai d’activitats",
     "Daily activity summary for %s" : "Resumit d’activitat quotidian per%s",
-    "_and %n more _::_and %n more _" : ["e %n mai","e %n mai "],
     "All activities" : "Totas las activitats",
     "By others" : "Per d’autres",
     "By you" : "Per vos",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Adieu %s",
     "Hello %s," : "Adieu %s,",
     "There was some activity at %s" : "I a agut una activitat a %s",
+    "_and %n more _::_and %n more _" : ["e %n mai","e %n mai "],
     "Mail" : "Mail",
     "Activity" : "Activitat",
     "Notifications" : "Notificacions",
diff --git a/l10n/oc.json b/l10n/oc.json
index 17aea0797..2a03d0eed 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -8,7 +8,6 @@
     "No activities" : "Cap d’activitat",
     "More activities" : "Mai d’activitats",
     "Daily activity summary for %s" : "Resumit d’activitat quotidian per%s",
-    "_and %n more _::_and %n more _" : ["e %n mai","e %n mai "],
     "All activities" : "Totas las activitats",
     "By others" : "Per d’autres",
     "By you" : "Per vos",
@@ -16,6 +15,7 @@
     "Hello %s" : "Adieu %s",
     "Hello %s," : "Adieu %s,",
     "There was some activity at %s" : "I a agut una activitat a %s",
+    "_and %n more _::_and %n more _" : ["e %n mai","e %n mai "],
     "Mail" : "Mail",
     "Activity" : "Activitat",
     "Notifications" : "Notificacions",
diff --git a/l10n/pl.js b/l10n/pl.js
index d715ac45b..f67fe5500 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Brak aktywności",
     "More activities" : "Więcej aktywności",
     "Daily activity summary for %s" : "Podsumowanie dziennej aktywności dla %s",
-    "_and %n more _::_and %n more _" : ["i %n więcej","i %n więcej","i %n więcej","i %n więcej"],
     "All activities" : "Wszystkie aktywności",
     "By others" : "Przez innych",
     "By you" : "Przez Ciebie",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Witaj %s",
     "Hello %s," : "Witaj %s,",
     "There was some activity at %s" : "Zaistniała aktywność przy %s",
+    "_and %n more _::_and %n more _" : ["i %n więcej","i %n więcej","i %n więcej","i %n więcej"],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Aktywność",
diff --git a/l10n/pl.json b/l10n/pl.json
index aea04ceea..38b7a3d06 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -9,7 +9,6 @@
     "No activities" : "Brak aktywności",
     "More activities" : "Więcej aktywności",
     "Daily activity summary for %s" : "Podsumowanie dziennej aktywności dla %s",
-    "_and %n more _::_and %n more _" : ["i %n więcej","i %n więcej","i %n więcej","i %n więcej"],
     "All activities" : "Wszystkie aktywności",
     "By others" : "Przez innych",
     "By you" : "Przez Ciebie",
@@ -17,6 +16,7 @@
     "Hello %s" : "Witaj %s",
     "Hello %s," : "Witaj %s,",
     "There was some activity at %s" : "Zaistniała aktywność przy %s",
+    "_and %n more _::_and %n more _" : ["i %n więcej","i %n więcej","i %n więcej","i %n więcej"],
     "Mail" : "E-mail",
     "Push" : "Push",
     "Activity" : "Aktywność",
diff --git a/l10n/ps.js b/l10n/ps.js
index ce35b509e..9134a5cb8 100644
--- a/l10n/ps.js
+++ b/l10n/ps.js
@@ -6,13 +6,13 @@ OC.L10N.register(
     "Activity feed" : "د کړنو لېست",
     "Your settings have been updated." : "په سمونو کې بدلون ثبت شو",
     "Settings have been updated." : "په سمونو کې بدلون ثبت شو",
-    "_and %n more _::_and %n more _" : ["او %n نور","او %n نورې"],
     "All activities" : "ټولې کړنې",
     "By others" : "د نورو لخوا",
     "By you" : "ستاسې لخوا",
     "Hello %s" : "سلامونه %s",
     "Hello %s," : "سلامونه %s،",
     "There was some activity at %s" : "په %s کې يو څه فعاليت و",
+    "_and %n more _::_and %n more _" : ["او %n نور","او %n نورې"],
     "Mail" : "ایمیل",
     "Activity" : "کړنې",
     "Today" : "نن",
diff --git a/l10n/ps.json b/l10n/ps.json
index 7abe3b906..6e6e3c0b2 100644
--- a/l10n/ps.json
+++ b/l10n/ps.json
@@ -4,13 +4,13 @@
     "Activity feed" : "د کړنو لېست",
     "Your settings have been updated." : "په سمونو کې بدلون ثبت شو",
     "Settings have been updated." : "په سمونو کې بدلون ثبت شو",
-    "_and %n more _::_and %n more _" : ["او %n نور","او %n نورې"],
     "All activities" : "ټولې کړنې",
     "By others" : "د نورو لخوا",
     "By you" : "ستاسې لخوا",
     "Hello %s" : "سلامونه %s",
     "Hello %s," : "سلامونه %s،",
     "There was some activity at %s" : "په %s کې يو څه فعاليت و",
+    "_and %n more _::_and %n more _" : ["او %n نور","او %n نورې"],
     "Mail" : "ایمیل",
     "Activity" : "کړنې",
     "Today" : "نن",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 875bf9684..9d8203b15 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Resumo de atividade diária para %s",
-    "_and %n more _::_and %n more _" : ["e %n mais","e %n mais","e %n mais"],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por você",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Olá %s",
     "Hello %s," : "Olá %s,",
     "There was some activity at %s" : "Houve alguma atividade em %s",
+    "_and %n more _::_and %n more _" : ["e %n mais","e %n mais","e %n mais"],
     "Mail" : "E-mail",
     "Push" : "Pressionar",
     "Activity" : "Atividade",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index b028ac014..c63c050d4 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -9,7 +9,6 @@
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Resumo de atividade diária para %s",
-    "_and %n more _::_and %n more _" : ["e %n mais","e %n mais","e %n mais"],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por você",
@@ -17,6 +16,7 @@
     "Hello %s" : "Olá %s",
     "Hello %s," : "Olá %s,",
     "There was some activity at %s" : "Houve alguma atividade em %s",
+    "_and %n more _::_and %n more _" : ["e %n mais","e %n mais","e %n mais"],
     "Mail" : "E-mail",
     "Push" : "Pressionar",
     "Activity" : "Atividade",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 238a2aecd..8e3ab3c32 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Relatório de atividade diária de %s",
-    "_and %n more _::_and %n more _" : ["e %n mais ","e mais %n ","e mais %n "],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por si",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Olá %s",
     "Hello %s," : "Olá %s,",
     "There was some activity at %s" : "Houve alguma atividade em %s",
+    "_and %n more _::_and %n more _" : ["e %n mais ","e mais %n ","e mais %n "],
     "Mail" : "Correio",
     "Push" : "Transmitir",
     "Activity" : "Atividade",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 54b301f78..9a6893d1b 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -9,7 +9,6 @@
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Relatório de atividade diária de %s",
-    "_and %n more _::_and %n more _" : ["e %n mais ","e mais %n ","e mais %n "],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por si",
@@ -17,6 +16,7 @@
     "Hello %s" : "Olá %s",
     "Hello %s," : "Olá %s,",
     "There was some activity at %s" : "Houve alguma atividade em %s",
+    "_and %n more _::_and %n more _" : ["e %n mais ","e mais %n ","e mais %n "],
     "Mail" : "Correio",
     "Push" : "Transmitir",
     "Activity" : "Atividade",
diff --git a/l10n/ro.js b/l10n/ro.js
index dad67c70a..51ecf435c 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Fără activități",
     "More activities" : "Mai multe acțiuni",
     "Daily activity summary for %s" : "Sumar activitate zilnică pentru %s",
-    "_and %n more _::_and %n more _" : ["și încă %n","și încă %n","și încă %n"],
     "All activities" : "Toate activitățile",
     "By others" : "De către alții",
     "By you" : "De către tine",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Salut %s",
     "Hello %s," : "Salut %s,",
     "There was some activity at %s" : "A fost activitate la %s",
+    "_and %n more _::_and %n more _" : ["și încă %n","și încă %n","și încă %n"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Activitate",
diff --git a/l10n/ro.json b/l10n/ro.json
index 0f60b5b0d..68f6048ef 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -9,7 +9,6 @@
     "No activities" : "Fără activități",
     "More activities" : "Mai multe acțiuni",
     "Daily activity summary for %s" : "Sumar activitate zilnică pentru %s",
-    "_and %n more _::_and %n more _" : ["și încă %n","și încă %n","și încă %n"],
     "All activities" : "Toate activitățile",
     "By others" : "De către alții",
     "By you" : "De către tine",
@@ -17,6 +16,7 @@
     "Hello %s" : "Salut %s",
     "Hello %s," : "Salut %s,",
     "There was some activity at %s" : "A fost activitate la %s",
+    "_and %n more _::_and %n more _" : ["și încă %n","și încă %n","și încă %n"],
     "Mail" : "Mail",
     "Push" : "Push",
     "Activity" : "Activitate",
diff --git a/l10n/ru.js b/l10n/ru.js
index 89fb3e82d..17617eb01 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "События отсуствуют",
     "More activities" : "Больше событий",
     "Daily activity summary for %s" : "Сводка событий за день %s",
-    "_and %n more _::_and %n more _" : ["и ещё %n","и ещё %n","и ещё %n","и ещё %n"],
     "All activities" : "Все события",
     "By others" : "Других пользователей",
     "By you" : "Собственные",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Здравствуйте, %s!",
     "Hello %s," : "Здравствуйте, %s,",
     "There was some activity at %s" : "На сервере %s произошли следующие события:",
+    "_and %n more _::_and %n more _" : ["и ещё %n","и ещё %n","и ещё %n","и ещё %n"],
     "Mail" : "Почта",
     "Push" : "Push-уведомления",
     "Activity" : "События",
diff --git a/l10n/ru.json b/l10n/ru.json
index a4d211eee..1f4c3ef14 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -9,7 +9,6 @@
     "No activities" : "События отсуствуют",
     "More activities" : "Больше событий",
     "Daily activity summary for %s" : "Сводка событий за день %s",
-    "_and %n more _::_and %n more _" : ["и ещё %n","и ещё %n","и ещё %n","и ещё %n"],
     "All activities" : "Все события",
     "By others" : "Других пользователей",
     "By you" : "Собственные",
@@ -17,6 +16,7 @@
     "Hello %s" : "Здравствуйте, %s!",
     "Hello %s," : "Здравствуйте, %s,",
     "There was some activity at %s" : "На сервере %s произошли следующие события:",
+    "_and %n more _::_and %n more _" : ["и ещё %n","и ещё %n","и ещё %n","и ещё %n"],
     "Mail" : "Почта",
     "Push" : "Push-уведомления",
     "Activity" : "События",
diff --git a/l10n/sc.js b/l10n/sc.js
index 6d9b05680..3fdccefc7 100644
--- a/l10n/sc.js
+++ b/l10n/sc.js
@@ -9,13 +9,13 @@ OC.L10N.register(
     "Recent activity" : "Atividade reghente",
     "No activities" : "Peruna atividade",
     "Daily activity summary for %s" : "Resumu de is atividades de cada die pro %s",
-    "_and %n more _::_and %n more _" : ["and %n more ","e %n in prus"],
     "All activities" : "Totu is atividades",
     "By others" : "Dae àtere",
     "By you" : "Dae te",
     "Hello %s" : "Salude %s",
     "Hello %s," : "Salude %s,",
     "There was some activity at %s" : "Ddoe at àpidu calicuna àtividade a su %s",
+    "_and %n more _::_and %n more _" : ["and %n more ","e %n in prus"],
     "Mail" : "Posta ",
     "Push" : "Imbia",
     "Activity" : "Atividades",
diff --git a/l10n/sc.json b/l10n/sc.json
index f5199d7bb..514980fab 100644
--- a/l10n/sc.json
+++ b/l10n/sc.json
@@ -7,13 +7,13 @@
     "Recent activity" : "Atividade reghente",
     "No activities" : "Peruna atividade",
     "Daily activity summary for %s" : "Resumu de is atividades de cada die pro %s",
-    "_and %n more _::_and %n more _" : ["and %n more ","e %n in prus"],
     "All activities" : "Totu is atividades",
     "By others" : "Dae àtere",
     "By you" : "Dae te",
     "Hello %s" : "Salude %s",
     "Hello %s," : "Salude %s,",
     "There was some activity at %s" : "Ddoe at àpidu calicuna àtividade a su %s",
+    "_and %n more _::_and %n more _" : ["and %n more ","e %n in prus"],
     "Mail" : "Posta ",
     "Push" : "Imbia",
     "Activity" : "Atividades",
diff --git a/l10n/si.js b/l10n/si.js
index c73d65180..095ec9eb7 100644
--- a/l10n/si.js
+++ b/l10n/si.js
@@ -5,12 +5,12 @@ OC.L10N.register(
     "Settings have been updated." : "සැකසුම් යාවත්කාලීන කර ඇත.",
     "Recent activity" : "මෑත ක්‍රියාකාරකම",
     "No activities" : "ක්‍රියාකාරකම් නැත",
-    "_and %n more _::_and %n more _" : ["සහ තවත් %n","සහ තවත් %n"],
     "All activities" : "සියළුම ක්‍රියාකාරකම්",
     "By others" : "අන් අය විසින්",
     "By you" : "ඔබ විසින්",
     "Hello %s" : "ආයුබෝවන් %s",
     "Hello %s," : "ආයුබෝවන් %s,",
+    "_and %n more _::_and %n more _" : ["සහ තවත් %n","සහ තවත් %n"],
     "Mail" : "තැපෑල",
     "Activity" : "ක්‍රියාකාරකම",
     "Notifications" : "දැනුම්දීම්",
diff --git a/l10n/si.json b/l10n/si.json
index 56e3cb273..5100774af 100644
--- a/l10n/si.json
+++ b/l10n/si.json
@@ -3,12 +3,12 @@
     "Settings have been updated." : "සැකසුම් යාවත්කාලීන කර ඇත.",
     "Recent activity" : "මෑත ක්‍රියාකාරකම",
     "No activities" : "ක්‍රියාකාරකම් නැත",
-    "_and %n more _::_and %n more _" : ["සහ තවත් %n","සහ තවත් %n"],
     "All activities" : "සියළුම ක්‍රියාකාරකම්",
     "By others" : "අන් අය විසින්",
     "By you" : "ඔබ විසින්",
     "Hello %s" : "ආයුබෝවන් %s",
     "Hello %s," : "ආයුබෝවන් %s,",
+    "_and %n more _::_and %n more _" : ["සහ තවත් %n","සහ තවත් %n"],
     "Mail" : "තැපෑල",
     "Activity" : "ක්‍රියාකාරකම",
     "Notifications" : "දැනුම්දීම්",
diff --git a/l10n/sk.js b/l10n/sk.js
index 9d12cdfce..c2578edf7 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Žiadne aktivity",
     "More activities" : "Viac aktivít",
     "Daily activity summary for %s" : "Sumár dennej aktivity pre %s",
-    "_and %n more _::_and %n more _" : ["a %n ďalší","a %n ďalšie","a %n ďalších","a %n ďalších"],
     "All activities" : "Všetky aktivity",
     "By others" : "Aktivity ostatných",
     "By you" : "Vlastné aktivity",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Ahoj %s",
     "Hello %s," : "Ahoj %s,",
     "There was some activity at %s" : "Bola zaznamenaná aktivita u používateľa %s",
+    "_and %n more _::_and %n more _" : ["a %n ďalší","a %n ďalšie","a %n ďalších","a %n ďalších"],
     "Mail" : "Pošta",
     "Push" : "Vyskakovacie oznámenie",
     "Activity" : "Aktivita",
diff --git a/l10n/sk.json b/l10n/sk.json
index 4aade7208..767a7bcc3 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -9,7 +9,6 @@
     "No activities" : "Žiadne aktivity",
     "More activities" : "Viac aktivít",
     "Daily activity summary for %s" : "Sumár dennej aktivity pre %s",
-    "_and %n more _::_and %n more _" : ["a %n ďalší","a %n ďalšie","a %n ďalších","a %n ďalších"],
     "All activities" : "Všetky aktivity",
     "By others" : "Aktivity ostatných",
     "By you" : "Vlastné aktivity",
@@ -17,6 +16,7 @@
     "Hello %s" : "Ahoj %s",
     "Hello %s," : "Ahoj %s,",
     "There was some activity at %s" : "Bola zaznamenaná aktivita u používateľa %s",
+    "_and %n more _::_and %n more _" : ["a %n ďalší","a %n ďalšie","a %n ďalších","a %n ďalších"],
     "Mail" : "Pošta",
     "Push" : "Vyskakovacie oznámenie",
     "Activity" : "Aktivita",
diff --git a/l10n/sl.js b/l10n/sl.js
index 1db37a006..bbd3692bf 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Ni dejavnosti",
     "More activities" : "Več dejavnosti",
     "Daily activity summary for %s" : "Dnevni povzetek dejavnosti za račun %s",
-    "_and %n more _::_and %n more _" : ["- in še %n","- in še %n","- in še %n","– in še %n"],
     "All activities" : "Vse dejavnosti",
     "By others" : "Dejavnosti drugih",
     "By you" : "Moje dejavnosti",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Pozdravljeni, %s,",
     "Hello %s," : "Pozdravljeni, %s,",
     "There was some activity at %s" : "V oblaku %s se je nekaj dogajalo ...",
+    "_and %n more _::_and %n more _" : ["- in še %n","- in še %n","- in še %n","– in še %n"],
     "Mail" : "Elektronska pošta",
     "Push" : "Potisno",
     "Activity" : "Dejavnosti",
diff --git a/l10n/sl.json b/l10n/sl.json
index ba4887a1f..9c09ee428 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -9,7 +9,6 @@
     "No activities" : "Ni dejavnosti",
     "More activities" : "Več dejavnosti",
     "Daily activity summary for %s" : "Dnevni povzetek dejavnosti za račun %s",
-    "_and %n more _::_and %n more _" : ["- in še %n","- in še %n","- in še %n","– in še %n"],
     "All activities" : "Vse dejavnosti",
     "By others" : "Dejavnosti drugih",
     "By you" : "Moje dejavnosti",
@@ -17,6 +16,7 @@
     "Hello %s" : "Pozdravljeni, %s,",
     "Hello %s," : "Pozdravljeni, %s,",
     "There was some activity at %s" : "V oblaku %s se je nekaj dogajalo ...",
+    "_and %n more _::_and %n more _" : ["- in še %n","- in še %n","- in še %n","– in še %n"],
     "Mail" : "Elektronska pošta",
     "Push" : "Potisno",
     "Activity" : "Dejavnosti",
diff --git a/l10n/sq.js b/l10n/sq.js
index f9af40de8..a19fe13a2 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -9,13 +9,13 @@ OC.L10N.register(
     "Recent activity" : "Aktivitetet e fundit",
     "No activities" : "Asnjë aktivitet",
     "Daily activity summary for %s" : "Përmbledhje e aktivitetit ditor për %s",
-    "_and %n more _::_and %n more _" : ["dhe %n më tepër ","* dhe %n më tepër"],
     "All activities" : "Të gjitha aktivitetet",
     "By others" : "Nga të tjerët",
     "By you" : "Nga ju",
     "Hello %s" : "Përshëndetje %s",
     "Hello %s," : "Tungjatjeta %s,",
     "There was some activity at %s" : "Pati disa aktivitete te %s",
+    "_and %n more _::_and %n more _" : ["dhe %n më tepër ","* dhe %n më tepër"],
     "Mail" : "Posta",
     "Activity" : "Veprimtari",
     "Notifications" : "Njoftimet",
diff --git a/l10n/sq.json b/l10n/sq.json
index 8f967671b..034a15cd0 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -7,13 +7,13 @@
     "Recent activity" : "Aktivitetet e fundit",
     "No activities" : "Asnjë aktivitet",
     "Daily activity summary for %s" : "Përmbledhje e aktivitetit ditor për %s",
-    "_and %n more _::_and %n more _" : ["dhe %n më tepër ","* dhe %n më tepër"],
     "All activities" : "Të gjitha aktivitetet",
     "By others" : "Nga të tjerët",
     "By you" : "Nga ju",
     "Hello %s" : "Përshëndetje %s",
     "Hello %s," : "Tungjatjeta %s,",
     "There was some activity at %s" : "Pati disa aktivitete te %s",
+    "_and %n more _::_and %n more _" : ["dhe %n më tepër ","* dhe %n më tepër"],
     "Mail" : "Posta",
     "Activity" : "Veprimtari",
     "Notifications" : "Njoftimet",
diff --git a/l10n/sr.js b/l10n/sr.js
index 04b422971..5f766fa69 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Нема активности",
     "More activities" : "Још активности",
     "Daily activity summary for %s" : "Извештај дневних активности за %s",
-    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Било је активности у %s ",
+    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "Mail" : "поштом",
     "Push" : "Гурај",
     "Activity" : "Активност",
diff --git a/l10n/sr.json b/l10n/sr.json
index 64bbf5df0..4b048a4eb 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -9,7 +9,6 @@
     "No activities" : "Нема активности",
     "More activities" : "Још активности",
     "Daily activity summary for %s" : "Извештај дневних активности за %s",
-    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
@@ -17,6 +16,7 @@
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Било је активности у %s ",
+    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "Mail" : "поштом",
     "Push" : "Гурај",
     "Activity" : "Активност",
diff --git a/l10n/sr@latin.js b/l10n/sr@latin.js
index 5af347d67..9c5dca0b9 100644
--- a/l10n/sr@latin.js
+++ b/l10n/sr@latin.js
@@ -11,13 +11,13 @@ OC.L10N.register(
     "No activities" : "Nema aktivnosti",
     "More activities" : "Još aktivnosti",
     "Daily activity summary for %s" : "Izveštaj dnevnih aktivnosti za %s",
-    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Било је активности у %s ",
+    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "Mail" : "поштом",
     "Activity" : "Активност",
     "Notifications" : "Obaveštenja",
diff --git a/l10n/sr@latin.json b/l10n/sr@latin.json
index 097528b92..931a31f06 100644
--- a/l10n/sr@latin.json
+++ b/l10n/sr@latin.json
@@ -9,13 +9,13 @@
     "No activities" : "Nema aktivnosti",
     "More activities" : "Još aktivnosti",
     "Daily activity summary for %s" : "Izveštaj dnevnih aktivnosti za %s",
-    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
     "Hello %s" : "Здраво %s",
     "Hello %s," : "Здраво %s,",
     "There was some activity at %s" : "Било је активности у %s ",
+    "_and %n more _::_and %n more _" : ["и још %n","и још %n","и још %n"],
     "Mail" : "поштом",
     "Activity" : "Активност",
     "Notifications" : "Obaveštenja",
diff --git a/l10n/sv.js b/l10n/sv.js
index d00fe31df..154c8ddd7 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Inga händelser",
     "More activities" : "Fler aktiviteter",
     "Daily activity summary for %s" : "Sammanfattad daglig aktivitet för %s",
-    "_and %n more _::_and %n more _" : ["och %n till","och %n till"],
     "All activities" : "Alla aktiviteter",
     "By others" : "Andras aktivitet",
     "By you" : "Min aktivitet",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Hej %s",
     "Hello %s," : "Hej %s,",
     "There was some activity at %s" : "Det var aktivitet på %s",
+    "_and %n more _::_and %n more _" : ["och %n till","och %n till"],
     "Mail" : "E-post",
     "Push" : "Push",
     "Activity" : "Aktiviteter",
diff --git a/l10n/sv.json b/l10n/sv.json
index eb93f0215..d30b0ccc1 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -9,7 +9,6 @@
     "No activities" : "Inga händelser",
     "More activities" : "Fler aktiviteter",
     "Daily activity summary for %s" : "Sammanfattad daglig aktivitet för %s",
-    "_and %n more _::_and %n more _" : ["och %n till","och %n till"],
     "All activities" : "Alla aktiviteter",
     "By others" : "Andras aktivitet",
     "By you" : "Min aktivitet",
@@ -17,6 +16,7 @@
     "Hello %s" : "Hej %s",
     "Hello %s," : "Hej %s,",
     "There was some activity at %s" : "Det var aktivitet på %s",
+    "_and %n more _::_and %n more _" : ["och %n till","och %n till"],
     "Mail" : "E-post",
     "Push" : "Push",
     "Activity" : "Aktiviteter",
diff --git a/l10n/th.js b/l10n/th.js
index eb25d234e..9d5a900fd 100644
--- a/l10n/th.js
+++ b/l10n/th.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "ไม่มีกิจกรรม",
     "More activities" : "กิจกรรมเพิ่มเติม",
     "Daily activity summary for %s" : "สรุปกิจกรรมประจำวันสำหรับ %s",
-    "_and %n more _::_and %n more _" : ["และอีก %n"],
     "All activities" : "กิจกรรมทั้งหมด",
     "By others" : "โดยผู้อื่น",
     "By you" : "โดยคุณ",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "สวัสดี %s",
     "Hello %s," : "สวัสดี %s",
     "There was some activity at %s" : "มีกิจกรรมบางอย่างที่ %s",
+    "_and %n more _::_and %n more _" : ["และอีก %n"],
     "Mail" : "จดหมาย",
     "Push" : "พุช",
     "Activity" : "กิจกรรม",
diff --git a/l10n/th.json b/l10n/th.json
index be213f33c..18948f3af 100644
--- a/l10n/th.json
+++ b/l10n/th.json
@@ -9,7 +9,6 @@
     "No activities" : "ไม่มีกิจกรรม",
     "More activities" : "กิจกรรมเพิ่มเติม",
     "Daily activity summary for %s" : "สรุปกิจกรรมประจำวันสำหรับ %s",
-    "_and %n more _::_and %n more _" : ["และอีก %n"],
     "All activities" : "กิจกรรมทั้งหมด",
     "By others" : "โดยผู้อื่น",
     "By you" : "โดยคุณ",
@@ -17,6 +16,7 @@
     "Hello %s" : "สวัสดี %s",
     "Hello %s," : "สวัสดี %s",
     "There was some activity at %s" : "มีกิจกรรมบางอย่างที่ %s",
+    "_and %n more _::_and %n more _" : ["และอีก %n"],
     "Mail" : "จดหมาย",
     "Push" : "พุช",
     "Activity" : "กิจกรรม",
diff --git a/l10n/tr.js b/l10n/tr.js
index 1090b0d8b..60eaada7a 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Herhangi bir işlem yok",
     "More activities" : "Diğer işlemler",
     "Daily activity summary for %s" : "%s için günlük işlem özeti",
-    "_and %n more _::_and %n more _" : ["ve %n diğer","ve %n diğer"],
     "All activities" : "Tüm işlemler",
     "By others" : "Diğerleri tarafından",
     "By you" : "Sizin tarafınızdan",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Merhaba %s",
     "Hello %s," : "Merhaba %s,",
     "There was some activity at %s" : "%s üzerinde bazı işlemler yapıldı",
+    "_and %n more _::_and %n more _" : ["ve %n diğer","ve %n diğer"],
     "Mail" : "E-posta",
     "Push" : "Anında",
     "Activity" : "İşlem",
diff --git a/l10n/tr.json b/l10n/tr.json
index 3d017e364..c6e933efc 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -9,7 +9,6 @@
     "No activities" : "Herhangi bir işlem yok",
     "More activities" : "Diğer işlemler",
     "Daily activity summary for %s" : "%s için günlük işlem özeti",
-    "_and %n more _::_and %n more _" : ["ve %n diğer","ve %n diğer"],
     "All activities" : "Tüm işlemler",
     "By others" : "Diğerleri tarafından",
     "By you" : "Sizin tarafınızdan",
@@ -17,6 +16,7 @@
     "Hello %s" : "Merhaba %s",
     "Hello %s," : "Merhaba %s,",
     "There was some activity at %s" : "%s üzerinde bazı işlemler yapıldı",
+    "_and %n more _::_and %n more _" : ["ve %n diğer","ve %n diğer"],
     "Mail" : "E-posta",
     "Push" : "Anında",
     "Activity" : "İşlem",
diff --git a/l10n/uk.js b/l10n/uk.js
index 810806b12..566afc465 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "Активність відсутня",
     "More activities" : "Більше заходів",
     "Daily activity summary for %s" : "Підсумок за день для%s",
-    "_and %n more _::_and %n more _" : ["та ще %n","та ще %n","та ще %n","та ще %n "],
     "All activities" : "Всі події",
     "By others" : "Дії інших користувачів",
     "By you" : "Мої дії",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "Вітаємо %s",
     "Hello %s," : "Вітаємо %s,",
     "There was some activity at %s" : "Перелік останніх змін у %s",
+    "_and %n more _::_and %n more _" : ["та ще %n","та ще %n","та ще %n","та ще %n "],
     "Mail" : "Пошта",
     "Push" : "Push",
     "Activity" : "Події",
diff --git a/l10n/uk.json b/l10n/uk.json
index aadbe40b2..5e50afbf0 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -9,7 +9,6 @@
     "No activities" : "Активність відсутня",
     "More activities" : "Більше заходів",
     "Daily activity summary for %s" : "Підсумок за день для%s",
-    "_and %n more _::_and %n more _" : ["та ще %n","та ще %n","та ще %n","та ще %n "],
     "All activities" : "Всі події",
     "By others" : "Дії інших користувачів",
     "By you" : "Мої дії",
@@ -17,6 +16,7 @@
     "Hello %s" : "Вітаємо %s",
     "Hello %s," : "Вітаємо %s,",
     "There was some activity at %s" : "Перелік останніх змін у %s",
+    "_and %n more _::_and %n more _" : ["та ще %n","та ще %n","та ще %n","та ще %n "],
     "Mail" : "Пошта",
     "Push" : "Push",
     "Activity" : "Події",
diff --git a/l10n/vi.js b/l10n/vi.js
index 2219482e0..525470196 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "No activities" : "Không có hoạt động",
     "More activities" : "Hoạt động mở rộng",
     "Daily activity summary for %s" : "Tóm tắt hoạt động hàng ngày cho %s",
-    "_and %n more _::_and %n more _" : ["và %n thêm"],
     "All activities" : "Tất cả hoạt động",
     "By others" : "Bởi người khác",
     "By you" : "Bởi bạn",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Hello %s" : "Xin chào %s",
     "Hello %s," : "Xin chào %s,",
     "There was some activity at %s" : "Có một số hoạt động tại %s",
+    "_and %n more _::_and %n more _" : ["và %n thêm"],
     "Mail" : "Thư điện tử",
     "Push" : "Đẩy",
     "Activity" : "Hoạt động",
diff --git a/l10n/vi.json b/l10n/vi.json
index ae7276263..66f8eacb4 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -8,7 +8,6 @@
     "No activities" : "Không có hoạt động",
     "More activities" : "Hoạt động mở rộng",
     "Daily activity summary for %s" : "Tóm tắt hoạt động hàng ngày cho %s",
-    "_and %n more _::_and %n more _" : ["và %n thêm"],
     "All activities" : "Tất cả hoạt động",
     "By others" : "Bởi người khác",
     "By you" : "Bởi bạn",
@@ -16,6 +15,7 @@
     "Hello %s" : "Xin chào %s",
     "Hello %s," : "Xin chào %s,",
     "There was some activity at %s" : "Có một số hoạt động tại %s",
+    "_and %n more _::_and %n more _" : ["và %n thêm"],
     "Mail" : "Thư điện tử",
     "Push" : "Đẩy",
     "Activity" : "Hoạt động",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 8dad6dbd3..c56b6421b 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "无活动",
     "More activities" : "更多活动",
     "Daily activity summary for %s" : "%s 的每日动态概况",
-    "_and %n more _::_and %n more _" : ["更多 %n 项"],
     "All activities" : "所有动态",
     "By others" : "其他来源",
     "By you" : "本地来源",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "%s 您好",
     "Hello %s," : "%s 你好，",
     "There was some activity at %s" : "在 %s 里有一些动态",
+    "_and %n more _::_and %n more _" : ["更多 %n 项"],
     "Mail" : "邮件",
     "Push" : "推送",
     "Activity" : "动态",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index dcbecfca0..b193d5637 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -9,7 +9,6 @@
     "No activities" : "无活动",
     "More activities" : "更多活动",
     "Daily activity summary for %s" : "%s 的每日动态概况",
-    "_and %n more _::_and %n more _" : ["更多 %n 项"],
     "All activities" : "所有动态",
     "By others" : "其他来源",
     "By you" : "本地来源",
@@ -17,6 +16,7 @@
     "Hello %s" : "%s 您好",
     "Hello %s," : "%s 你好，",
     "There was some activity at %s" : "在 %s 里有一些动态",
+    "_and %n more _::_and %n more _" : ["更多 %n 项"],
     "Mail" : "邮件",
     "Push" : "推送",
     "Activity" : "动态",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 8653d2075..299cda6c3 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "沒有活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
-    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "All activities" : "所有活動",
     "By others" : "其他人的活動",
     "By you" : "您的活動",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "%s 您好",
     "Hello %s," : "%s 您好，",
     "There was some activity at %s" : "%s 有一些系統事件",
+    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "Mail" : "電子郵件",
     "Push" : "推送",
     "Activity" : "系統事件簿",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 00485a268..5a17e82dc 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -9,7 +9,6 @@
     "No activities" : "沒有活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
-    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "All activities" : "所有活動",
     "By others" : "其他人的活動",
     "By you" : "您的活動",
@@ -17,6 +16,7 @@
     "Hello %s" : "%s 您好",
     "Hello %s," : "%s 您好，",
     "There was some activity at %s" : "%s 有一些系統事件",
+    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "Mail" : "電子郵件",
     "Push" : "推送",
     "Activity" : "系統事件簿",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index a165ae233..7413a7bb9 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "No activities" : "無活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
-    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "All activities" : "所有活動",
     "By others" : "由其他人",
     "By you" : "由您",
@@ -19,6 +18,7 @@ OC.L10N.register(
     "Hello %s" : "%s你好",
     "Hello %s," : "哈囉 %s ，",
     "There was some activity at %s" : "%s 有一些活動",
+    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "Mail" : "電子郵件",
     "Push" : "推送",
     "Activity" : "活動",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index f4b76e2bd..adadb9a8f 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -9,7 +9,6 @@
     "No activities" : "無活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
-    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "All activities" : "所有活動",
     "By others" : "由其他人",
     "By you" : "由您",
@@ -17,6 +16,7 @@
     "Hello %s" : "%s你好",
     "Hello %s," : "哈囉 %s ，",
     "There was some activity at %s" : "%s 有一些活動",
+    "_and %n more _::_and %n more _" : ["以及其餘 %n 項"],
     "Mail" : "電子郵件",
     "Push" : "推送",
     "Activity" : "活動",

From c6696f753e328207a512b937ee23908391869bd0 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Wed, 17 Jul 2024 00:24:09 +0000
Subject: [PATCH 07/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/ar.js      |  1 +
 l10n/ar.json    |  1 +
 l10n/de_DE.js   |  1 +
 l10n/de_DE.json |  1 +
 l10n/en_GB.js   |  1 +
 l10n/en_GB.json |  1 +
 l10n/ga.js      |  1 +
 l10n/ga.json    |  1 +
 l10n/gl.js      |  1 +
 l10n/gl.json    |  1 +
 l10n/sr.js      |  1 +
 l10n/sr.json    |  1 +
 l10n/vi.js      | 16 +++++++++++++---
 l10n/vi.json    | 16 +++++++++++++---
 l10n/zh_HK.js   |  1 +
 l10n/zh_HK.json |  1 +
 l10n/zh_TW.js   |  1 +
 l10n/zh_TW.json |  1 +
 18 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/l10n/ar.js b/l10n/ar.js
index c76de0f92..4c0fc1a50 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "لا توجد أيّ حركاتٍ",
     "More activities" : "المزيد من الحركات",
     "Daily activity summary for %s" : "ملخص الحركات اليومية لـ%s",
+    "_and %n more…_::_and %n more…_" : ["و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …"],
     "All activities" : "جميع الحركات",
     "By others" : "من قِبَل آخرين",
     "By you" : "من قِبَلك",
diff --git a/l10n/ar.json b/l10n/ar.json
index c2411c658..cf03e34a4 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -9,6 +9,7 @@
     "No activities" : "لا توجد أيّ حركاتٍ",
     "More activities" : "المزيد من الحركات",
     "Daily activity summary for %s" : "ملخص الحركات اليومية لـ%s",
+    "_and %n more…_::_and %n more…_" : ["و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …","و %n أخرى …"],
     "All activities" : "جميع الحركات",
     "By others" : "من قِبَل آخرين",
     "By you" : "من قِبَلك",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index de8399661..b9c8f0022 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
+    "_and %n more…_::_and %n more…_" : ["und %n weiterer","und %n weitere…"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 6a54d2dd4..3a7a25bfc 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -9,6 +9,7 @@
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
+    "_and %n more…_::_and %n more…_" : ["und %n weiterer","und %n weitere…"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index d313c72f9..fcc011840 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "No activities",
     "More activities" : "More activities",
     "Daily activity summary for %s" : "Daily activity summary for %s",
+    "_and %n more…_::_and %n more…_" : ["and %n more…","and %n more…"],
     "All activities" : "All activities",
     "By others" : "By others",
     "By you" : "By you",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 2db8d0a92..afe9629eb 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -9,6 +9,7 @@
     "No activities" : "No activities",
     "More activities" : "More activities",
     "Daily activity summary for %s" : "Daily activity summary for %s",
+    "_and %n more…_::_and %n more…_" : ["and %n more…","and %n more…"],
     "All activities" : "All activities",
     "By others" : "By others",
     "By you" : "By you",
diff --git a/l10n/ga.js b/l10n/ga.js
index 59c33a4a8..4879aea89 100644
--- a/l10n/ga.js
+++ b/l10n/ga.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Gan aon ghníomhaíochtaí",
     "More activities" : "Tuilleadh gníomhaíochtaí",
     "Daily activity summary for %s" : "Achoimre ar ghníomhaíocht laethúil le haghaidh %s",
+    "_and %n more…_::_and %n more…_" : ["agus %n eile…","agus %n eile…","agus %n eile…","agus %n eile…","agus %n eile…"],
     "All activities" : "Gach gníomhaíocht",
     "By others" : "Ag daoine eile",
     "By you" : "Leat",
diff --git a/l10n/ga.json b/l10n/ga.json
index e5260ac31..621025c88 100644
--- a/l10n/ga.json
+++ b/l10n/ga.json
@@ -9,6 +9,7 @@
     "No activities" : "Gan aon ghníomhaíochtaí",
     "More activities" : "Tuilleadh gníomhaíochtaí",
     "Daily activity summary for %s" : "Achoimre ar ghníomhaíocht laethúil le haghaidh %s",
+    "_and %n more…_::_and %n more…_" : ["agus %n eile…","agus %n eile…","agus %n eile…","agus %n eile…","agus %n eile…"],
     "All activities" : "Gach gníomhaíocht",
     "By others" : "Ag daoine eile",
     "By you" : "Leat",
diff --git a/l10n/gl.js b/l10n/gl.js
index 820cc332e..206d13786 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Non hai actividades",
     "More activities" : "Máis actividades",
     "Daily activity summary for %s" : "Resumo diario de actividades para %s",
+    "_and %n more…_::_and %n more…_" : ["e %n máis…","e %n máis…"],
     "All activities" : "Todas as actividades",
     "By others" : "Por outros",
     "By you" : "Por Vde.",
diff --git a/l10n/gl.json b/l10n/gl.json
index 1fbe0c77e..a801df99c 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -9,6 +9,7 @@
     "No activities" : "Non hai actividades",
     "More activities" : "Máis actividades",
     "Daily activity summary for %s" : "Resumo diario de actividades para %s",
+    "_and %n more…_::_and %n more…_" : ["e %n máis…","e %n máis…"],
     "All activities" : "Todas as actividades",
     "By others" : "Por outros",
     "By you" : "Por Vde.",
diff --git a/l10n/sr.js b/l10n/sr.js
index 5f766fa69..977b3322a 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Нема активности",
     "More activities" : "Још активности",
     "Daily activity summary for %s" : "Извештај дневних активности за %s",
+    "_and %n more…_::_and %n more…_" : ["и још %n…","и још %n…","и још %n…"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
diff --git a/l10n/sr.json b/l10n/sr.json
index 4b048a4eb..15d388f65 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -9,6 +9,7 @@
     "No activities" : "Нема активности",
     "More activities" : "Још активности",
     "Daily activity summary for %s" : "Извештај дневних активности за %s",
+    "_and %n more…_::_and %n more…_" : ["и још %n…","и још %n…","и још %n…"],
     "All activities" : "Све активности",
     "By others" : "туђе",
     "By you" : "ваше",
diff --git a/l10n/vi.js b/l10n/vi.js
index 525470196..91ae05d78 100644
--- a/l10n/vi.js
+++ b/l10n/vi.js
@@ -3,14 +3,16 @@ OC.L10N.register(
     {
     "Personal activity feed for %s" : "Khay hoạt động cá nhân được %s",
     "Your feed URL is invalid" : "Khay URL của bạn không hợp lệ",
+    "Activity feed for %1$s" : "Dòng cung cấp dữ liệu hoạt động cho %1$s",
     "Activity feed" : "Nguồn cấp dữ liệu hoạt động",
     "Your settings have been updated." : "Các thiết lập của bạn vừa được cập nhật",
     "Settings have been updated." : "Các cài đặt đã được cập nhật.",
     "Recent activity" : "Hoạt động gần đây",
     "No activities" : "Không có hoạt động",
-    "More activities" : "Hoạt động mở rộng",
+    "More activities" : "Thêm hoạt động",
     "Daily activity summary for %s" : "Tóm tắt hoạt động hàng ngày cho %s",
-    "All activities" : "Tất cả hoạt động",
+    "_and %n more…_::_and %n more…_" : ["và %n còn nữa...."],
+    "All activities" : "Tất cả các hoạt động",
     "By others" : "Bởi người khác",
     "By you" : "Bởi bạn",
     "Activity at %s" : "Hoạt động ở %s",
@@ -40,13 +42,20 @@ OC.L10N.register(
     "Open {filename}" : "Mở {filename}",
     "in {path}" : "trong {path}",
     "Home" : "Trang chủ",
+    "Loading activities" : "Đang tải các hoạt động",
     "This stream will show events like additions, changes & shares" : "Luồng này sẽ hiển thị các sự kiện như bổ sung, thay đổi & chia sẻ",
     "No activity yet" : "Chưa có hoạt động nào",
+    "Loading more activities" : "Đang tải thêm hoạt động.",
+    "No more activities." : "Không còn hoạt động nào nữa.",
+    "Could not load activities" : "Không thể tải được các hoạt động.",
     "Activity settings" : "Cài đặt Hành động",
     "Enable RSS feed" : "Bật nguồn cấp dữ liệu RSS",
     "RSS feed" : "Nội dung RSS",
     "Copy RSS feed link" : "Sao chép liên kết RSS",
     "Personal notification settings" : "Cài đặt thông báo cá nhân",
+    "Could not enable RSS link" : "Không thể kích hoạt liên kết RSS.",
+    "RSS link copied to clipboard" : "Liên kết RSS đã được sao chép vào bảng tạm.",
+    "Could not copy the RSS link, please copy manually:" : "Không thể sao chép liên kết RSS, vui lòng sao chép thủ công:",
     "Unable to load the activity list" : "Không thể tải danh sách hoạt động",
     "Notification" : "Thông báo",
     "Enable notification emails" : "Bật email thông báo",
@@ -64,6 +73,7 @@ OC.L10N.register(
     "Press Ctrl-C to copy." : "Ấn Ctrl-C để sao chép",
     "{name} (invisible)" : "{name} (ẩn)",
     "{name} (restricted)" : "{name} (hạn chế)",
-    "There are no events for this filter" : "Không có sự kiện nào cho bộ lọc này"
+    "There are no events for this filter" : "Không có sự kiện nào cho bộ lọc này",
+    "Could not load activites" : "Không thể tải các hoạt động."
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/vi.json b/l10n/vi.json
index 66f8eacb4..c1fb16dfd 100644
--- a/l10n/vi.json
+++ b/l10n/vi.json
@@ -1,14 +1,16 @@
 { "translations": {
     "Personal activity feed for %s" : "Khay hoạt động cá nhân được %s",
     "Your feed URL is invalid" : "Khay URL của bạn không hợp lệ",
+    "Activity feed for %1$s" : "Dòng cung cấp dữ liệu hoạt động cho %1$s",
     "Activity feed" : "Nguồn cấp dữ liệu hoạt động",
     "Your settings have been updated." : "Các thiết lập của bạn vừa được cập nhật",
     "Settings have been updated." : "Các cài đặt đã được cập nhật.",
     "Recent activity" : "Hoạt động gần đây",
     "No activities" : "Không có hoạt động",
-    "More activities" : "Hoạt động mở rộng",
+    "More activities" : "Thêm hoạt động",
     "Daily activity summary for %s" : "Tóm tắt hoạt động hàng ngày cho %s",
-    "All activities" : "Tất cả hoạt động",
+    "_and %n more…_::_and %n more…_" : ["và %n còn nữa...."],
+    "All activities" : "Tất cả các hoạt động",
     "By others" : "Bởi người khác",
     "By you" : "Bởi bạn",
     "Activity at %s" : "Hoạt động ở %s",
@@ -38,13 +40,20 @@
     "Open {filename}" : "Mở {filename}",
     "in {path}" : "trong {path}",
     "Home" : "Trang chủ",
+    "Loading activities" : "Đang tải các hoạt động",
     "This stream will show events like additions, changes & shares" : "Luồng này sẽ hiển thị các sự kiện như bổ sung, thay đổi & chia sẻ",
     "No activity yet" : "Chưa có hoạt động nào",
+    "Loading more activities" : "Đang tải thêm hoạt động.",
+    "No more activities." : "Không còn hoạt động nào nữa.",
+    "Could not load activities" : "Không thể tải được các hoạt động.",
     "Activity settings" : "Cài đặt Hành động",
     "Enable RSS feed" : "Bật nguồn cấp dữ liệu RSS",
     "RSS feed" : "Nội dung RSS",
     "Copy RSS feed link" : "Sao chép liên kết RSS",
     "Personal notification settings" : "Cài đặt thông báo cá nhân",
+    "Could not enable RSS link" : "Không thể kích hoạt liên kết RSS.",
+    "RSS link copied to clipboard" : "Liên kết RSS đã được sao chép vào bảng tạm.",
+    "Could not copy the RSS link, please copy manually:" : "Không thể sao chép liên kết RSS, vui lòng sao chép thủ công:",
     "Unable to load the activity list" : "Không thể tải danh sách hoạt động",
     "Notification" : "Thông báo",
     "Enable notification emails" : "Bật email thông báo",
@@ -62,6 +71,7 @@
     "Press Ctrl-C to copy." : "Ấn Ctrl-C để sao chép",
     "{name} (invisible)" : "{name} (ẩn)",
     "{name} (restricted)" : "{name} (hạn chế)",
-    "There are no events for this filter" : "Không có sự kiện nào cho bộ lọc này"
+    "There are no events for this filter" : "Không có sự kiện nào cho bộ lọc này",
+    "Could not load activites" : "Không thể tải các hoạt động."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 299cda6c3..256f26012 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "沒有活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
+    "_and %n more…_::_and %n more…_" : ["以及其餘 %n 項……"],
     "All activities" : "所有活動",
     "By others" : "其他人的活動",
     "By you" : "您的活動",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 5a17e82dc..fd9ab768e 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -9,6 +9,7 @@
     "No activities" : "沒有活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
+    "_and %n more…_::_and %n more…_" : ["以及其餘 %n 項……"],
     "All activities" : "所有活動",
     "By others" : "其他人的活動",
     "By you" : "您的活動",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 7413a7bb9..f9f64ed0e 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "無活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
+    "_and %n more…_::_and %n more…_" : ["以及其餘 %n 項……"],
     "All activities" : "所有活動",
     "By others" : "由其他人",
     "By you" : "由您",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index adadb9a8f..4e358938c 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -9,6 +9,7 @@
     "No activities" : "無活動",
     "More activities" : "更多活動",
     "Daily activity summary for %s" : "%s 的每日活動摘要",
+    "_and %n more…_::_and %n more…_" : ["以及其餘 %n 項……"],
     "All activities" : "所有活動",
     "By others" : "由其他人",
     "By you" : "由您",

From eb286cd66005aeeb5c1cb45a7f4e2fd65982bd71 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 18 Jul 2024 00:24:00 +0000
Subject: [PATCH 08/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/de_DE.js   | 2 +-
 l10n/de_DE.json | 2 +-
 l10n/lt_LT.js   | 1 +
 l10n/lt_LT.json | 1 +
 l10n/pt_BR.js   | 1 +
 l10n/pt_BR.json | 1 +
 l10n/sl.js      | 1 +
 l10n/sl.json    | 1 +
 l10n/sv.js      | 1 +
 l10n/sv.json    | 1 +
 10 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index b9c8f0022..57170b754 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -11,7 +11,7 @@ OC.L10N.register(
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more…_::_and %n more…_" : ["und %n weiterer","und %n weitere…"],
+    "_and %n more…_::_and %n more…_" : ["und %n weitere","und %n weitere…"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 3a7a25bfc..e64cf7dc9 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -9,7 +9,7 @@
     "No activities" : "Keine Aktivitäten",
     "More activities" : "Weitere Aktivitäten",
     "Daily activity summary for %s" : "Tägliche Aktivitätsübersicht für %s",
-    "_and %n more…_::_and %n more…_" : ["und %n weiterer","und %n weitere…"],
+    "_and %n more…_::_and %n more…_" : ["und %n weitere","und %n weitere…"],
     "All activities" : "Alle Aktivitäten",
     "By others" : "Von anderen",
     "By you" : "Von Ihnen",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 98a14e27a..a34e712f0 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "No activity yet" : "Kol kas nėra veiklos",
     "Loading more activities" : "Įkeliama daugiau veiklų",
     "No more activities." : "Daugiau nebėra veiklų.",
+    "Could not load activities" : "Nepavyko įkelti veiklų",
     "Activity settings" : "Veiklos nustatymai",
     "Enable RSS feed" : "Įjungti RSS sklaidos kanalą",
     "RSS feed" : "RSS kanalas",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 8ea8d6eff..25be2e429 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -44,6 +44,7 @@
     "No activity yet" : "Kol kas nėra veiklos",
     "Loading more activities" : "Įkeliama daugiau veiklų",
     "No more activities." : "Daugiau nebėra veiklų.",
+    "Could not load activities" : "Nepavyko įkelti veiklų",
     "Activity settings" : "Veiklos nustatymai",
     "Enable RSS feed" : "Įjungti RSS sklaidos kanalą",
     "RSS feed" : "RSS kanalas",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 9d8203b15..a63f26c53 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Resumo de atividade diária para %s",
+    "_and %n more…_::_and %n more…_" : ["e %n mais…","e %n mais…","e %n mais…"],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por você",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index c63c050d4..f517a841c 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -9,6 +9,7 @@
     "No activities" : "Sem atividades",
     "More activities" : "Mais atividades",
     "Daily activity summary for %s" : "Resumo de atividade diária para %s",
+    "_and %n more…_::_and %n more…_" : ["e %n mais…","e %n mais…","e %n mais…"],
     "All activities" : "Todas as atividades",
     "By others" : "Por outros",
     "By you" : "Por você",
diff --git a/l10n/sl.js b/l10n/sl.js
index bbd3692bf..593af7e03 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Ni dejavnosti",
     "More activities" : "Več dejavnosti",
     "Daily activity summary for %s" : "Dnevni povzetek dejavnosti za račun %s",
+    "_and %n more…_::_and %n more…_" : ["in %n drugo ...","in %n drugi ...","in %n druge ...","in %n drugih ..."],
     "All activities" : "Vse dejavnosti",
     "By others" : "Dejavnosti drugih",
     "By you" : "Moje dejavnosti",
diff --git a/l10n/sl.json b/l10n/sl.json
index 9c09ee428..2aa5e8338 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -9,6 +9,7 @@
     "No activities" : "Ni dejavnosti",
     "More activities" : "Več dejavnosti",
     "Daily activity summary for %s" : "Dnevni povzetek dejavnosti za račun %s",
+    "_and %n more…_::_and %n more…_" : ["in %n drugo ...","in %n drugi ...","in %n druge ...","in %n drugih ..."],
     "All activities" : "Vse dejavnosti",
     "By others" : "Dejavnosti drugih",
     "By you" : "Moje dejavnosti",
diff --git a/l10n/sv.js b/l10n/sv.js
index 154c8ddd7..2991562ad 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Inga händelser",
     "More activities" : "Fler aktiviteter",
     "Daily activity summary for %s" : "Sammanfattad daglig aktivitet för %s",
+    "_and %n more…_::_and %n more…_" : ["och %n till…","och %n till…"],
     "All activities" : "Alla aktiviteter",
     "By others" : "Andras aktivitet",
     "By you" : "Min aktivitet",
diff --git a/l10n/sv.json b/l10n/sv.json
index d30b0ccc1..2ff577669 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -9,6 +9,7 @@
     "No activities" : "Inga händelser",
     "More activities" : "Fler aktiviteter",
     "Daily activity summary for %s" : "Sammanfattad daglig aktivitet för %s",
+    "_and %n more…_::_and %n more…_" : ["och %n till…","och %n till…"],
     "All activities" : "Alla aktiviteter",
     "By others" : "Andras aktivitet",
     "By you" : "Min aktivitet",

From c127c1c300c037ff3a93a1a8bf953c76413dcbc3 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Fri, 19 Jul 2024 00:24:03 +0000
Subject: [PATCH 09/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/hu.js   | 1 +
 l10n/hu.json | 1 +
 l10n/it.js   | 1 +
 l10n/it.json | 1 +
 l10n/nb.js   | 1 +
 l10n/nb.json | 1 +
 6 files changed, 6 insertions(+)

diff --git a/l10n/hu.js b/l10n/hu.js
index 46a98cfea..64137ef88 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Nincs tevékenység",
     "More activities" : "További tevékenységek",
     "Daily activity summary for %s" : "Napi tevékenység-összefoglaló ehhez: %s",
+    "_and %n more…_::_and %n more…_" : ["és %n további…","és %n további…"],
     "All activities" : "Minden tevékenység",
     "By others" : "Másoké",
     "By you" : "Az Öné",
diff --git a/l10n/hu.json b/l10n/hu.json
index f69db5813..85c2ca5c4 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -9,6 +9,7 @@
     "No activities" : "Nincs tevékenység",
     "More activities" : "További tevékenységek",
     "Daily activity summary for %s" : "Napi tevékenység-összefoglaló ehhez: %s",
+    "_and %n more…_::_and %n more…_" : ["és %n további…","és %n további…"],
     "All activities" : "Minden tevékenység",
     "By others" : "Másoké",
     "By you" : "Az Öné",
diff --git a/l10n/it.js b/l10n/it.js
index 4f767fa39..e0bcd4e4b 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Nessuna attività",
     "More activities" : "Altre attività",
     "Daily activity summary for %s" : "Riepilogo giornaliero delle attività per %s",
+    "_and %n more…_::_and %n more…_" : ["e %n altro…","e altri %n …","e altri %n …"],
     "All activities" : "Tutte le attività",
     "By others" : "Di altri",
     "By you" : "Tue",
diff --git a/l10n/it.json b/l10n/it.json
index 63658b205..e4be71c1d 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -9,6 +9,7 @@
     "No activities" : "Nessuna attività",
     "More activities" : "Altre attività",
     "Daily activity summary for %s" : "Riepilogo giornaliero delle attività per %s",
+    "_and %n more…_::_and %n more…_" : ["e %n altro…","e altri %n …","e altri %n …"],
     "All activities" : "Tutte le attività",
     "By others" : "Di altri",
     "By you" : "Tue",
diff --git a/l10n/nb.js b/l10n/nb.js
index 73c851759..1355450e3 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetssammendrag for %s",
+    "_and %n more…_::_and %n more…_" : ["og %n til…","og %n til…"],
     "All activities" : "All aktivitet",
     "By others" : "Av andre",
     "By you" : "Av deg",
diff --git a/l10n/nb.json b/l10n/nb.json
index fcd7ca630..f41f8eb34 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -9,6 +9,7 @@
     "No activities" : "Ingen aktiviteter",
     "More activities" : "Flere aktiviteter",
     "Daily activity summary for %s" : "Daglig aktivitetssammendrag for %s",
+    "_and %n more…_::_and %n more…_" : ["og %n til…","og %n til…"],
     "All activities" : "All aktivitet",
     "By others" : "Av andre",
     "By you" : "Av deg",

From ad0d8dee6602569b9e5451113eb15d92279c8c74 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sat, 20 Jul 2024 00:24:02 +0000
Subject: [PATCH 10/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/ja.js   | 1 +
 l10n/ja.json | 1 +
 l10n/ru.js   | 3 ++-
 l10n/ru.json | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/l10n/ja.js b/l10n/ja.js
index 20a71fe02..ce4a7b8e2 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "アクティビティがありません",
     "More activities" : "その他のアクティビティ",
     "Daily activity summary for %s" : "%s のデイリーアクティビティー概要",
+    "_and %n more…_::_and %n more…_" : ["%n その他　"],
     "All activities" : "すべてのアクティビティ",
     "By others" : "他ユーザー",
     "By you" : "自分",
diff --git a/l10n/ja.json b/l10n/ja.json
index c9166cdfe..e74cd9652 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -9,6 +9,7 @@
     "No activities" : "アクティビティがありません",
     "More activities" : "その他のアクティビティ",
     "Daily activity summary for %s" : "%s のデイリーアクティビティー概要",
+    "_and %n more…_::_and %n more…_" : ["%n その他　"],
     "All activities" : "すべてのアクティビティ",
     "By others" : "他ユーザー",
     "By you" : "自分",
diff --git a/l10n/ru.js b/l10n/ru.js
index 17617eb01..7ef49656e 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "События отсуствуют",
     "More activities" : "Больше событий",
     "Daily activity summary for %s" : "Сводка событий за день %s",
+    "_and %n more…_::_and %n more…_" : ["и ещё %n…","и ещё  %n…","и ещё %n…","и ещё %n…"],
     "All activities" : "Все события",
     "By others" : "Других пользователей",
     "By you" : "Собственные",
@@ -36,7 +37,7 @@ OC.L10N.register(
     "Hourly" : "Ежечасно",
     "Daily" : "Ежедневно",
     "Weekly" : "Еженедельно",
-    "You commented" : "Вы оставили комметарий",
+    "You commented" : "Вы оставили комментарий",
     "Message deleted by author" : "Сообщение удалено автором",
     "Open {filename}" : "Открыть {filename}",
     "in {path}" : "в {path}",
diff --git a/l10n/ru.json b/l10n/ru.json
index 1f4c3ef14..c1633bdfa 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -9,6 +9,7 @@
     "No activities" : "События отсуствуют",
     "More activities" : "Больше событий",
     "Daily activity summary for %s" : "Сводка событий за день %s",
+    "_and %n more…_::_and %n more…_" : ["и ещё %n…","и ещё  %n…","и ещё %n…","и ещё %n…"],
     "All activities" : "Все события",
     "By others" : "Других пользователей",
     "By you" : "Собственные",
@@ -34,7 +35,7 @@
     "Hourly" : "Ежечасно",
     "Daily" : "Ежедневно",
     "Weekly" : "Еженедельно",
-    "You commented" : "Вы оставили комметарий",
+    "You commented" : "Вы оставили комментарий",
     "Message deleted by author" : "Сообщение удалено автором",
     "Open {filename}" : "Открыть {filename}",
     "in {path}" : "в {path}",

From c5997ea7e1ba59a7036eb4ed579d433f1f3010e9 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sun, 21 Jul 2024 00:24:02 +0000
Subject: [PATCH 11/12] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 l10n/es_MX.js   | 1 +
 l10n/es_MX.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index e5f7b5585..a9684d7a2 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad reciente para %s",
+    "_and %n more…_::_and %n more…_" : ["y %n más...","y %n más...","y %n más..."],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 2cca26f06..084e8a95e 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -9,6 +9,7 @@
     "No activities" : "No hay actividades",
     "More activities" : "Más actividades",
     "Daily activity summary for %s" : "Resumen de la actividad reciente para %s",
+    "_and %n more…_::_and %n more…_" : ["y %n más...","y %n más...","y %n más..."],
     "All activities" : "Todas las actividades",
     "By others" : "Por otros",
     "By you" : "Por usted",

From 6850fad0afc262260fabb849f4ae905ac3edd31c Mon Sep 17 00:00:00 2001
From: nextcloud-command <nextcloud-command@users.noreply.github.com>
Date: Sun, 21 Jul 2024 03:13:01 +0000
Subject: [PATCH 12/12] fix(deps): Fix npm audit

Signed-off-by: GitHub <noreply@github.com>
---
 js/vendor.LICENSE.txt |  2 +-
 package-lock.json     | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/js/vendor.LICENSE.txt b/js/vendor.LICENSE.txt
index 98d882abe..5513b251f 100644
--- a/js/vendor.LICENSE.txt
+++ b/js/vendor.LICENSE.txt
@@ -53,7 +53,7 @@ version: 2.1.0
 license: GPL-3.0-or-later
 
 @nextcloud/l10n
-version: 2.2.0
+version: 3.1.0
 license: GPL-3.0-or-later
 
 @nextcloud/logger
diff --git a/package-lock.json b/package-lock.json
index 72f0c9183..5e27f6860 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4014,12 +4014,13 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -7045,10 +7046,11 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -8282,6 +8284,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -13281,6 +13284,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -18013,12 +18017,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "brorand": {
@@ -20336,9 +20340,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"